Upgrade to Spring REST Docs 2.0.0 (#178)

* Upgrade to Spring REST Docs 2.0.0

* Upgrade to Spring REST Docs 2.0.0 in travis config

* Switch to Java 8 as it is required anyway

* Upgrade example to Spring Boot 2.0.0.M7

* Test against JDK9

* Fix Gradle build of the example

* Let Travis build run on trusty (current default)

* Disable JDK9 build because the doclet does not support it yet

* Update parent dependencies

* Test with Hibernate Validator 6

* Make use of Java 8

* Fix deprecations in example project

* Fix deprecations and use lambdas

* Upgrade example project to Spring Boot 2.0.0.RELEASE

Author: fbenz

.travis.yml

@@ -1,9 +1,8 @@
 language: java
 sudo: false
-dist: precise
+dist: trusty
 jdk:
 - oraclejdk8
-- oraclejdk7
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
 - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -13,8 +12,8 @@ cache:
   - $HOME/.gradle/caches/
   - $HOME/.gradle/wrapper/
 before_install:
-- mvn install:install-file -Dfile=lib/spring-restdocs-core-1.2.3.RELEASE-test.jar
-  -DgroupId=org.springframework.restdocs -DartifactId=spring-restdocs-core -Dversion=1.2.3.RELEASE
+- mvn install:install-file -Dfile=lib/spring-restdocs-core-2.0.0.RELEASE-test.jar
+  -DgroupId=org.springframework.restdocs -DartifactId=spring-restdocs-core -Dversion=2.0.0.RELEASE
   -Dpackaging=jar -Dclassifier=test
 script:
 - mvn install -B -V

docs/index.html

@@ -5,7 +5,7 @@
 
     <groupId>capital.scalable</groupId>
     <artifactId>spring-auto-restdocs-parent</artifactId>
-    <version>1.0.12-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Spring Auto REST Docs Parent POM</name>
@@ -53,10 +53,10 @@
     </developers>
 
     <properties>
-        <java.version>1.7</java.version>
+        <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
-        <spring-restdocs.version>1.2.3.RELEASE</spring-restdocs.version>
+        <spring-restdocs.version>2.0.0.RELEASE</spring-restdocs.version>
     </properties>
 
     <build>
@@ -145,7 +145,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.6.1</version>
+                    <version>3.7.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -155,7 +155,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.4</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -170,12 +170,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.19.1</version>
+                    <version>2.20.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.asciidoctor</groupId>
                     <artifactId>asciidoctor-maven-plugin</artifactId>
-                    <version>1.5.5</version>
+                    <version>1.5.6</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -250,28 +250,28 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>2.8.6</version>
+                <version>2.9.3</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-test</artifactId>
-                <version>4.3.10.RELEASE</version>
+                <version>5.0.2.RELEASE</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework.data</groupId>
                 <artifactId>spring-data-commons</artifactId>
-                <version>1.13.6.RELEASE</version>
+                <version>2.0.2.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>javax.validation</groupId>
                 <artifactId>validation-api</artifactId>
-                <version>1.1.0.Final</version>
+                <version>2.0.1.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.5</version>
+                <version>3.7</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>
@@ -281,7 +281,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.5</version>
+                <version>2.6</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -304,12 +304,12 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.7.22</version>
+                <version>1.7.25</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
-                <version>1.7.22</version>
+                <version>1.7.25</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>

lib/spring-restdocs-core-1.2.3.RELEASE-test.jar

@@ -7,7 +7,7 @@
     <parent>
         <groupId>capital.scalable</groupId>
         <artifactId>spring-auto-restdocs-parent</artifactId>
-        <version>1.0.12-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -80,15 +80,15 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>5.3.4.Final</version>
+            <version>6.0.7.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-el</artifactId>
-            <version>8.5.16</version>
+            <version>9.0.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

lib/spring-restdocs-core-2.0.0.RELEASE-test.jar

@@ -86,34 +86,22 @@ public String resolveFieldTag(Class<?> javaBaseClass, String javaFieldName, Stri
 
     @Override
     public String resolveMethodComment(Class<?> javaBaseClass, final String javaMethodName) {
-        return resolveCommentFromClassHierarchy(javaBaseClass, new CommentExtractor() {
-            @Override
-            public String comment(ClassJavadoc classJavadoc) {
-                return classJavadoc.getMethodComment(javaMethodName);
-            }
-        });
+        return resolveCommentFromClassHierarchy(javaBaseClass,
+                classJavadoc -> classJavadoc.getMethodComment(javaMethodName));
     }
 
     @Override
     public String resolveMethodTag(Class<?> javaBaseClass, final String javaMethodName,
             final String tagName) {
-        return resolveCommentFromClassHierarchy(javaBaseClass, new CommentExtractor() {
-            @Override
-            public String comment(ClassJavadoc classJavadoc) {
-                return classJavadoc.getMethodTag(javaMethodName, tagName);
-            }
-        });
+        return resolveCommentFromClassHierarchy(javaBaseClass,
+                classJavadoc -> classJavadoc.getMethodTag(javaMethodName, tagName));
     }
 
     @Override
     public String resolveMethodParameterComment(Class<?> javaBaseClass, final String javaMethodName,
             final String javaParameterName) {
-        return resolveCommentFromClassHierarchy(javaBaseClass, new CommentExtractor() {
-            @Override
-            public String comment(ClassJavadoc classJavadoc) {
-                return classJavadoc.getMethodParameterComment(javaMethodName, javaParameterName);
-            }
-        });
+        return resolveCommentFromClassHierarchy(javaBaseClass,
+                classJavadoc -> classJavadoc.getMethodParameterComment(javaMethodName, javaParameterName));
     }
 
     private ClassJavadoc classJavadoc(Class<?> clazz) {

pom.xml

@@ -113,9 +113,7 @@ private void resolveFieldDescriptors(Map<String, FieldDescriptor> fieldDescripto
         List<FieldDescriptor> descriptors = generator.generateDocumentation(type,
                 objectMapper.getTypeFactory());
         for (FieldDescriptor descriptor : descriptors) {
-            if (fieldDescriptors.get(descriptor.getPath()) == null) {
-                fieldDescriptors.put(descriptor.getPath(), descriptor);
-            }
+            fieldDescriptors.putIfAbsent(descriptor.getPath(), descriptor);
         }
     }
 

spring-auto-restdocs-core/pom.xml

@@ -76,13 +76,7 @@ private boolean isModelAttribute(MethodParameter param) {
 
     private Type getType(final MethodParameter param) {
         if (isCollection(param.getParameterType())) {
-            return new GenericArrayType() {
-
-                @Override
-                public Type getGenericComponentType() {
-                    return firstGenericType(param);
-                }
-            };
+            return (GenericArrayType) () -> firstGenericType(param);
         } else {
             return param.getParameterType();
         }

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

@@ -67,13 +67,7 @@ protected Type getType(final HandlerMethod method) {
         } else if (SPRING_DATA_PAGE_CLASS.equals(returnType.getCanonicalName())) {
             return firstGenericType(method.getReturnType());
         } else if (isCollection(returnType)) {
-            return new GenericArrayType() {
-
-                @Override
-                public Type getGenericComponentType() {
-                    return firstGenericType(method.getReturnType());
-                }
-            };
+            return (GenericArrayType) () -> firstGenericType(method.getReturnType());
         } else if ("void".equals(returnType.getName())) {
             return null;
         } else {