Merge pull request #896 from r-sreesaran/branch_test

Fix for issue 895

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java

@@ -813,6 +813,12 @@ public License getLicense(ObjectNode node, String location, ParseResult result)
 
         value = getString("url", node, false, location, result);
         if(StringUtils.isNotBlank(value)) {
+            try {
+               new URL(value);
+            }
+            catch (Exception e) {
+                result.warning(location,value);
+            }
             license.setUrl(value);
         }
 
@@ -844,6 +850,12 @@ public Contact getContact(ObjectNode node, String location, ParseResult result)
 
         value = getString("url", node, false, location, result);
         if(StringUtils.isNotBlank(value)) {
+            try {
+                new URL(value);
+            }
+            catch (Exception e) {
+                result.warning(location,value);
+            }
             contact.setUrl(value);
         }
 

modules/swagger-parser/src/test/java/io/swagger/parser/OpenAPIParserTest.java

@@ -75,6 +75,16 @@ public void testIssue887() {
         assertEquals(result.getMessages().get(0), "attribute tags.sample is repeated");
     }
 
+    @Test
+    public void testIssue895() {
+        SwaggerParseResult result = new OpenAPIParser().readLocation("issue895.yaml", null, null);
+        assertNotNull(result);
+        assertNotNull(result.getOpenAPI());
+        assertEquals(result.getMessages().get(0),"attribute info.contact.test");
+        assertEquals(result.getMessages().get(1),"attribute info.license.test1");
+
+    }
+
     @Test
     public void testIssue892() {
         SwaggerParseResult result = new OpenAPIParser().readLocation("issue892-main.yaml", null, null);

modules/swagger-parser/src/test/resources/issue895.yaml

@@ -0,0 +1,186 @@
+{
+	"openapi": "3.0.0",
+	"info": {
+		"version": "1.0.0",
+		"title": "Swagger Petstore",
+		"contact": {
+            "name": "API Support",
+            "url": "test",
+            "email": "[email protected]"
+          },
+		"license": {
+            "name": "Apache 2.0",
+            "url": "test1"
+            }
+	},
+	"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"
+						}
+					}
+				],
+				"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"
+					}
+				}
+			}
+		}
+	}
+}