Move more constants to CodegenConstants

Author: jpfinne

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java

@@ -501,5 +501,9 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case,
     public static final String X_NULLABLE = "x-nullable";
 
     public static final String X_ONE_OF_JSON_CREATOR = "x-oneof-jsonCreator";
-    public static final String X_ONE_OF_UNWRAPPED =  "x-oneOfunwrapper";
+    public static final String X_ONE_OF_UNWRAPPED =  "x-oneOfunwrapped";
+    public static final String JACKSON2_PACKAGE = "com.fasterxml.jackson";
+    public static final String JACKSON3_PACKAGE = "tools.jackson";
+    public static final String JACKSON_PACKAGE = "jacksonPackage";
+
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

@@ -2866,7 +2866,7 @@ protected void addOneOfMixinSupport(ModelsMap obj, CodegenModel cm) {
         if (!isUseJackson3()) {
             obj.getImports().add(Map.of("import", "com.fasterxml.jackson.core.JsonProcessingException"));
         }
-        obj.getImports().add(Map.of("import", importMapping.get("JsonNode")));
+        obj.getImports().add(Map.of("import", (isUseJackson3()? JACKSON3_PACKAGE:JACKSON2_PACKAGE) + ".databind.JsonNode"));
         obj.getImports().add(Map.of("import", configPackage + ".JacksonMixinConfig"));
 
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java

@@ -46,6 +46,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.openapitools.codegen.CodegenConstants.*;
 import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
 import static org.openapitools.codegen.utils.StringUtils.*;
 
@@ -58,9 +59,6 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
     public static final String JAVAX_PACKAGE = "javaxPackage";
     public static final String USE_JAKARTA_EE = "useJakartaEe";
     public static final String USE_JACKSON_3 = "useJackson3";
-    public static final String JACKSON2_PACKAGE = "com.fasterxml.jackson";
-    public static final String JACKSON3_PACKAGE = "tools.jackson";
-    public static final String JACKSON_PACKAGE = "jacksonPackage";
     public static final String SCHEMA_IMPLEMENTS = "schemaImplements";
     public static final String SCHEMA_IMPLEMENTS_FIELDS = "schemaImplementsFields";
     public static final String X_KOTLIN_IMPLEMENTS_SKIP = "xKotlinImplementsSkip";

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

@@ -127,10 +127,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     public static final String SERIALIZATION_LIBRARY_JSONB = "jsonb";
 
     public static final String USE_SPRING_BOOT4 = "useSpringBoot4";
-    private static final String JACKSON2_PACKAGE = "com.fasterxml.jackson";
-    private static final String JACKSON3_PACKAGE = "tools.jackson";
-    private static final String JACKSON_PACKAGE = "jacksonPackage";
-
     public static final String GENERATE_CLIENT_AS_BEAN = "generateClientAsBean";
 
     protected String gradleWrapperPackage = "gradle.wrapper";
@@ -1322,13 +1318,11 @@ public void setCaseInsensitiveResponseHeaders(final Boolean caseInsensitiveRespo
 
     protected void applyJackson2Package() {
         writePropertyBack(JACKSON_PACKAGE, JACKSON2_PACKAGE);
-        importMapping.put("JsonNode", JACKSON2_PACKAGE + ".databind.JsonNode");
         importMapping.put("JsonMapper", JACKSON2_PACKAGE + ".databind.json.JsonMapper");
     }
 
     protected void applyJackson3Package() {
         writePropertyBack(JACKSON_PACKAGE, JACKSON3_PACKAGE);
-        importMapping.put("JsonNode", JACKSON3_PACKAGE + ".databind.JsonNode");
         importMapping.put("JsonMapper", JACKSON3_PACKAGE + ".databind.json.JsonMapper");
     }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java

@@ -54,8 +54,7 @@
 import java.util.stream.Collectors;
 
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
-import static org.openapitools.codegen.CodegenConstants.USE_DEDUCTION_FOR_ONE_OF_INTERFACES;
-import static org.openapitools.codegen.CodegenConstants.USE_DEDUCTION_FOR_ONE_OF_INTERFACES_DESC;
+import static org.openapitools.codegen.CodegenConstants.*;
 import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 
@@ -114,9 +113,6 @@ public class SpringCodegen extends AbstractJavaCodegen
     public static final String USE_SPRING_BUILT_IN_VALIDATION = "useSpringBuiltInValidation";
     public static final String SPRING_API_VERSION = "springApiVersion";
     public static final String USE_JACKSON_3 = "useJackson3";
-    public static final String JACKSON2_PACKAGE = "com.fasterxml.jackson";
-    public static final String JACKSON3_PACKAGE = "tools.jackson";
-    public static final String JACKSON_PACKAGE = "jacksonPackage";
     public static final String ADDITIONAL_NOT_NULL_ANNOTATIONS = "additionalNotNullAnnotations";
     public static final String AUTO_X_SPRING_PAGINATED = "autoXSpringPaginated";
     public static final String GENERATE_SORT_VALIDATION = "generateSortValidation";
@@ -607,7 +603,6 @@ public void processOpts() {
         importMapping.put("DateTimeFormat", "org.springframework.format.annotation.DateTimeFormat");
         importMapping.put("ParameterObject", "org.springdoc.api.annotations.ParameterObject");
         String jacksonPackage = (String)additionalProperties.get("jacksonPackage");
-        importMapping.put("JsonNode", jacksonPackage + ".databind.JsonNode");
         importMapping.put("JsonMapper", jacksonPackage + ".databind.json.JsonMapper");
 
         if (isUseSpringBoot3() || isUseSpringBoot4()) {