Merge branch 'master' into discriminator-resolve-subtypes

Author: gracekarina

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

@@ -413,13 +413,8 @@ public Server getServer(ObjectNode obj, String location, ParseResult result, Str
 					if("http".equals(absURI.getScheme()) || "https".equals(absURI.getScheme())){
 						value = absURI.resolve(new URI(value)).toString();
 					}
-                    else {
-                        result.warning(location," invalid url : "+value);
-                    }
-
 				} catch (URISyntaxException e) {
                     result.warning(location,"invalid url : "+value);
-					e.printStackTrace();
 				}
 
 			}

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java

@@ -2262,13 +2262,14 @@ public void testParseOptionsSkipMatchesTrue() {
     }
 
     @Test
-    public void testIssue1236() {
+    public void testRegressionIssue1236() {
         final ParseOptions options = new ParseOptions();
         options.setResolve(true);
 
         SwaggerParseResult result = new OpenAPIV3Parser()
-                .readLocation("src/test/resources/issue-1236/petstore.json", null, options);
-        assertEquals(result.getMessages().get(0), "attribute .servers. invalid url : /te st/sample.yaml");
+                .readLocation("src/test/resources/testRegressionIssue1236.yaml", null, options);
+        assertTrue(result.getMessages().size() == 0);
+
     }
 
     @Test

modules/swagger-parser-v3/src/test/resources/issue-1236/petstore.json

@@ -0,0 +1,45 @@
+openapi: 3.0.0
+info:
+  title: Issue with server
+  license:
+    name: Apache-2.0
+    url: https://www.apache.org/licenses/LICENSE-2.0.html
+  version: 1.0.0
+servers:
+  - url: http://{server}.swagger.io:{port}/v2
+    description: petstore server
+    variables:
+      server:
+        default: petstore
+        enum:
+          - petstore
+          - qa-petstore
+          - dev-petstore
+      port:
+        default: "80"
+        enum:
+          - "80"
+          - "8080"
+  - url: https://localhost:8080/{version}
+    description: The local server
+    variables:
+      version:
+        default: v2
+        enum:
+          - v1
+          - v2
+  - url: /api/v1
+    description: The local server
+    variables:
+      version:
+        default: v2
+        enum:
+          - v1
+          - v2
+paths:
+  /ping:
+    get:
+      operationId: pingGet
+      responses:
+        '201':
+          description: OK