Merge remote-tracking branch 'upstream/master'

Jakub Małek · Jakub Małek · commit 85e11691ad04 · 2019-03-29T08:38:52.000+01:00
# Conflicts:
#	modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/RefUtilsTest.java
diff --git a/README.md b/README.md
@@ -99,20 +99,8 @@ You can include this library from Sonatype OSS for SNAPSHOTS, or Maven central f
 <dependency>
   <groupId>io.swagger.parser.v3</groupId>
   <artifactId>swagger-parser</artifactId>
-  <version>2.0.10-SNAPSHOT</version>
+  <version>2.0.11</version>
 </dependency>
-
-```
-
-or
-
-```xml
-<dependency>
-  <groupId>io.swagger.parser.v3</groupId>
-  <artifactId>swagger-parser</artifactId>
-  <version>2.0.10-SNAPSHOT</version>
-</dependency>
-
 ```
 
 
diff --git a/modules/swagger-parser-core/pom.xml b/modules/swagger-parser-core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.10-SNAPSHOT</version>
+        <version>2.0.12-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-parser-v2-converter/pom.xml b/modules/swagger-parser-v2-converter/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.10-SNAPSHOT</version>
+        <version>2.0.12-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java b/modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java
@@ -1060,7 +1060,7 @@ public Parameter convert(io.swagger.models.parameters.Parameter v2Parameter) {
 
                 schema = a;
             } else {
-                schema = new Schema();
+                schema = SchemaTypeUtil.createSchema(sp.getType(), sp.getFormat());
                 schema.setType(sp.getType());
                 schema.setFormat(sp.getFormat());
 
diff --git a/modules/swagger-parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterTest.java b/modules/swagger-parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterTest.java
@@ -8,6 +8,7 @@
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ComposedSchema;
+import io.swagger.v3.oas.models.media.IntegerSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.parameters.RequestBody;
@@ -88,6 +89,7 @@ public class V2ConverterTest {
     private static final String ISSUE_765_YAML = "issue-765.yaml";
     private static final String ISSUE_768_JSON = "issue-786.json";
     private static final String ISSUE_820_YAML = "issue-820.yaml";
+    private static final String ISSUE_1032_YAML = "issue-1032.yaml";
 
     private static final String API_BATCH_PATH = "/api/batch/";
     private static final String PETS_PATH = "/pets";
@@ -153,6 +155,9 @@ public class V2ConverterTest {
     private static final String ARRAY_VALUES = "[{\"id\":-1,\"name\":\"Marvin the Paranoid Android\"}," +
             "{\"id\":1000000,\"name\":\"Zaphod Beeblebrox\",\"friends\":[15]}]";
     private static final String SCHEMAS_A_REF = "#/components/schemas/A";
+    private static final String UNIX_TIMESTAMP_QUERY_PARAM = "unixTimestampQuery";
+    private static final String INTEGER_TYPE = "integer";
+    private static final String INT64_FORMAT = "int64";
 
     private static final int MAX_LENGTH = 60;
     private static final int REQUIRED_SIZE = 2;
@@ -164,7 +169,7 @@ public class V2ConverterTest {
     private static final int MIN_LENGTH = 3;
     private static final int NUMBER_VALUE_TWENTY = 20;
     private static final double MULTIPLE_OF_VALUE = 0.01D;
-    private static final long DEFAULT_VALUE = 11L;
+    private static final int DEFAULT_VALUE = 11;
     private static final int EXAMPLE_8_NUMBER = 8;
     private static final int EXAMPLE_42_NUMBER = 42;
 
@@ -762,6 +767,19 @@ public void testIssue820() throws Exception {
         assertEquals(baz.getNullable(), Boolean.FALSE);
     }
 
+    @Test(description = "OpenAPI v2 converter - proper IntegerSchema parsing")
+    public void testIssue1032() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_1032_YAML);
+        assertNotNull(oas);
+        Parameter unixTimestampQueryParameter = oas.getComponents().getParameters().get(UNIX_TIMESTAMP_QUERY_PARAM);
+        assertNotNull(unixTimestampQueryParameter);
+        Schema s = unixTimestampQueryParameter.getSchema();
+        assertTrue((s instanceof IntegerSchema), "actual type: " + s);
+        IntegerSchema integerSchema = (IntegerSchema) s;
+        assertEquals(INTEGER_TYPE, integerSchema.getType());
+        assertEquals(INT64_FORMAT, integerSchema.getFormat());
+    }
+    
     private OpenAPI getConvertedOpenAPIFromJsonFile(String file) throws IOException, URISyntaxException {
         SwaggerConverter converter = new SwaggerConverter();
         String swaggerAsString = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource(file).toURI())));
@@ -771,4 +789,4 @@ private OpenAPI getConvertedOpenAPIFromJsonFile(String file) throws IOException,
         assertNotNull(result);
         return result.getOpenAPI();
     }
-}
+}
diff --git a/modules/swagger-parser-v2-converter/src/test/resources/issue-1032.yaml b/modules/swagger-parser-v2-converter/src/test/resources/issue-1032.yaml
@@ -0,0 +1,27 @@
+swagger: '2.0'
+basePath: "/"
+info:
+  version: "1"
+  title: "x"
+
+schemes:
+- https
+consumes:
+- application/json
+produces:
+- application/json
+paths:
+  /data:
+    get:
+      operationId: "getData"
+      parameters:
+      - $ref: '#/parameters/unixTimestampQuery'
+      responses:
+        '403':
+          description: Forbidden
+parameters:
+  unixTimestampQuery:
+    in: query
+    name: unixTimestamp
+    type: integer
+    format: int64
diff --git a/modules/swagger-parser-v3/pom.xml b/modules/swagger-parser-v3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.10-SNAPSHOT</version>
+        <version>2.0.12-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/processors/ExternalRefProcessor.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/processors/ExternalRefProcessor.java
@@ -77,7 +77,7 @@ public String processRefToExternalSchema(String $ref, RefFormat refFormat) {
         Schema existingModel = schemas.get(possiblyConflictingDefinitionName);
 
         if (existingModel != null) {
-            LOGGER.debug("A model for " + existingModel + " already exists");
+            LOGGER.warn("A model for " + existingModel + " already exists");
             if(existingModel.get$ref() != null) {
                 // use the new model
                 existingModel = null;
diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java
@@ -1367,6 +1367,8 @@ public Map<String, Parameter> getParameters(ObjectNode obj, String location, Par
             return null;
         }
         Map<String, Parameter> parameters = new LinkedHashMap<>();
+        Set<String> filter = new HashSet<>();
+        Parameter parameter=null;
 
         Set<String> parameterKeys = getKeys(obj);
         for(String parameterName : parameterKeys) {
@@ -1379,12 +1381,13 @@ public Map<String, Parameter> getParameters(ObjectNode obj, String location, Par
             if (parameterValue.getNodeType().equals(JsonNodeType.OBJECT)) {
                 ObjectNode parameterObj = (ObjectNode) parameterValue;
                 if(parameterObj != null) {
-                    Parameter parameter = getParameter(parameterObj, String.format("%s.%s", location, parameterName), result);
+                     parameter = getParameter(parameterObj, String.format("%s.%s", location, parameterName), result);
                     if (parameter != null) {
                         parameters.put(parameterName, parameter);
                     }
                 }
             }
+
         }
         return parameters;
     }
@@ -1403,6 +1406,13 @@ public List<Parameter> getParameterList(ArrayNode obj, String location, ParseRes
                 }
             }
         }
+        Set<String> filter = new HashSet<>();
+
+        for(Parameter param:parameters) {
+            if(!filter.add(param.getName()+"#"+param.getIn())) {
+                result.warning(location,"There are duplicate parameter values");
+            }
+        }
         return parameters;
     }
 
diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/RefUtils.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/RefUtils.java
@@ -132,6 +132,9 @@ public static String buildUrl(String rootPath, String relativePath) {
         if(!"".equals(rootPathParts[rootPathParts.length - 1])) {
             trimRoot = 1;
         }
+        if("".equals(relPathParts[0])) {
+            trimRel = 1; trimRoot = rootPathParts.length-3;
+        }        
         for(int i = 0; i < rootPathParts.length; i++) {
             if("".equals(rootPathParts[i])) {
                 trimRel += 1;
@@ -145,7 +148,7 @@ public static String buildUrl(String rootPath, String relativePath) {
                 trimRel += 1;
             }
             else if ("..".equals(relPathParts[i])) {
-                trimRel += 1;
+                trimRel += 1; trimRoot += 1;
             }
         }
 
@@ -154,7 +157,7 @@ else if ("..".equals(relPathParts[i])) {
         System.arraycopy(relPathParts,
                 trimRel,
                 outputParts,
-                rootPathParts.length - trimRoot + trimRel - 1,
+                rootPathParts.length - trimRoot,
                 relPathParts.length - trimRel);
 
         return StringUtils.join(outputParts, "/");
diff --git a/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/processors/ExternalRefProcessorTest.java b/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/processors/ExternalRefProcessorTest.java
@@ -21,9 +21,9 @@
 import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertThat;
 import static org.testng.Assert.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
 
 
 public class ExternalRefProcessorTest {
@@ -137,11 +137,11 @@ public void testNestedExternalRefs(@Injectable final Schema mockedModel){
     		times = 1;
  		}};
 
-    	String actualRef = new ExternalRefProcessor(cache, testedOpenAPI).processRefToExternalSchema(customerURL, refFormat);
+		new ExternalRefProcessor(cache, testedOpenAPI).processRefToExternalSchema(customerURL, refFormat);
 
-		assertTrue(testedOpenAPI.getComponents().getSchemas().get("Customer") != null);
-    	assertTrue(testedOpenAPI.getComponents().getSchemas().get("Contact") != null);
-    	assertTrue(testedOpenAPI.getComponents().getSchemas().get("Address") != null);
+		assertThat(testedOpenAPI.getComponents().getSchemas().get("Customer"), notNullValue());
+		assertThat(testedOpenAPI.getComponents().getSchemas().get("Contact"), notNullValue());
+		assertThat(testedOpenAPI.getComponents().getSchemas().get("Address"), notNullValue());
     }
 
 
diff --git a/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/OpenAPIDeserializerTest.java b/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/OpenAPIDeserializerTest.java
@@ -57,7 +57,6 @@
 
 public class OpenAPIDeserializerTest {
 
-
     @Test
     public void testEmptyDefinitions() throws Exception {
         String yaml = "openapi: 3.0.0\n" +
@@ -783,6 +782,7 @@ public void testDeserializeEnum() {
         assertEquals(-1, integerValues.get(0));
         assertEquals(0, integerValues.get(1));
         assertEquals(1, integerValues.get(2));
+        assertEquals(integerImpl.getDefault(), 1);
 
         Schema numberModel = resolved.getComponents().getSchemas().get("NumberEnum");
         assertTrue(numberModel instanceof Schema);
@@ -793,6 +793,7 @@ public void testDeserializeEnum() {
         assertEquals(new BigDecimal("0"), numberValues.get(1));
         assertEquals(new BigDecimal("1.6161"), numberValues.get(2));
         assertEquals(new BigDecimal("3.14"), numberValues.get(3));
+        assertEquals(numberImpl.getDefault(), new BigDecimal("3.14"));
     }
 
     @Test
diff --git a/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/RefUtilsTest.java b/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/RefUtilsTest.java
@@ -299,6 +299,20 @@ public void testPathJoin1() {
         assertEquals(ExternalRefProcessor.join("./foo#/definitions/Foo", "./bar#/definitions/Bar"), "./bar#/definitions/Bar");
     }
 
+    
+    @Test 
+    public void testPathJoin2() {
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "../newFile.yaml"), "http://foo.bar.com/my/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "../../newFile.yaml"), "http://foo.bar.com/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "./newFile.yaml"), "http://foo.bar.com/my/dir/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "../second/newFile.yaml"), "http://foo.bar.com/my/second/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "../../otherDir/newFile.yaml"), "http://foo.bar.com/otherDir/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/file.yaml", "./newFile.yaml"), "http://foo.bar.com/newFile.yaml");        
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "/newFile.yaml"), "http://foo.bar.com/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "/my/newFile.yaml"), "http://foo.bar.com/my/newFile.yaml");
+    }
+
+
     @Test
     public void shouldReturnEmptyExternalPathForInternalReference() {
         // given
@@ -371,5 +385,6 @@ public void shouldReturnExternalPathForHttpReference() {
         // then
         assertThat(externalPath.isPresent(), is(true));
         assertThat(externalPath.get(), equalTo("http://localhost/schema.json"));
+
     }
 }
diff --git a/modules/swagger-parser/pom.xml b/modules/swagger-parser/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.10-SNAPSHOT</version>
+        <version>2.0.12-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-parser/src/test/java/io/swagger/parser/OpenAPIParserTest.java b/modules/swagger-parser/src/test/java/io/swagger/parser/OpenAPIParserTest.java
@@ -470,4 +470,16 @@ public void testIssue879() {
         assertEquals(ref, "#/components/callbacks/callbackEvent");
     }
 
+    @Test
+    public void testIssue959() {
+        OpenAPIParser openAPIParser = new OpenAPIParser();
+        SwaggerParseResult result =  openAPIParser.readLocation("issue959.json",null,null);
+        assertEquals(result.getMessages().get(0),"attribute paths.'/pets/{petId}'(get).parameters.There are duplicate parameter values");
+
+        result =  openAPIParser.readLocation("issue959PathLevelDuplication.json",null,null);
+        assertEquals(result.getMessages().get(0),"attribute paths.'/pets'.There are duplicate parameter values");
+
+    }
+
 }
+
diff --git a/modules/swagger-parser/src/test/resources/issue959.json b/modules/swagger-parser/src/test/resources/issue959.json
diff --git a/modules/swagger-parser/src/test/resources/issue959PathLevelDuplication.json b/modules/swagger-parser/src/test/resources/issue959PathLevelDuplication.json
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -1367,6 +1367,8 @@ public Map<String, Parameter> getParameters(ObjectNode obj, String location, Par`
`1367`	`1367`	`return null;`
`1368`	`1368`	`}`
`1369`	`1369`	`Map<String, Parameter> parameters = new LinkedHashMap<>();`
	`1370`	`+ Set<String> filter = new HashSet<>();`
	`1371`	`+ Parameter parameter=null;`
`1370`	`1372`
`1371`	`1373`	`Set<String> parameterKeys = getKeys(obj);`
`1372`	`1374`	`for(String parameterName : parameterKeys) {`
`@@ -1379,12 +1381,13 @@ public Map<String, Parameter> getParameters(ObjectNode obj, String location, Par`
`1379`	`1381`	`if (parameterValue.getNodeType().equals(JsonNodeType.OBJECT)) {`
`1380`	`1382`	`ObjectNode parameterObj = (ObjectNode) parameterValue;`
`1381`	`1383`	`if(parameterObj != null) {`
`1382`		`- Parameter parameter = getParameter(parameterObj, String.format("%s.%s", location, parameterName), result);`
	`1384`	`+ parameter = getParameter(parameterObj, String.format("%s.%s", location, parameterName), result);`
`1383`	`1385`	`if (parameter != null) {`
`1384`	`1386`	`parameters.put(parameterName, parameter);`
`1385`	`1387`	`}`
`1386`	`1388`	`}`
`1387`	`1389`	`}`
	`1390`	`+`
`1388`	`1391`	`}`
`1389`	`1392`	`return parameters;`
`1390`	`1393`	`}`
`@@ -1403,6 +1406,13 @@ public List<Parameter> getParameterList(ArrayNode obj, String location, ParseRes`
`1403`	`1406`	`}`
`1404`	`1407`	`}`
`1405`	`1408`	`}`
	`1409`	`+ Set<String> filter = new HashSet<>();`
	`1410`	`+`
	`1411`	`+ for(Parameter param:parameters) {`
	`1412`	`+ if(!filter.add(param.getName()+"#"+param.getIn())) {`
	`1413`	`+ result.warning(location,"There are duplicate parameter values");`
	`1414`	`+ }`
	`1415`	`+ }`
`1406`	`1416`	`return parameters;`
`1407`	`1417`	`}`
`1408`	`1418`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,9 @@ public static String buildUrl(String rootPath, String relativePath) {`
`132`	`132`	`if(!"".equals(rootPathParts[rootPathParts.length - 1])) {`
`133`	`133`	`trimRoot = 1;`
`134`	`134`	`}`
	`135`	`+ if("".equals(relPathParts[0])) {`
	`136`	`+ trimRel = 1; trimRoot = rootPathParts.length-3;`
	`137`	`+ }`
`135`	`138`	`for(int i = 0; i < rootPathParts.length; i++) {`
`136`	`139`	`if("".equals(rootPathParts[i])) {`
`137`	`140`	`trimRel += 1;`
`@@ -145,7 +148,7 @@ public static String buildUrl(String rootPath, String relativePath) {`
`145`	`148`	`trimRel += 1;`
`146`	`149`	`}`
`147`	`150`	`else if ("..".equals(relPathParts[i])) {`
`148`		`- trimRel += 1;`
	`151`	`+ trimRel += 1; trimRoot += 1;`
`149`	`152`	`}`
`150`	`153`	`}`
`151`	`154`
`@@ -154,7 +157,7 @@ else if ("..".equals(relPathParts[i])) {`
`154`	`157`	`System.arraycopy(relPathParts,`
`155`	`158`	`trimRel,`
`156`	`159`	`outputParts,`
`157`		`- rootPathParts.length - trimRoot + trimRel - 1,`
	`160`	`+ rootPathParts.length - trimRoot,`
`158`	`161`	`relPathParts.length - trimRel);`
`159`	`162`
`160`	`163`	`return StringUtils.join(outputParts, "/");`