loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

upgrade Jackson, swagger-core, and swagger-parser (#4915)

Browse Source 
- swagger-parser 2.0.17
- swagger-core 2.1.1
- jackson 2.10.1
This commit is contained in:
sullis 2020-01-14 06:40:01 -08:00 committed by William Cheng
parent 8a94a3a7d5
commit 6a48dd7cd6
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/openapi-generator/pom.xml
View File

@ -198,8 +198,8 @@
<diffutils-version>1.3.0</diffutils-version> <diffutils-version>1.3.0</diffutils-version>
<guava-version>26.0-jre</guava-version> <guava-version>26.0-jre</guava-version>
<generex-version>1.0.2</generex-version> <generex-version>1.0.2</generex-version>
<jackson-version>2.9.10</jackson-version> <jackson-version>2.10.1</jackson-version>
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version> <jackson-threetenbp-version>2.10.0</jackson-threetenbp-version>
<kotlin-version>1.3.60</kotlin-version> <kotlin-version>1.3.60</kotlin-version>
</properties> </properties>
<dependencies> <dependencies>
@ -268,6 +268,11 @@
<artifactId>jackson-datatype-guava</artifactId> <artifactId>jackson-datatype-guava</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonCacheImpl.java
View File

@ -1364,8 +1364,12 @@ class JsonCacheImpl implements JsonCache.Root {
} else { } else {
JsonNode node = root.at(ptr); JsonNode node = root.at(ptr);
Object value = node.isPojo() && !JsonNode.class.isAssignableFrom(type) ? ((POJONode) node).getPojo() : node; Object value = node.isPojo() && !JsonNode.class.isAssignableFrom(type) ? ((POJONode) node).getPojo() : node;
if ((value != null) && (value.getClass() == type)) {
result = (T) value;
} else {
result = mapper.convertValue(value, type); result = mapper.convertValue(value, type);
} }
}
return result; return result;
} }

4
modules/openapi-generator/src/test/java/org/openapitools/codegen/serializer/SerializerUtilsTest.java
View File

@ -52,7 +52,7 @@ public class SerializerUtilsTest {
" description: Some description\n" + " description: Some description\n" +
" operationId: pingOp\n" + " operationId: pingOp\n" +
" responses:\n" + " responses:\n" +
" 200:\n" + " \"200\":\n" +
" description: Ok\n" + " description: Ok\n" +
"components:\n" + "components:\n" +
" schemas:\n" + " schemas:\n" +
@ -178,7 +178,7 @@ public class SerializerUtilsTest {
" description: Some description\n" + " description: Some description\n" +
" operationId: pingOp\n" + " operationId: pingOp\n" +
" responses:\n" + " responses:\n" +
" 200:\n" + " \"200\":\n" +
" description: Ok\n"; " description: Ok\n";
assertEquals(content, expected); assertEquals(content, expected);
} }

4
pom.xml
View File

@ -1401,9 +1401,9 @@
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<swagger-core-version>2.0.10</swagger-core-version> <swagger-core-version>2.1.1</swagger-core-version>
<swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid> <swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid>
<swagger-parser-version>2.0.16</swagger-parser-version> <swagger-parser-version>2.0.17</swagger-parser-version>
<scala-version>2.11.1</scala-version> <scala-version>2.11.1</scala-version>
<felix-version>3.3.1</felix-version> <felix-version>3.3.1</felix-version>
<commons-io-version>2.4</commons-io-version> <commons-io-version>2.4</commons-io-version>