Add support for restdocs-api-spec v0.9.7.

Author: Thomas Wimmer

pom.xml

@@ -68,7 +68,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.version>3.3.1</maven.version>
     <maven-plugin-tools.version>3.6.0</maven-plugin-tools.version>
-    <restdocs-api-spec.version>0.9.6</restdocs-api-spec.version>
+    <restdocs-api-spec.version>0.9.7</restdocs-api-spec.version>
     <junit.version>5.6.0</junit.version>
     <assertj.version>3.15.0</assertj.version>
     <mockito.version>3.3.1</mockito.version>

restdocs-spec-generator/src/test/java/com/berkleytechnologyservices/restdocs/spec/generator/openapi_v3/OpenApi30SpecificationGeneratorTest.java

@@ -2,9 +2,9 @@
 
 import com.berkleytechnologyservices.restdocs.spec.ApiDetails;
 import com.berkleytechnologyservices.restdocs.spec.Specification;
-import com.berkleytechnologyservices.restdocs.spec.generator.openapi_v2.OpenApi20SpecificationGenerator;
 import com.epages.restdocs.apispec.model.HTTPMethod;
 import com.epages.restdocs.apispec.model.ResourceModel;
+import com.epages.restdocs.apispec.model.Schema;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -56,7 +56,7 @@ public void testGenerateWithDefaults() {
                             field("pages", "Number of pages in the book", "NUMBER")
                     ),
                     "The example response.",
-                    "type: string"
+                    new Schema("MyCustomSchemaName")
 
             )
     );

restdocs-spec-generator/src/test/java/com/berkleytechnologyservices/restdocs/spec/generator/test/ResourceModels.java

@@ -8,6 +8,7 @@
 import com.epages.restdocs.apispec.model.RequestModel;
 import com.epages.restdocs.apispec.model.ResourceModel;
 import com.epages.restdocs.apispec.model.ResponseModel;
+import com.epages.restdocs.apispec.model.Schema;
 import com.epages.restdocs.apispec.model.SecurityRequirements;
 
 import java.util.List;
@@ -95,7 +96,7 @@ public static RequestModel request(String path,
                                      List<HeaderDescriptor> headers,
                                      List<ParameterDescriptor> pathParameters,
                                      List<ParameterDescriptor> requestParameters,
-                                     List<? extends FieldDescriptor> requestFields, String example, String schema) {
+                                     List<? extends FieldDescriptor> requestFields, String example, Schema schema) {
     return new RequestModel(
         path,
         method,
@@ -126,7 +127,7 @@ public static ResponseModel response(int status,
                                        List<HeaderDescriptor> headers,
                                        List<FieldDescriptor> fields,
                                        String example,
-                                       String schema) {
+                                       Schema schema) {
     return new ResponseModel(status, contentType, headers, fields, example, schema);
   }
 

restdocs-spec-generator/src/test/resources/mock-specs/default-settings-openapi3.yml

@@ -26,13 +26,14 @@ paths:
           content:
             application/hal+json:
               schema:
-                $ref: '#/components/schemas/book-id-269102123'
+                $ref: '#/components/schemas/MyCustomSchemaName'
               examples:
                 book-get:
                   value: The example response.
 components:
   schemas:
-    book-id-269102123:
+    MyCustomSchemaName:
+      title: MyCustomSchemaName
       type: object
       properties:
         pages: