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

remove errorObjectSubtype from java client genreator (#12405)

Browse Source
This commit is contained in:
William Cheng 2022-05-20 17:06:17 +08:00 committed by GitHub
parent 3f788d3d77
commit e24527b4d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
View File

@ -69,10 +69,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
public static final String SUPPORT_STREAMING = "supportStreaming"; public static final String SUPPORT_STREAMING = "supportStreaming";
public static final String GRADLE_PROPERTIES = "gradleProperties"; public static final String GRADLE_PROPERTIES = "gradleProperties";
public static final String ERROR_OBJECT_TYPE = "errorObjectType"; public static final String ERROR_OBJECT_TYPE = "errorObjectType";
public static final String ERROR_OBJECT_SUBTYPE = "errorObjectSubtype";
public static final String MICROPROFILE_DEFAULT = "default";
public static final String MICROPROFILE_KUMULUZEE = "kumuluzee";
public static final String FEIGN = "feign"; public static final String FEIGN = "feign";
public static final String GOOGLE_API_CLIENT = "google-api-client"; public static final String GOOGLE_API_CLIENT = "google-api-client";
@ -92,6 +88,8 @@ public class JavaClientCodegen extends AbstractJavaCodegen
public static final String MICROPROFILE_REST_CLIENT_VERSION = "microprofileRestClientVersion"; public static final String MICROPROFILE_REST_CLIENT_VERSION = "microprofileRestClientVersion";
public static final String MICROPROFILE_REST_CLIENT_DEFAULT_VERSION = "2.0"; public static final String MICROPROFILE_REST_CLIENT_DEFAULT_VERSION = "2.0";
public static final String MICROPROFILE_REST_CLIENT_DEFAULT_ROOT_PACKAGE = "javax"; public static final String MICROPROFILE_REST_CLIENT_DEFAULT_ROOT_PACKAGE = "javax";
public static final String MICROPROFILE_DEFAULT = "default";
public static final String MICROPROFILE_KUMULUZEE = "kumuluzee";
public static final String SERIALIZATION_LIBRARY_GSON = "gson"; public static final String SERIALIZATION_LIBRARY_GSON = "gson";
public static final String SERIALIZATION_LIBRARY_JACKSON = "jackson"; public static final String SERIALIZATION_LIBRARY_JACKSON = "jackson";
@ -121,7 +119,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
protected boolean supportStreaming = false; protected boolean supportStreaming = false;
protected String gradleProperties; protected String gradleProperties;
protected String errorObjectType; protected String errorObjectType;
protected List<String> errorObjectSubtype;
protected String authFolder; protected String authFolder;
protected String serializationLibrary = null; protected String serializationLibrary = null;
protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup
@ -388,11 +385,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
} }
additionalProperties.put(ERROR_OBJECT_TYPE, errorObjectType); additionalProperties.put(ERROR_OBJECT_TYPE, errorObjectType);
if (additionalProperties.containsKey(ERROR_OBJECT_SUBTYPE)) {
this.setErrorObjectSubtype((List<String>) additionalProperties.get(ERROR_OBJECT_SUBTYPE));
}
additionalProperties.put(ERROR_OBJECT_SUBTYPE, errorObjectSubtype);
final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/"); final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/");
final String apiFolder = (sourceFolder + '/' + apiPackage).replace(".", "/"); final String apiFolder = (sourceFolder + '/' + apiPackage).replace(".", "/");
final String modelsFolder = (sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar); final String modelsFolder = (sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
@ -1078,10 +1070,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
this.errorObjectType = errorObjectType; this.errorObjectType = errorObjectType;
} }
public void setErrorObjectSubtype(final List<String> errorObjectSubtype) {
this.errorObjectSubtype = errorObjectSubtype;
}
/** /**
* Serialization library. * Serialization library.
* *