Adding flag to enable conditional write of writeIntermediateModel

aws · Feb 21, 2025 · 649e235 · 649e235
1 parent b8398bc
commit 649e235
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 38 deletions.
diff --git a/...aven-plugin/src/main/java/software/amazon/awssdk/codegen/maven/plugin/GenerationMojo.java b/...aven-plugin/src/main/java/software/amazon/awssdk/codegen/maven/plugin/GenerationMojo.java
@@ -59,9 +59,10 @@ public class GenerationMojo extends AbstractMojo {
     @Parameter(property = "outputDirectory", defaultValue = "${project.build.directory}")
     private String outputDirectory;
 
-    @Parameter(defaultValue = "false")
+    @Parameter(property = "writeIntermediateModel", defaultValue = "false")
     private boolean writeIntermediateModel;
 
+
     @Parameter(defaultValue = "${project}", readonly = true)
     private MavenProject project;
 
@@ -117,7 +118,6 @@ private void generateCode(C2jModels models) {
                      .resourcesDirectory(resourcesDirectory.toFile().getAbsolutePath())
                      .testsDirectory(testsDirectory.toFile().getAbsolutePath())
                      .intermediateModelFileNamePrefix(intermediateModelFileNamePrefix(models))
-                     .targetDirectory(outputDirectory)
                      .build()
                      .execute();
     }

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/CodeGenerator.java b/codegen/src/main/java/software/amazon/awssdk/codegen/CodeGenerator.java
@@ -41,7 +41,6 @@ public class CodeGenerator {
      * The prefix for the file name that contains the intermediate model.
      */
     private final String fileNamePrefix;
-    private final String targetDirectory;
 
     static {
         // Make sure ClassName is statically initialized before we do anything in parallel.
@@ -57,7 +56,6 @@ public CodeGenerator(Builder builder) {
         this.resourcesDirectory = builder.resourcesDirectory != null ? builder.resourcesDirectory
                                                                      : builder.sourcesDirectory;
         this.fileNamePrefix = builder.fileNamePrefix;
-        this.targetDirectory = builder.targetDirectory;
     }
 
     public static File getModelDirectory(String outputDirectory) {
@@ -84,10 +82,6 @@ public void execute() {
             if (fileNamePrefix != null) {
                 writeIntermediateModel(intermediateModel);
             }
-
-            File targetDir = new File(targetDirectory);
-            writeToTargetDirectory(intermediateModel, targetDir);
-
             emitCode(intermediateModel);
 
         } catch (Exception e) {
@@ -97,29 +91,6 @@ public void execute() {
         }
     }
 
-    private void writeToTargetDirectory(IntermediateModel model, File targetDir) throws IOException {
-        PrintWriter writer = null;
-        try {
-            if (!targetDir.exists() && !targetDir.mkdirs()) {
-                throw new RuntimeException("Failed to create " + targetDir.getAbsolutePath());
-            }
-
-            File outputFile = new File(targetDir, "intermediate-model.json");
-
-            if (!outputFile.exists() && !outputFile.createNewFile()) {
-                throw new RuntimeException("Error creating file " + outputFile.getAbsolutePath());
-            }
-
-            writer = new PrintWriter(outputFile, "UTF-8");
-            Jackson.writeWithObjectMapper(model, writer);
-        } finally {
-            if (writer != null) {
-                writer.flush();
-                writer.close();
-            }
-        }
-    }
-
     private void writeIntermediateModel(IntermediateModel model) throws IOException {
         File modelDir = getModelDirectory(sourcesDirectory);
         PrintWriter writer = null;
@@ -167,7 +138,6 @@ public static final class Builder {
         private String resourcesDirectory;
         private String testsDirectory;
         private String fileNamePrefix;
-        private String targetDirectory;
 
         private Builder() {
         }
@@ -196,12 +166,6 @@ public Builder intermediateModelFileNamePrefix(String fileNamePrefix) {
             this.fileNamePrefix = fileNamePrefix;
             return this;
         }
-
-        public Builder targetDirectory(String targetDirectory) {
-            this.targetDirectory = targetDirectory;
-            return this;
-        }
-
         /**
          * @return An immutable {@link CodeGenerator} object.
          */