From 8bb064a2775985305cae4787222ca44edb2ba92f Mon Sep 17 00:00:00 2001 From: Zhiwei Liang Date: Tue, 24 Mar 2026 15:48:03 -0400 Subject: [PATCH] chore: refactor date library usage to use CodegenConstants.DATE_LIBRARY Signed-off-by: Zhiwei Liang --- .../main/java/io/swagger/codegen/CodegenConstants.java | 2 ++ .../swagger/codegen/languages/AbstractJavaCodegen.java | 10 ++++++---- .../swagger/codegen/languages/KotlinClientCodegen.java | 10 ++++++---- .../io/swagger/codegen/languages/SpringCodegen.java | 2 +- .../swagger/codegen/options/JavaOptionsProvider.java | 2 +- .../codegen/options/JaxRSServerOptionsProvider.java | 2 +- .../options/KotlinClientCodegenOptionsProvider.java | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java index d04e606ffa2..b1777675eba 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java @@ -239,4 +239,6 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case, public static final String INTERFACE_CONTROLLER = "interface-controller"; public static final String IGNORE_IMPORT_MAPPING_OPTION = "ignoreImportMappings"; + + public static final String DATE_LIBRARY = "dateLibrary"; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java index 7e9bb4193ef..841ead9f393 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java @@ -55,8 +55,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code static Logger LOGGER = LoggerFactory.getLogger(AbstractJavaCodegen.class); public static final String FULL_JAVA_UTIL = "fullJavaUtil"; + /** @deprecated Use {@link CodegenConstants#DATE_LIBRARY} instead. */ + @Deprecated + public static final String DATE_LIBRARY = CodegenConstants.DATE_LIBRARY; public static final String DEFAULT_LIBRARY = ""; - public static final String DATE_LIBRARY = "dateLibrary"; public static final String JAVA8_MODE = "java8"; public static final String JAVA11_MODE = "java11"; public static final String SUPPORT_ASYNC = "supportAsync"; @@ -185,7 +187,7 @@ public AbstractJavaCodegen() { cliOptions.add(CliOption.newBoolean(IGNORE_UNKNOWN_JACKSON_ANNOTATION, "adds @JsonIgnoreProperties(ignoreUnknown = true) annotation to model classes")); } - CliOption dateLibrary = new CliOption(DATE_LIBRARY, "Option. Date library to use"); + CliOption dateLibrary = new CliOption(CodegenConstants.DATE_LIBRARY, "Option. Date library to use"); Map dateOptions = new HashMap(); dateOptions.put("java8", "Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets \"" + JAVA8_MODE + "\" to true"); dateOptions.put("java11", "Java 11 native JSR384 (preferred for jdk 11+) - note: this also sets \"" + JAVA11_MODE + "\" to true"); @@ -491,8 +493,8 @@ public void processOpts() { } } - if (additionalProperties.containsKey(DATE_LIBRARY)) { - setDateLibrary(additionalProperties.get("dateLibrary").toString()); + if (additionalProperties.containsKey(CodegenConstants.DATE_LIBRARY)) { + setDateLibrary(additionalProperties.get(CodegenConstants.DATE_LIBRARY).toString()); } else if (java8Mode) { setDateLibrary("java8"); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/KotlinClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/KotlinClientCodegen.java index 0a868d0f02b..bb8dc2e7ce2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/KotlinClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/KotlinClientCodegen.java @@ -13,7 +13,9 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { - public static final String DATE_LIBRARY = "dateLibrary"; + /** @deprecated Use {@link CodegenConstants#DATE_LIBRARY} instead. */ + @Deprecated + public static final String DATE_LIBRARY = CodegenConstants.DATE_LIBRARY; protected CodegenConstants.ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.camelCase; static Logger LOGGER = LoggerFactory.getLogger(KotlinClientCodegen.class); @@ -49,7 +51,7 @@ public KotlinClientCodegen() { apiPackage = packageName + ".apis"; modelPackage = packageName + ".models"; - CliOption dateLibrary = new CliOption(DATE_LIBRARY, "Option. Date library to use"); + CliOption dateLibrary = new CliOption(CodegenConstants.DATE_LIBRARY, "Option. Date library to use"); Map dateOptions = new HashMap<>(); dateOptions.put(DateLibrary.THREETENBP.value, "Threetenbp"); dateOptions.put(DateLibrary.STRING.value, "String"); @@ -78,8 +80,8 @@ public void setDateLibrary(String library) { public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey(DATE_LIBRARY)) { - setDateLibrary(additionalProperties.get(DATE_LIBRARY).toString()); + if (additionalProperties.containsKey(CodegenConstants.DATE_LIBRARY)) { + setDateLibrary(additionalProperties.get(CodegenConstants.DATE_LIBRARY).toString()); } if (DateLibrary.THREETENBP.value.equals(dateLibrary)) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java index bee47cbbafb..efdfe5c6d02 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java @@ -135,7 +135,7 @@ public void processOpts() { if (this.java8) { additionalProperties.put("javaVersion", "1.8"); additionalProperties.put("jdk8", "true"); - if (!additionalProperties.containsKey(DATE_LIBRARY)) { + if (!additionalProperties.containsKey(CodegenConstants.DATE_LIBRARY)) { setDateLibrary("java8"); } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java index 1d6594bef79..73f9f4e488e 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java @@ -74,7 +74,7 @@ public JavaOptionsProvider() { .put(JavaClientCodegen.JAVA8_MODE, JAVA8_MODE_VALUE) .put(JavaClientCodegen.JAVA11_MODE, JAVA11_MODE_VALUE) .put(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, "true") - .put(JavaClientCodegen.DATE_LIBRARY, "joda") + .put(CodegenConstants.DATE_LIBRARY, "joda") .put(JavaClientCodegen.DISABLE_HTML_ESCAPING, "false") .put("hideGenerationTimestamp", "true") .put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java index f2d3b4de781..5efc83b9a07 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java @@ -60,7 +60,7 @@ public String getLanguage() { public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); builder.put(CodegenConstants.IMPL_FOLDER, IMPL_FOLDER_VALUE) - .put(JavaClientCodegen.DATE_LIBRARY, "joda") //java.lang.IllegalArgumentException: Multiple entries with same key: dateLibrary=joda and dateLibrary=joda + .put(CodegenConstants.DATE_LIBRARY, JODA_DATE_LIBRARY) //java.lang.IllegalArgumentException: Multiple entries with same key: dateLibrary=joda and dateLibrary=joda .put("title", "Test title") .put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/KotlinClientCodegenOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/KotlinClientCodegenOptionsProvider.java index acfc57216ac..d6b86861ec1 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/KotlinClientCodegenOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/KotlinClientCodegenOptionsProvider.java @@ -31,7 +31,7 @@ public Map createOptions() { .put(CodegenConstants.GROUP_ID, GROUP_ID) .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER) .put(CodegenConstants.ENUM_PROPERTY_NAMING, ENUM_PROPERTY_NAMING) - .put(KotlinClientCodegen.DATE_LIBRARY, DATE_LIBRARY) + .put(CodegenConstants.DATE_LIBRARY, DATE_LIBRARY) .build(); }