Merge pull request #8629 from swagger-api/fixV3Resolving

add parse options while parsing content as string

Author: frantuma

.travis.yml

@@ -5,7 +5,7 @@ jdk:
 
 cache:
   directories:
-  - $HOME/.m2elp
+  - $HOME/.m2
   - $HOME/.ivy2
   - $HOME/.gradle/caches/
   - $HOME/.gradle/wrapper/
@@ -77,7 +77,7 @@ script:
   # fail if generators contain tab '\t'
   - /bin/bash ./bin/utils/detect_tab_in_java_class.sh
   # run integration tests defined in maven pom.xml
-  - mvn clean install -U
+  - mvn clean install
   - mvn -q --batch-mode verify -Psamples
   # Below has been moved to CircleCI
   # docker: build generator image and push to Docker Hub

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Validate.java

@@ -1,6 +1,7 @@
 package io.swagger.codegen.v3.cli.cmd;
 
 import io.swagger.v3.parser.OpenAPIV3Parser;
+import io.swagger.v3.parser.core.models.AuthorizationValue;
 
 import java.util.HashSet;
 import java.util.List;
@@ -19,7 +20,7 @@ public void run() {
         System.out.println("Validating spec file (" + spec + ")");
 
         OpenAPIV3Parser parser = new OpenAPIV3Parser();;
-        List<String> messageList = parser.readWithInfo(spec, null).getMessages();
+        List<String> messageList = parser.readWithInfo(spec, (List<AuthorizationValue>) null).getMessages();
         Set<String> messages = new HashSet<String>(messageList);
 
         for (String message : messages) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/config/CodegenConfigurator.java

@@ -461,7 +461,10 @@ public ClientOptInput toClientOptInput() {
 
         if (!StringUtils.isBlank(inputSpec)) {
             config.setInputSpec(inputSpec);
-            SwaggerParseResult result = new OpenAPIParser().readContents(inputSpec, authorizationValues, null);
+            ParseOptions options = new ParseOptions();
+            options.setResolve(true);
+            options.setFlatten(true);
+            SwaggerParseResult result = new OpenAPIParser().readContents(inputSpec, authorizationValues, options);
             OpenAPI openAPI = result.getOpenAPI();
 
             input.opts(new ClientOpts())

pom.docker.xml

@@ -930,10 +930,10 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.0</swagger-parser-version>
+        <swagger-parser-version>2.0.3-SNAPSHOT</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>2.0.0</swagger-core-version>
+        <swagger-core-version>2.0.4-SNAPSHOT</swagger-core-version>
         <commons-io-version>2.4</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
         <junit-version>4.8.1</junit-version>

pom.xml

@@ -931,10 +931,10 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.0</swagger-parser-version>
+        <swagger-parser-version>2.0.3-SNAPSHOT</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>2.0.0</swagger-core-version>
+        <swagger-core-version>2.0.4-SNAPSHOT</swagger-core-version>
         <commons-io-version>2.4</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
         <junit-version>4.8.1</junit-version>

pom.xml.bash

@@ -909,10 +909,10 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.0</swagger-parser-version>
+        <swagger-parser-version>2.0.3-SNAPSHOT</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>2.0.0</swagger-core-version>
+        <swagger-core-version>2.0.4-SNAPSHOT</swagger-core-version>
         <commons-io-version>2.4</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
         <junit-version>4.8.1</junit-version>

pom.xml.circleci

@@ -941,10 +941,10 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.0</swagger-parser-version>
+        <swagger-parser-version>2.0.3-SNAPSHOT</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>2.0.0</swagger-core-version>
+        <swagger-core-version>2.0.4-SNAPSHOT</swagger-core-version>
         <commons-io-version>2.4</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
         <junit-version>4.8.1</junit-version>

pom.xml.shippable

@@ -911,10 +911,10 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.0</swagger-parser-version>
+        <swagger-parser-version>2.0.3-SNAPSHOT</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>2.0.0</swagger-core-version>
+        <swagger-core-version>2.0.4-SNAPSHOT</swagger-core-version>
         <commons-io-version>2.4</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
         <junit-version>4.8.1</junit-version>