added fix for issue 959

r-sreesaran · r-sreesaran · commit c2f024f65a9f · 2018-12-02T00:07:21.000+05:30
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
@@ -1365,6 +1365,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) {
@@ -1377,12 +1379,15 @@ 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);
                     }
                 }
             }
+            if(!filter.add(parameter.getName()+"#"+parameter.getIn())) {
+                result.warning(location,"There are duplicate parameter values");
+            }
         }
         return parameters;
     }
@@ -1401,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/src/test/java/io/swagger/parser/OpenAPIParserTest.java b/modules/swagger-parser/src/test/java/io/swagger/parser/OpenAPIParserTest.java
@@ -462,4 +462,10 @@ 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().size(),2);
+    }
 }
diff --git a/modules/swagger-parser/src/test/resources/issue959.json b/modules/swagger-parser/src/test/resources/issue959.json
@@ -0,0 +1,213 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "version": "1.0.0",
+    "title": "Swagger Petstore",
+    "license": {
+      "name": "MIT"
+    }
+  },
+  "servers": [
+    {
+      "url": "http://petstore.swagger.io/v1"
+    }
+  ],
+  "tags" : [
+    {"name":"pet" ,
+      "description":"+ data"
+    }
+  ],
+  "paths": {
+    "/pets": {
+      "get": {
+        "summary": "List all pets",
+        "operationId": "listPets",
+        "tags": [
+          "pets"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "How many items to return at one time (max 100)",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A paged array of pets",
+            "headers": {
+              "x-next": {
+                "description": "A link to the next page of responses",
+                "schema": {
+                  "type": "string"
+                }
+              }
+            },
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Pets"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "unexpected error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "summary": "Create a pet",
+        "operationId": "createPets",
+        "tags": [
+          "pets"
+        ],
+        "responses": {
+          "201": {
+            "description": "Null response"
+          },
+          "default": {
+            "description": "unexpected error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/pets/{petId}": {
+      "get": {
+        "summary": "Info for a specific pet",
+        "operationId": "showPetById",
+        "tags": [
+          "pets"
+        ],
+        "parameters": [
+          {
+            "name": "petId",
+            "in": "path",
+            "required": true,
+            "description": "The id of the pet to retrieve",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name":"petId",
+            "in":"path",
+            "required": true
+
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Expected response to a valid request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Pets"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "unexpected error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "Pet": {
+        "required": [
+          "id",
+          "name"
+        ],
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "Pets": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/Pet"
+        }
+      },
+      "Error": {
+        "required": [
+          "code",
+          "message"
+        ],
+        "properties": {
+          "code": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "message": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "parameters": {
+      "offsetParam": {
+        "name": "offset",
+        "in": "query",
+        "description": "Number of items to skip before returning the results.",
+        "required": false,
+        "schema": {
+          "type": "integer",
+          "format": "int32",
+          "minimum": 0,
+          "default": 0
+        }
+      },
+      "limitParam": {
+        "name": "offset",
+        "in": "query",
+        "description": "Maximum number of items to return.",
+        "required": false,
+        "schema": {
+          "type": "integer",
+          "format": "int32",
+          "minimum": 1,
+          "maximum": 100,
+          "default": 20
+        }
+      }
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1365,6 +1365,8 @@ public Map<String, Parameter> getParameters(ObjectNode obj, String location, Par`
`1365`	`1365`	`return null;`
`1366`	`1366`	`}`
`1367`	`1367`	`Map<String, Parameter> parameters = new LinkedHashMap<>();`
	`1368`	`+ Set<String> filter = new HashSet<>();`
	`1369`	`+ Parameter parameter=null;`
`1368`	`1370`
`1369`	`1371`	`Set<String> parameterKeys = getKeys(obj);`
`1370`	`1372`	`for(String parameterName : parameterKeys) {`
`@@ -1377,12 +1379,15 @@ public Map<String, Parameter> getParameters(ObjectNode obj, String location, Par`
`1377`	`1379`	`if (parameterValue.getNodeType().equals(JsonNodeType.OBJECT)) {`
`1378`	`1380`	`ObjectNode parameterObj = (ObjectNode) parameterValue;`
`1379`	`1381`	`if(parameterObj != null) {`
`1380`		`- Parameter parameter = getParameter(parameterObj, String.format("%s.%s", location, parameterName), result);`
	`1382`	`+ parameter = getParameter(parameterObj, String.format("%s.%s", location, parameterName), result);`
`1381`	`1383`	`if (parameter != null) {`
`1382`	`1384`	`parameters.put(parameterName, parameter);`
`1383`	`1385`	`}`
`1384`	`1386`	`}`
`1385`	`1387`	`}`
	`1388`	`+ if(!filter.add(parameter.getName()+"#"+parameter.getIn())) {`
	`1389`	`+ result.warning(location,"There are duplicate parameter values");`
	`1390`	`+ }`
`1386`	`1391`	`}`
`1387`	`1392`	`return parameters;`
`1388`	`1393`	`}`
`@@ -1401,6 +1406,13 @@ public List<Parameter> getParameterList(ArrayNode obj, String location, ParseRes`
`1401`	`1406`	`}`
`1402`	`1407`	`}`
`1403`	`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`	`+ }`
`1404`	`1416`	`return parameters;`
`1405`	`1417`	`}`
`1406`	`1418`
Original file line number	Diff line number	Diff line change
`@@ -462,4 +462,10 @@ public void testIssue879() {`
`462`	`462`	`assertEquals(ref, "#/components/callbacks/callbackEvent");`
`463`	`463`	`}`
`464`	`464`
	`465`	`+ @Test`
	`466`	`+ public void testIssue959() {`
	`467`	`+ OpenAPIParser openAPIParser = new OpenAPIParser();`
	`468`	`+ SwaggerParseResult result = openAPIParser.readLocation("issue959.json",null,null);`
	`469`	`+ assertEquals(result.getMessages().size(),2);`
	`470`	`+ }`
`465`	`471`	`}`