Enable validation of requests vs open api spec (#65)

* enable validation of requests vs open api spec

* refactoring

Author: tsiq-karold

.gitignore

@@ -6,3 +6,4 @@ target
 node_modules
 webtau.report.html
 .vertx
+webtau-rest-groovy/doc-artifacts/*

webtau-open-api/src/main/java/com/twosigma/webtau/openapi/OpenApiSpecValidator.java

@@ -17,7 +17,7 @@
 package com.twosigma.webtau.openapi;
 
 import com.atlassian.oai.validator.SwaggerRequestResponseValidator;
-import com.atlassian.oai.validator.model.Request;
+import com.atlassian.oai.validator.model.SimpleRequest;
 import com.atlassian.oai.validator.model.SimpleResponse;
 import com.atlassian.oai.validator.report.ValidationReport;
 import com.twosigma.webtau.console.ConsoleOutputs;
@@ -50,15 +50,31 @@ public void validateApiSpec(HttpValidationResult result) {
             return;
         }
 
-        SimpleResponse response = SimpleResponse.Builder
-                .status(result.getResponseStatusCode())
-                .withBody(result.getResponseTextContent())
-                .build();
+        SimpleRequest request = buildRequest(result);
+        SimpleResponse response = buildResponse(result);
 
-        Request.Method method = Enum.valueOf(Request.Method.class, result.getRequestMethod());
+        ValidationReport validationReport = openApiValidator.validate(request, response);
+        validationReport.getMessages().forEach(message -> result.addMismatch("API spec validation failure: " + message.toString()));
+    }
+
+    private SimpleResponse buildResponse(HttpValidationResult result) {
+        return SimpleResponse.Builder
+                    .status(result.getResponseStatusCode())
+                    .withBody(result.getResponseTextContent())
+                    .build();
+    }
+
+    private SimpleRequest buildRequest(HttpValidationResult result) {
         String relativePath = extractPath(result.getFullUrl());
 
-        ValidationReport validationReport = openApiValidator.validateResponse(relativePath, method, response);
-        validationReport.getMessages().forEach(message -> result.addMismatch("API spec validation failure: " + message.toString()));
+        SimpleRequest.Builder builder = new SimpleRequest.Builder(result.getRequestMethod(), relativePath);
+        if (result.getRequestContent() != null) {
+            builder.withBody(result.getRequestContent());
+        }
+        if (result.getRequestHeader() != null) {
+            result.getRequestHeader().forEachProperty(builder::withHeader);
+        }
+
+        return builder.build();
     }
 }