loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-09 09:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.4.x' into 6.0.x

Browse Source
This commit is contained in:
WILLIAM CHENG
2021-11-01 00:54:44 +08:00
parent c59a987e00 ab603a7322
commit 4f2b5ee36d
288 changed files with 4107 additions and 2113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/client/petstore/java/jersey2-java8-localdatetime/build.gradle
View File

@@ -103,7 +103,7 @@ ext {
jakarta_annotation_version = "1.3.5"
jersey_version = "2.35"
junit_version = "4.13.2"
scribejava_apis_version = "6.9.0"
scribejava_apis_version = "8.3.1"
}
dependencies {

2
samples/client/petstore/java/jersey2-java8-localdatetime/build.sbt
View File

@@ -21,7 +21,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-databind" % "2.13.0" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.13.0" % "compile",
"org.openapitools" % "jackson-databind-nullable" % "0.2.1" % "compile",
"com.github.scribejava" % "scribejava-apis" % "6.9.0" % "compile",
"com.github.scribejava" % "scribejava-apis" % "8.3.1" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"junit" % "junit" % "4.13.2" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"

23
samples/client/petstore/java/jersey2-java8-localdatetime/pom.xml
View File

@@ -36,7 +36,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.0.0</version>
<executions>
<execution>
<id>enforce-maven</id>
@@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0-M5</version>
<configuration>
<systemProperties>
<property>
@@ -84,16 +84,14 @@
</execution>
</executions>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<version>3.2.0</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
@@ -101,11 +99,10 @@
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<version>3.2.0</version>
<executions>
<execution>
<id>add_sources</id>
@@ -138,8 +135,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>1.8</source>
<target>1.8</target>
<fork>true</fork>
<meminitial>128m</meminitial>
<maxmem>512m</maxmem>
@@ -152,7 +149,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -163,7 +160,7 @@
</executions>
<configuration>
<doclint>none</doclint>
<source>1.8</source>
<source>1.8</source>
<tags>
<tag>
<name>http.response.details</name>
@@ -176,7 +173,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -308,6 +305,6 @@
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<junit-version>4.13.2</junit-version>
<scribejava-apis-version>6.9.0</scribejava-apis-version>
<scribejava-apis-version>8.3.1</scribejava-apis-version>
</properties>
</project>

3
samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/JSON.java
View File

@@ -2,6 +2,7 @@ package org.openapitools.client;
import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.json.JsonMapper;
import org.openapitools.jackson.nullable.JsonNullableModule;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.openapitools.client.model.*;
@@ -21,7 +22,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
public JSON() {
mapper = new ObjectMapper();
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false);
JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false);
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true);
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);