Merge pull request #6 from adarshsharma/master

quen2404 · web-flow · commit 23bee71975ce · 2017-12-26T16:07:21.000+01:00
Upgraded swagger-models version
diff --git a/pom.xml b/pom.xml
@@ -54,9 +54,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>io.swagger.parser.v3</groupId>
             <artifactId>swagger-parser-v3</artifactId>
-            <version>2.0.0-rc1</version>
+            <version>2.0.0-rc2</version>
         </dependency>
         <dependency>
             <groupId>com.j2html</groupId>
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/ContentDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/ContentDiff.java
@@ -3,8 +3,8 @@
 import com.qdesrame.openapi.diff.model.ChangedContent;
 import com.qdesrame.openapi.diff.model.ChangedMediaType;
 import com.qdesrame.openapi.diff.model.ChangedSchema;
-import io.swagger.oas.models.media.Content;
-import io.swagger.oas.models.media.MediaType;
+import io.swagger.v3.oas.models.media.Content;
+import io.swagger.v3.oas.models.media.MediaType;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/OpenApiDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/OpenApiDiff.java
@@ -3,15 +3,15 @@
 import com.qdesrame.openapi.diff.model.*;
 import com.qdesrame.openapi.diff.utils.EndpointUtils;
 import com.qdesrame.openapi.diff.utils.RefPointer;
-import io.swagger.oas.models.OpenAPI;
-import io.swagger.oas.models.Operation;
-import io.swagger.oas.models.PathItem;
-import io.swagger.oas.models.media.Content;
-import io.swagger.oas.models.parameters.RequestBody;
-import io.swagger.oas.models.responses.ApiResponse;
-import io.swagger.parser.models.AuthorizationValue;
-import io.swagger.parser.models.ParseOptions;
-import io.swagger.parser.v3.OpenAPIV3Parser;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.media.Content;
+import io.swagger.v3.oas.models.parameters.RequestBody;
+import io.swagger.v3.oas.models.responses.ApiResponse;
+import io.swagger.v3.parser.OpenAPIV3Parser;
+import io.swagger.v3.parser.core.models.AuthorizationValue;
+import io.swagger.v3.parser.core.models.ParseOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/ParameterDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/ParameterDiff.java
@@ -2,8 +2,8 @@
 
 import com.qdesrame.openapi.diff.model.ChangedParameter;
 import com.qdesrame.openapi.diff.utils.RefPointer;
-import io.swagger.oas.models.Components;
-import io.swagger.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.parameters.Parameter;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Objects;
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/ParametersDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/ParametersDiff.java
@@ -3,8 +3,8 @@
 import com.qdesrame.openapi.diff.model.ChangedParameter;
 import com.qdesrame.openapi.diff.model.ChangedParameters;
 import com.qdesrame.openapi.diff.utils.RefPointer;
-import io.swagger.oas.models.Components;
-import io.swagger.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.parameters.Parameter;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/SchemaDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/SchemaDiff.java
@@ -5,10 +5,10 @@
 import com.qdesrame.openapi.diff.compare.schemadiffresult.SchemaDiffResult;
 import com.qdesrame.openapi.diff.model.ChangedSchema;
 import com.qdesrame.openapi.diff.utils.RefPointer;
-import io.swagger.oas.models.Components;
-import io.swagger.oas.models.media.ArraySchema;
-import io.swagger.oas.models.media.ComposedSchema;
-import io.swagger.oas.models.media.Schema;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.ComposedSchema;
+import io.swagger.v3.oas.models.media.Schema;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/ArraySchemaDiffResult.java b/src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/ArraySchemaDiffResult.java
@@ -2,9 +2,9 @@
 
 import com.qdesrame.openapi.diff.compare.OpenApiDiff;
 import com.qdesrame.openapi.diff.model.ChangedSchema;
-import io.swagger.oas.models.Components;
-import io.swagger.oas.models.media.ArraySchema;
-import io.swagger.oas.models.media.Schema;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
 
 /**
  * Created by adarsh.sharma on 18/12/17.
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/ComposedSchemaDiffResult.java b/src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/ComposedSchemaDiffResult.java
@@ -5,10 +5,10 @@
 import com.qdesrame.openapi.diff.model.ChangedOneOfSchema;
 import com.qdesrame.openapi.diff.model.ChangedSchema;
 import com.qdesrame.openapi.diff.utils.RefPointer;
-import io.swagger.oas.models.Components;
-import io.swagger.oas.models.media.ComposedSchema;
-import io.swagger.oas.models.media.Discriminator;
-import io.swagger.oas.models.media.Schema;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.media.ComposedSchema;
+import io.swagger.v3.oas.models.media.Discriminator;
+import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/SchemaDiffResult.java b/src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/SchemaDiffResult.java
@@ -4,8 +4,8 @@
 import com.qdesrame.openapi.diff.compare.OpenApiDiff;
 import com.qdesrame.openapi.diff.model.ChangedSchema;
 import com.qdesrame.openapi.diff.model.ListDiff;
-import io.swagger.oas.models.Components;
-import io.swagger.oas.models.media.Schema;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.media.Schema;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedApiResponse.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedApiResponse.java
@@ -1,7 +1,7 @@
 package com.qdesrame.openapi.diff.model;
 
-import io.swagger.oas.models.responses.ApiResponse;
-import io.swagger.oas.models.responses.ApiResponses;
+import io.swagger.v3.oas.models.responses.ApiResponse;
+import io.swagger.v3.oas.models.responses.ApiResponses;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedContent.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedContent.java
@@ -1,7 +1,7 @@
 package com.qdesrame.openapi.diff.model;
 
-import io.swagger.oas.models.media.Content;
-import io.swagger.oas.models.media.MediaType;
+import io.swagger.v3.oas.models.media.Content;
+import io.swagger.v3.oas.models.media.MediaType;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedEndpoint.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedEndpoint.java
@@ -1,7 +1,7 @@
 package com.qdesrame.openapi.diff.model;
 
-import io.swagger.oas.models.Operation;
-import io.swagger.oas.models.PathItem;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
 
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedMediaType.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedMediaType.java
@@ -1,6 +1,6 @@
 package com.qdesrame.openapi.diff.model;
 
-import io.swagger.oas.models.media.Schema;
+import io.swagger.v3.oas.models.media.Schema;
 
 public class ChangedMediaType implements RequestResponseChanged {
     private Schema oldSchema;
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedOpenApi.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedOpenApi.java
@@ -1,7 +1,7 @@
 package com.qdesrame.openapi.diff.model;
 
 import com.qdesrame.openapi.diff.utils.EndpointUtils;
-import io.swagger.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.OpenAPI;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedOperation.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedOperation.java
@@ -1,6 +1,6 @@
 package com.qdesrame.openapi.diff.model;
 
-import io.swagger.oas.models.Operation;
+import io.swagger.v3.oas.models.Operation;
 
 public class ChangedOperation implements Changed {
 
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedParameter.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedParameter.java
@@ -1,6 +1,6 @@
 package com.qdesrame.openapi.diff.model;
 
-import io.swagger.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.parameters.Parameter;
 
 
 public class ChangedParameter implements Changed {
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedParameters.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedParameters.java
@@ -1,6 +1,6 @@
 package com.qdesrame.openapi.diff.model;
 
-import io.swagger.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.parameters.Parameter;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedResponse.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedResponse.java
@@ -1,6 +1,6 @@
 package com.qdesrame.openapi.diff.model;
 
-import io.swagger.oas.models.media.Content;
+import io.swagger.v3.oas.models.media.Content;
 
 public class ChangedResponse implements Changed {
     private String description;
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedSchema.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedSchema.java
@@ -1,6 +1,6 @@
 package com.qdesrame.openapi.diff.model;
 
-import io.swagger.oas.models.media.Schema;
+import io.swagger.v3.oas.models.media.Schema;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ElSchema.java b/src/main/java/com/qdesrame/openapi/diff/model/ElSchema.java
@@ -1,6 +1,6 @@
 package com.qdesrame.openapi.diff.model;
 
-import io.swagger.oas.models.media.Schema;
+import io.swagger.v3.oas.models.media.Schema;
 
 /**
  * property with expression Language grammar
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/Endpoint.java b/src/main/java/com/qdesrame/openapi/diff/model/Endpoint.java
@@ -1,8 +1,8 @@
 package com.qdesrame.openapi.diff.model;
 
 
-import io.swagger.oas.models.Operation;
-import io.swagger.oas.models.PathItem;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
 
 public class Endpoint {
 
diff --git a/src/main/java/com/qdesrame/openapi/diff/output/HtmlRender.java b/src/main/java/com/qdesrame/openapi/diff/output/HtmlRender.java
@@ -1,10 +1,10 @@
 package com.qdesrame.openapi.diff.output;
 
 import com.qdesrame.openapi.diff.model.*;
-import io.swagger.oas.models.PathItem;
-import io.swagger.oas.models.media.MediaType;
-import io.swagger.oas.models.parameters.Parameter;
-import io.swagger.oas.models.responses.ApiResponse;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.media.MediaType;
+import io.swagger.v3.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.responses.ApiResponse;
 import j2html.tags.ContainerTag;
 
 import java.util.List;
diff --git a/src/main/java/com/qdesrame/openapi/diff/output/MarkdownRender.java b/src/main/java/com/qdesrame/openapi/diff/output/MarkdownRender.java
@@ -1,10 +1,10 @@
 package com.qdesrame.openapi.diff.output;
 
 import com.qdesrame.openapi.diff.model.*;
-import io.swagger.oas.models.PathItem;
-import io.swagger.oas.models.media.MediaType;
-import io.swagger.oas.models.parameters.Parameter;
-import io.swagger.oas.models.responses.ApiResponse;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.media.MediaType;
+import io.swagger.v3.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.responses.ApiResponse;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/qdesrame/openapi/diff/utils/EndpointUtils.java b/src/main/java/com/qdesrame/openapi/diff/utils/EndpointUtils.java
@@ -1,8 +1,8 @@
 package com.qdesrame.openapi.diff.utils;
 
 import com.qdesrame.openapi.diff.model.Endpoint;
-import io.swagger.oas.models.Operation;
-import io.swagger.oas.models.PathItem;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/com/qdesrame/openapi/diff/utils/RefPointer.java b/src/main/java/com/qdesrame/openapi/diff/utils/RefPointer.java
@@ -1,10 +1,10 @@
 package com.qdesrame.openapi.diff.utils;
 
-import io.swagger.oas.models.Components;
-import io.swagger.oas.models.media.Schema;
-import io.swagger.oas.models.parameters.Parameter;
-import io.swagger.oas.models.parameters.RequestBody;
-import io.swagger.oas.models.responses.ApiResponse;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.parameters.RequestBody;
+import io.swagger.v3.oas.models.responses.ApiResponse;
 
 public class RefPointer {
 
