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

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

Browse Source
This commit is contained in:
William Cheng
2021-10-06 12:00:02 +08:00
parent a55f8afc81 8d7be74b79
commit 0bfa28f844
1650 changed files with 36995 additions and 6074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/client/petstore/java/webclient-nulable-arrays/build.gradle
View File

@@ -50,7 +50,7 @@ if(hasProperty('target') && target == 'android') {
}
dependencies {
provided 'javax.annotation:jsr250-api:1.0'
provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
}
}
@@ -116,7 +116,7 @@ ext {
jackson_version = "2.11.3"
jackson_databind_version = "2.11.3"
jackson_databind_nullable_version = "0.2.1"
javax_annotation_version = "1.3.2"
jakarta_annotation_version = "1.3.5"
reactor_version = "3.4.3"
reactor_netty_version = "0.7.15.RELEASE"
jodatime_version = "2.9.9"
@@ -135,6 +135,6 @@ dependencies {
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "javax.annotation:javax.annotation-api:$javax_annotation_version"
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
testImplementation "junit:junit:$junit_version"
}

8
samples/client/petstore/java/webclient-nulable-arrays/pom.xml
View File

@@ -109,9 +109,9 @@
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax-annotation-version}</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta-annotation-version}</version>
<scope>provided</scope>
</dependency>
@@ -130,7 +130,7 @@
<jackson-version>2.11.3</jackson-version>
<jackson-databind-version>2.11.3</jackson-databind-version>
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
<javax-annotation-version>1.3.2</javax-annotation-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<junit-version>4.13.1</junit-version>
<reactor-version>3.4.3</reactor-version>
<reactor-netty-version>0.7.15.RELEASE</reactor-netty-version>

1
samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java
View File

@@ -28,6 +28,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import org.openapitools.jackson.nullable.JsonNullable;
import java.util.NoSuchElementException;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonTypeName;
/**
* ByteArrayObject