Simplification of JSpecify implementation

Author: jpfinne

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

@@ -852,19 +852,24 @@ private void sanitizeConfig() {
 
     protected void applyJavaxPackage() {
         writePropertyBack(JAVAX_PACKAGE, "javax");
-        writePropertyBack("nullableAnnotation", "@javax.annotation.Nullable");
-        writePropertyBack("nonNullAnnotation", "@javax.annotation.Nonnull");
     }
 
     protected void applyJakartaPackage() {
         writePropertyBack(JAVAX_PACKAGE, "jakarta");
-        writePropertyBack("nullableAnnotation", "@jakarta.annotation.Nullable");
-        writePropertyBack("nonNullAnnotation", "@jakarta.annotation.Nonnull");
     }
 
     protected void applyJspecify() {
-        writePropertyBack("nullableAnnotation", "@org.jspecify.annotations.Nullable");
-        writePropertyBack("nonNullAnnotation", "@NonNull");
+        importMapping.put("Nullable", "org.jspecify.annotations.Nullable");
+        if (Boolean.TRUE.equals(additionalProperties.get(CodegenConstants.GENERATE_MODELS))) {
+            supportingFiles.add(new SupportingFile("modelPackageInfo.mustache",
+                    (sourceFolder + File.separator + modelPackage).replace(".", java.io.File.separator),
+                    "package-info.java"));
+        }
+        if (Boolean.TRUE.equals(additionalProperties.get(CodegenConstants.GENERATE_APIS))) {
+            supportingFiles.add(new SupportingFile("apiPackageInfo.mustache",
+                    (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator),
+                    "package-info.java"));
+        }
     }
 
     @Override
@@ -2677,31 +2682,33 @@ public void setEnumPropertyNaming(final String enumPropertyNamingType) {
     @Override
     protected ImmutableMap.Builder<String, Mustache.Lambda> addMustacheLambdas() {
         this.jSpecifyNullableLambda = new JSpecifyNullableLambda();
+        // Add jSpecify nullable annotation in the correct location before or inside a declartion
+        Mustache.Lambda jSpecifyDatatypeLambda = (fragment, writer) -> {
+            String dataType = fragment.execute();
+            if (jSpecifyNullableLambda.keptNullable) {
+                jSpecifyNullableLambda.keptNullable = false;
+                int idx = dataType.lastIndexOf('.');
+                if (idx > 0) {
+                    // generate declaration like java.time.@Nullable Timestamp
+                    writer.write(dataType.substring(0, idx + 1));
+                    writer.write("@Nullable ");
+                    writer.write(dataType.substring(idx + 1));
+                } else {
+                    writer.write("@Nullable ");
+                    writer.write(dataType);
+                }
+            } else {
+                writer.write(dataType);
+            }
+        };
         return super.addMustacheLambdas()
-                .put("jSpecifyDatatype",(fragment, writer) -> {
-                    String dataType = fragment.execute();
-                    if (jSpecifyNullableLambda.keptNullable) {
-                        jSpecifyNullableLambda.keptNullable = false;
-                        int idx = dataType.lastIndexOf('.');
-                        if (idx > 0) {
-                            // generate declareation like java.time.@Nullable Timestamp
-                            writer.write(dataType.substring(0, idx + 1));
-                            writer.write("@Nullable ");
-                            writer.write(dataType.substring(idx + 1));
-                        } else {
-                            writer.write("@Nullable ");
-                            writer.write(dataType);
-                        }
-                    } else {
-                        writer.write(dataType);
-                    }
-                })
+                .put("jSpecifyDatatype", jSpecifyDatatypeLambda)
                 .put("jSpecifyNullable", jSpecifyNullableLambda);
 
     }
 
     /**
-     * for Jspecify, remove @Nullable before the datatype.
+     * for Jspecify, remove @Nullable before the datatype and set keptNullable to true if done.
      */
     class JSpecifyNullableLambda implements Mustache.Lambda {
         private String nullableAnnotation = "@Nullable";
@@ -2731,17 +2738,6 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio
         }
     }
 
-    protected void addPackagInfoSupportingFiles() {
-        if (useJspecify) {
-            supportingFiles.add(new SupportingFile("modelPackageInfo.mustache",
-                    (sourceFolder + File.separator + modelPackage).replace(".", java.io.File.separator),
-                    "package-info.java"));
-            supportingFiles.add(new SupportingFile("apiPackageInfo.mustache",
-                    (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator),
-                    "package-info.java"));
-        }
-    }
-
     /**
      * Adds Nullable import if any parameter is nullable or optional.
      */

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

@@ -1375,18 +1375,13 @@ public List<VendorExtension> getSupportedVendorExtensions() {
     @Override
     protected void applyJspecify() {
         super.applyJspecify();
-        addPackagInfoSupportingFiles();
-        importMapping.put("Nullable", "org.jspecify.annotations.Nullable");
-        jSpecifyNullableLambda.setNullableAnnotation("@" + additionalProperties.get(JAVAX_PACKAGE) + ".annotation.Nullable");
-    }
-
-    @Override
-    protected void addPackagInfoSupportingFiles() {
-        super.addPackagInfoSupportingFiles();
-        if (useJspecify) {
+        if (Boolean.TRUE.equals(additionalProperties.get(CodegenConstants.GENERATE_APIS))) {
             supportingFiles.add(new SupportingFile("invokerPackageInfo.mustache",
                     (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator),
                     "package-info.java"));
         }
+        //  nullable_var_annotations.mustache generates nullable annotations as @{{javaxPackage}}.annotation.Nullable
+        // override the default pattern for the "find and replace"
+        jSpecifyNullableLambda.setNullableAnnotation("@" + additionalProperties.get(JAVAX_PACKAGE) + ".annotation.Nullable");
     }
 }

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

@@ -754,7 +754,9 @@ public void processOpts() {
             modelTemplateFiles.clear();
         }
         supportsAdditionalPropertiesWithComposedSchema = true;
-        addPackagInfoSupportingFiles();
+        if (useJspecify) {
+            applyJspecify();
+        }
     }
 
     protected void applyJackson2Package() {