Merge pull request #8885 from swagger-api/ticket-8884

ref #8884 - fix openapi-yaml serialization
swagger-api · Nov 5, 2018 · f7f86b5 · f7f86b5
2 parents d3ed24c + 3ea028a
commit f7f86b5
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 15 deletions.
diff --git a/modules/swagger-codegen-maven-plugin/examples/java-client.xml b/modules/swagger-codegen-maven-plugin/examples/java-client.xml
@@ -118,7 +118,7 @@
     </dependencies>
 
     <properties>
-        <swagger-annotations-version>1.5.20</swagger-annotations-version>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <jersey-version>2.25.1</jersey-version>
         <jackson-version>2.9.5</jackson-version>
         <jodatime-version>2.7</jodatime-version>

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java
@@ -8,14 +8,12 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 import io.swagger.codegen.*;
-import io.swagger.codegen.examples.ExampleGenerator;
 import io.swagger.jackson.mixin.ResponseSchemaMixin;
 import io.swagger.models.Model;
 import io.swagger.models.Response;
 import io.swagger.models.Swagger;
-import io.swagger.models.properties.Property;
 import io.swagger.util.DeserializationModule;
-import io.swagger.util.Yaml;
+import io.swagger.util.ReferenceSerializationConfigurer;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -120,5 +118,6 @@ private void configureMapper(ObjectMapper mapper) {
         mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         mapper.addMixIn(Response.class, ResponseSchemaMixin.class);
+        ReferenceSerializationConfigurer.serializeAsComputedRef(mapper);
     }
 }
diff --git a/...gger-codegen/src/test/java/io/swagger/codegen/options/AkkaScalaClientOptionsProvider.java b/...gger-codegen/src/test/java/io/swagger/codegen/options/AkkaScalaClientOptionsProvider.java
@@ -4,8 +4,6 @@
 
 import com.google.common.collect.ImmutableMap;
 
-import com.sun.org.apache.bcel.internal.classfile.Code;
-
 import java.util.Map;
 
 public class AkkaScalaClientOptionsProvider implements OptionsProvider {

diff --git a/pom.xml b/pom.xml
@@ -936,7 +936,7 @@
         <swagger-parser-version>1.0.36</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-core-version>1.5.21</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>

diff --git a/pom.xml.bash b/pom.xml.bash
@@ -912,7 +912,7 @@
         <swagger-parser-version>1.0.36</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-core-version>1.5.21</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>

diff --git a/pom.xml.circleci b/pom.xml.circleci
@@ -960,7 +960,7 @@
         <swagger-parser-version>1.0.36</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-core-version>1.5.21</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>

diff --git a/pom.xml.circleci.java7 b/pom.xml.circleci.java7
@@ -942,7 +942,7 @@
         <swagger-parser-version>1.0.36</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-core-version>1.5.21</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>

diff --git a/pom.xml.ios b/pom.xml.ios
@@ -920,7 +920,7 @@
         <swagger-parser-version>1.0.36</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-core-version>1.5.21</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>

diff --git a/pom.xml.jenkins b/pom.xml.jenkins
@@ -1000,7 +1000,7 @@
         <swagger-parser-version>1.0.36</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-core-version>1.5.21</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>

diff --git a/pom.xml.jenkins.java7 b/pom.xml.jenkins.java7
@@ -924,7 +924,7 @@
         <swagger-parser-version>1.0.36</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-core-version>1.5.21</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>

diff --git a/pom.xml.shippable b/pom.xml.shippable
@@ -914,7 +914,7 @@
         <swagger-parser-version>1.0.36</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-core-version>1.5.21</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>

diff --git a/pom.xml.travis b/pom.xml.travis
@@ -936,7 +936,7 @@
         <swagger-parser-version>1.0.36</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.20</swagger-core-version>
+        <swagger-core-version>1.5.21</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>