Code clean up (#92)

* Code clean up

* Fix test

Author: fbenz

spring-auto-restdocs-core/src/main/java/capital/scalable/restdocs/javadoc/JavadocUtil.java

@@ -6,20 +6,20 @@ private JavadocUtil() {
     }
 
     public static String convertFromJavadoc(String javadoc, String lineBreak) {
-        String lineBreaked = javadoc
+        String withConvertedLineBreaks = javadoc
                 .replace("\n", "")
                 .replace("<br/>", "\n")
                 .replace("<br>", "\n")
                 .replace("<p>", "\n\n")
                 .replace("</p>", "")
                 .trim();
 
-        if (lineBreaked.isEmpty()) {
+        if (withConvertedLineBreaks.isEmpty()) {
             return "";
         }
 
         StringBuilder res = new StringBuilder();
-        for (String line : lineBreaked.split("\n")) {
+        for (String line : withConvertedLineBreaks.split("\n")) {
             res.append(line.trim()).append(lineBreak);
         }
         res.delete(res.lastIndexOf(lineBreak), res.length());

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

@@ -32,10 +32,6 @@ public void initialize(OneOf constraintAnnotation) {
 
     @Override
     public boolean isValid(String value, ConstraintValidatorContext context) {
-        if (value == null) {
-            return true;
-        } else {
-            return validValues.contains(value);
-        }
+        return value == null || validValues.contains(value);
     }
 }

spring-auto-restdocs-example/src/main/java/capital/scalable/restdocs/example/StaticResourceConfiguration.java

@@ -26,7 +26,7 @@
  * Serve generated documentation at /docs.
  */
 @Configuration
-public class StaticResourceConfiguration extends WebMvcConfigurerAdapter {
+class StaticResourceConfiguration extends WebMvcConfigurerAdapter {
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {

spring-auto-restdocs-example/src/main/java/capital/scalable/restdocs/example/constraints/OneOfValidator.java

@@ -21,7 +21,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class OneOfValidator implements ConstraintValidator<OneOf, String> {
+class OneOfValidator implements ConstraintValidator<OneOf, String> {
 
     private List<String> validValues;
 

spring-auto-restdocs-example/src/main/java/capital/scalable/restdocs/example/items/ItemResponse.java

@@ -126,7 +126,7 @@ static class Metadata {
         private Integer custom2;
     }
 
-    static enum EnumType {
+    enum EnumType {
         ONE, TWO
     }
 }

spring-auto-restdocs-example/src/main/java/capital/scalable/restdocs/example/jackson/JsonConfiguration.java

@@ -24,7 +24,7 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class JsonConfiguration {
+class JsonConfiguration {
 
     @Bean
     public ObjectMapper objectMapper() {

spring-auto-restdocs-example/src/main/java/capital/scalable/restdocs/example/jackson/MoneySerializer.java

@@ -26,7 +26,7 @@
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
-public class MoneySerializer extends StdSerializer<Money> {
+class MoneySerializer extends StdSerializer<Money> {
     public MoneySerializer() {
         super(Money.class);
     }

spring-auto-restdocs-example/src/main/java/capital/scalable/restdocs/example/security/OAuth2ServerConfiguration.java

@@ -69,7 +69,7 @@ public void configure(HttpSecurity http) throws Exception {
     protected static class AuthorizationServerConfiguration extends
             AuthorizationServerConfigurerAdapter {
 
-        private TokenStore tokenStore = new InMemoryTokenStore();
+        private final TokenStore tokenStore = new InMemoryTokenStore();
 
         @Autowired
         @Qualifier("authenticationManagerBean")

spring-auto-restdocs-example/src/test/java/capital/scalable/restdocs/example/testsupport/MockMvcBase.java

@@ -80,7 +80,7 @@ public abstract class MockMvcBase {
     private WebApplicationContext context;
 
     @Autowired
-    protected ObjectMapper objectMapper;
+    private ObjectMapper objectMapper;
 
     @Autowired
     private Filter springSecurityFilterChain;

spring-auto-restdocs-json-doclet/src/main/java/capital/scalable/restdocs/jsondoclet/ClassDocumentation.java

@@ -31,8 +31,8 @@
 
 public final class ClassDocumentation {
     private String comment = "";
-    private Map<String, String> fields = new HashMap<>();
-    private Map<String, MethodDocumentation> methods = new HashMap<>();
+    private final Map<String, String> fields = new HashMap<>();
+    private final Map<String, MethodDocumentation> methods = new HashMap<>();
 
     private ClassDocumentation() {
         // enforce usage of static factory method