A bit of code clean up (#46)

* A bit of code clean up

* A bit of code clean up

* A bit of code clean up

Author: fbenz

spring-auto-restdocs-core/src/main/java/capital/scalable/restdocs/constraints/ConstraintAndGroupDescriptionResolver.java

@@ -23,6 +23,7 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.MissingResourceException;
 
@@ -72,9 +73,7 @@ public List<Class> getGroups(Constraint constraint) {
         Class[] groups = (Class[]) rawGroups;
 
         List<Class> result = new ArrayList<>();
-        for (Class group : groups) {
-            result.add(group);
-        }
+        Collections.addAll(result, groups);
         return result;
     }
 

spring-auto-restdocs-core/src/main/java/capital/scalable/restdocs/constraints/HumanReadableConstraintResolver.java

@@ -20,6 +20,7 @@
 import static org.springframework.util.StringUtils.arrayToDelimitedString;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -42,9 +43,7 @@ class HumanReadableConstraintResolver implements ConstraintResolver {
     public HumanReadableConstraintResolver(ConstraintResolver delegate) {
         this.delegate = delegate;
         this.ignoredFields = new HashSet<>();
-        for (String field : IGNORED_FIELDS) {
-            this.ignoredFields.add(field);
-        }
+        Collections.addAll(this.ignoredFields, IGNORED_FIELDS);
     }
 
     @Override

spring-auto-restdocs-core/src/main/java/capital/scalable/restdocs/jackson/FieldDocumentationObjectVisitor.java

@@ -16,11 +16,6 @@
 
 package capital.scalable.restdocs.jackson;
 
-import static org.apache.commons.collections.IteratorUtils.toList;
-
-import java.lang.annotation.Annotation;
-import java.util.List;
-
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -60,23 +55,17 @@ public void optionalProperty(BeanProperty prop) throws JsonMappingException {
 
         String fieldPath = path + (path.isEmpty() ? "" : ".") + jsonName;
         Class<?> javaBaseClass = prop.getMember().getDeclaringClass();
-        List<Annotation> annotations = getAnnotations(prop);
         boolean shouldExpand = shouldExpand(prop);
 
         InternalFieldInfo fieldInfo =
-                new InternalFieldInfo(javaBaseClass, fieldName, fieldPath, annotations,
-                        shouldExpand);
+                new InternalFieldInfo(javaBaseClass, fieldName, fieldPath, shouldExpand);
 
         JsonFormatVisitorWrapper visitor =
                 new FieldDocumentationVisitorWrapper(getProvider(), context, fieldPath, fieldInfo);
 
         ser.acceptJsonFormatVisitor(visitor, type);
     }
 
-    private List<Annotation> getAnnotations(BeanProperty prop) {
-        return toList(prop.getMember().annotations().iterator());
-    }
-
     protected JsonSerializer<?> getSer(BeanProperty prop) throws JsonMappingException {
         JsonSerializer<Object> ser = null;
         if (prop instanceof BeanPropertyWriter) {

spring-auto-restdocs-core/src/main/java/capital/scalable/restdocs/jackson/InternalFieldInfo.java

@@ -16,22 +16,17 @@
 
 package capital.scalable.restdocs.jackson;
 
-import java.lang.annotation.Annotation;
-import java.util.List;
-
 class InternalFieldInfo {
     private final Class<?> javaBaseClass;
     private final String javaFieldName;
     private final String jsonFieldPath;
-    private List<Annotation> annotations;
     private final boolean shouldExpand;
 
     public InternalFieldInfo(Class<?> javaBaseClass, String javaFieldName,
-            String jsonFieldPath, List<Annotation> annotations, boolean shouldExpand) {
+            String jsonFieldPath, boolean shouldExpand) {
         this.javaBaseClass = javaBaseClass;
         this.javaFieldName = javaFieldName;
         this.jsonFieldPath = jsonFieldPath;
-        this.annotations = annotations;
         this.shouldExpand = shouldExpand;
     }
 
@@ -47,10 +42,6 @@ public String getJsonFieldPath() {
         return jsonFieldPath;
     }
 
-    public List<Annotation> getAnnotations() {
-        return annotations;
-    }
-
     public boolean shouldExpand() {
         return shouldExpand;
     }

spring-auto-restdocs-core/src/main/java/capital/scalable/restdocs/response/JsonContentModifier.java

@@ -19,7 +19,6 @@
 import static org.springframework.http.MediaType.APPLICATION_JSON;
 
 import java.io.IOException;
-import java.util.Iterator;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -48,7 +47,7 @@ public byte[] modifyContent(byte[] originalContent, MediaType contentType) {
      * Uses UTF-8. According to {@link com.fasterxml.jackson.core.JsonEncoding}
      * only UTF-{8,16,32} are a valid JSON encodings.
      *
-     * @param originalContent
+     * @param originalContent original JSON content
      * @return modified JSON content
      */
     protected byte[] modifyContent(byte[] originalContent) {
@@ -68,8 +67,8 @@ protected void walk(JsonNode node, JsonNodeFilter filter,
         if (filter.apply(node)) {
             consumer.accept(node);
         }
-        for (Iterator<JsonNode> children = node.iterator(); children.hasNext();) {
-            walk(children.next(), filter, consumer);
+        for (JsonNode child : node) {
+            walk(child, filter, consumer);
         }
     }
 }

spring-auto-restdocs-core/src/test/java/capital/scalable/restdocs/constraints/ConstraintAndGroupDescriptionResolverTest.java

@@ -26,11 +26,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.MissingResourceException;
 
-import org.apache.commons.collections.map.HashedMap;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -52,7 +53,7 @@ public void setup() {
     @Test
     public void noGroupDescriptionIsResolved() {
         // given
-        Map<String, Object> configuration = new HashedMap();
+        Map<String, Object> configuration = new HashMap<>();
         configuration.put(GROUPS, new Class<?>[]{});
         Constraint constraint = new Constraint("Constraint", configuration);
         when(delegate.resolveDescription(eq(constraint))).thenReturn("Must be it");
@@ -65,7 +66,7 @@ public void noGroupDescriptionIsResolved() {
     @Test
     public void noDescriptionIsNotResolved() {
         // given
-        Map<String, Object> configuration = new HashedMap();
+        Map<String, Object> configuration = new HashMap<>();
         configuration.put(GROUPS, new Class<?>[]{});
         Constraint constraint = new Constraint("Constraint", configuration);
         when(delegate.resolveDescription(eq(constraint)))
@@ -79,7 +80,7 @@ public void noDescriptionIsNotResolved() {
     @Test
     public void noDescriptionWithGroupsIsResolved() {
         // given
-        Map<String, Object> configuration = new HashedMap();
+        Map<String, Object> configuration = new HashMap<>();
         configuration.put(GROUPS, new Class<?>[]{Update.class});
         Constraint constraint = new Constraint("Constraint", configuration);
         when(delegate.resolveDescription(eq(constraint)))
@@ -93,7 +94,7 @@ public void noDescriptionWithGroupsIsResolved() {
     @Test
     public void singleGroupDescriptionIsResolved() {
         // given
-        Map<String, Object> configuration = new HashedMap();
+        Map<String, Object> configuration = new HashMap<>();
         configuration.put(GROUPS, new Class<?>[]{Update.class});
         Constraint constraint = new Constraint("Constraint", configuration);
         when(delegate.resolveDescription(eq(constraint))).thenReturn("Must be it");
@@ -107,7 +108,7 @@ public void singleGroupDescriptionIsResolved() {
     @Test
     public void multipleGroupDescriptionsAreResolved() {
         // given
-        Map<String, Object> configuration = new HashedMap();
+        Map<String, Object> configuration = new HashMap<>();
         configuration.put(GROUPS, new Class<?>[]{Update.class, Create.class});
         Constraint constraint = new Constraint("Constraint", configuration);
         when(delegate.resolveDescription(eq(constraint))).thenReturn("Must be it");
@@ -122,7 +123,7 @@ public void multipleGroupDescriptionsAreResolved() {
     @Test
     public void groupDescriptionIsNotResolved() {
         // given
-        Map<String, Object> configuration = new HashedMap();
+        Map<String, Object> configuration = new HashMap<>();
         configuration.put(GROUPS, new Class<?>[]{Update.class});
         Constraint constraint = new Constraint("Constraint", configuration);
         when(delegate.resolveDescription(eq(constraint))).thenReturn("Must be it");
@@ -137,7 +138,7 @@ public void groupDescriptionIsNotResolved() {
     @Test
     public void strangeGroupConfigurationIsResolved() {
         // given
-        Map<String, Object> configuration = new HashedMap();
+        Map<String, Object> configuration = new HashMap<>();
         configuration.put(GROUPS, "no group");
         Constraint constraint = new Constraint("Constraint", configuration);
         when(delegate.resolveDescription(eq(constraint))).thenReturn("Must be it");
@@ -151,7 +152,7 @@ public void strangeGroupConfigurationIsResolved() {
     @Test
     public void noConstraintDescriptionIsResolved() {
         // given
-        Map<String, Object> configuration = new HashedMap();
+        Map<String, Object> configuration = new HashMap<>();
         configuration.put(GROUPS, new Class<?>[]{Update.class});
         Constraint constraint = new Constraint("Constraint", configuration);
         when(delegate.resolveDescription(eq(constraint))).thenReturn("");
@@ -190,7 +191,8 @@ public void groupDescriptionNotResolved() {
     @Test
     public void noGroupsResolved() {
         // given
-        Constraint constraint = new Constraint("Constraint", new HashedMap());
+        Constraint constraint =
+                new Constraint("Constraint", Collections.<String, Object>emptyMap());
         // when
         List<Class> groups = resolver.getGroups(constraint);
         // then
@@ -200,14 +202,14 @@ public void noGroupsResolved() {
     @Test
     public void groupsResolved() {
         // given
-        Map<String, Object> configuration = new HashedMap();
+        Map<String, Object> configuration = new HashMap<>();
         configuration.put(GROUPS, new Class<?>[]{Update.class, Create.class});
         Constraint constraint = new Constraint("Constraint", configuration);
         // when
         List<Class> groups = resolver.getGroups(constraint);
         // then
         assertThat(groups.size(), is(2));
-        assertThat((Class) groups.get(0), equalTo((Class) Update.class));
-        assertThat((Class) groups.get(1), equalTo((Class) Create.class));
+        assertThat(groups.get(0), equalTo((Class) Update.class));
+        assertThat(groups.get(1), equalTo((Class) Create.class));
     }
 }

spring-auto-restdocs-core/src/test/java/capital/scalable/restdocs/constraints/HumanReadableConstraintResolverTest.java

@@ -48,7 +48,7 @@ public void testHumanReadable() {
         // setup
         Map<String, Object> configuration = new HashedMap();
         configuration.put("primitive", 1);
-        configuration.put("wrapper", Integer.valueOf(1));
+        configuration.put("wrapper", 1);
         configuration.put("object", new CustomObj("Peter"));
         configuration.put("array", new Object[]{"value1", "value2"});
         configuration.put("class", CustomConstraint.class);

spring-auto-restdocs-core/src/test/java/capital/scalable/restdocs/constraints/SkippableConstraintResolverTest.java

@@ -41,12 +41,11 @@ public class SkippableConstraintResolverTest {
 
     private SkippableConstraintResolver resolver;
     private ConstraintResolver delegate;
-    private GroupDescriptionResolver descriptionResolver;
 
     @Before
     public void setup() {
         delegate = mock(ConstraintResolver.class);
-        descriptionResolver = mock(GroupDescriptionResolver.class);
+        GroupDescriptionResolver descriptionResolver = mock(GroupDescriptionResolver.class);
         resolver = new SkippableConstraintResolver(delegate, descriptionResolver);
     }
 

spring-auto-restdocs-core/src/test/java/capital/scalable/restdocs/jackson/ExtendedFieldDescriptor.java

@@ -64,10 +64,9 @@ public boolean equals(Object o) {
             return false;
         if (optionals != null ? !optionals.equals(that.optionals) : that.optionals != null)
             return false;
-        if (constraints != null ? !constraints.equals(that.constraints) : that.constraints != null)
-            return false;
+        return constraints != null ? constraints.equals(that.constraints) :
+                that.constraints == null;
 
-        return true;
     }
 
     @Override

spring-auto-restdocs-core/src/test/java/capital/scalable/restdocs/jackson/FieldDocumentationGeneratorTest.java

@@ -356,7 +356,7 @@ public void testGenerateDocumentationForConstraints() throws Exception {
                 .thenReturn(singletonList("false"));
         when(constraintReader.getConstraintMessages(ConstraintField.class, "value"))
                 .thenReturn(asList(
-                        new String[]{"A constraint1 for value", "A constraint2 for value"}));
+                        "A constraint1 for value", "A constraint2 for value"));
         when(constraintReader.getOptionalMessages(ConstraintField.class, "value"))
                 .thenReturn(singletonList("false"));