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

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

Browse Source
This commit is contained in:
William Cheng
2022-11-01 21:01:06 +08:00
parent 2bac0a8d99 06354d5f7d
commit 558ae9373d
1977 changed files with 36993 additions and 6648 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

@@ -114,9 +114,9 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.6.3"
spring_boot_version = "2.6.6"
jackson_version = "2.12.7"
jackson_databind_version = "2.12.7"
jackson_databind_nullable_version = "0.2.3"
jackson_version = "2.13.4"
jackson_databind_version = "2.13.4.2"
jackson_databind_nullable_version = "0.2.4"
jakarta_annotation_version = "1.3.5"
reactor_version = "3.4.3"
reactor_netty_version = "1.0.4"

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

@@ -127,9 +127,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.6.3</swagger-annotations-version>
<spring-boot-version>2.6.6</spring-boot-version>
<jackson-version>2.12.7</jackson-version>
<jackson-databind-version>2.12.7</jackson-databind-version>
<jackson-databind-nullable-version>0.2.3</jackson-databind-nullable-version>
<jackson-version>2.13.4</jackson-version>
<jackson-databind-version>2.13.4.2</jackson-databind-version>
<jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<junit-version>4.13.2</junit-version>
<reactor-version>3.4.3</reactor-version>

2
samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java
View File

@@ -488,7 +488,7 @@ public class ApiClient extends JavaTimeFormatter {
* @return boolean true if the MediaType represents JSON, false otherwise
*/
public boolean isJsonMime(MediaType mediaType) {
return mediaType != null && (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType) || mediaType.getSubtype().matches("^.*\\+json[;]?\\s*$"));
return mediaType != null && (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType) || mediaType.getSubtype().matches("^.*(\\+json|ndjson)[;]?\\s*$"));
}
/**

2
samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerConfiguration.java
View File

@@ -42,7 +42,7 @@ public class ServerConfiguration {
throw new IllegalArgumentException("The variable " + name + " in the server URL has invalid value " + value + ".");
}
}
url = url.replaceAll("\\{" + name + "\\}", value);
url = url.replace("{" + name + "}", value);
}
return url;
}