Merge pull request #235 from JanStureNielsen/master

Polish - use try-with-resources and simplify name calculation
JCTools · Mar 6, 2019 · 5033e7f · 5033e7f
2 parents fbef849 + 50100c0
commit 5033e7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 32 deletions.
diff --git a/...s-build/src/main/java/org/jctools/queues/atomic/JavaParsingAtomicArrayQueueGenerator.java b/...s-build/src/main/java/org/jctools/queues/atomic/JavaParsingAtomicArrayQueueGenerator.java
@@ -541,26 +541,13 @@ public static void main(String[] args) throws Exception {
             new JavaParsingAtomicArrayQueueGenerator(file.getName()).visit(cu, null);
 
             organiseImports(cu);
-            FileWriter writer = null;
 
-            String outputFileName = file.getName();
-            if (outputFileName.endsWith(".java")) {
-                outputFileName = translateQueueName(outputFileName.replace(".java", ""));
-            } else {
-                outputFileName = translateQueueName(outputFileName);
-            }
-            outputFileName += ".java";
+            String outputFileName = translateQueueName(file.getName().replace(".java", "")) + ".java";
 
-            File outputFile = new File(outputDirectory, outputFileName);
-            try {
-                writer = new FileWriter(outputFile);
+            try (FileWriter writer = new FileWriter(new File(outputDirectory, outputFileName))) {
                 writer.write(cu.toString());
-            } finally {
-                if (writer != null) {
-                    writer.close();
-                }
             }
-            System.out.println("Saved to " + outputFile);
+            System.out.println("Saved to " + outputFileName); 
         }
     }
 

diff --git a/...-build/src/main/java/org/jctools/queues/atomic/JavaParsingAtomicLinkedQueueGenerator.java b/...-build/src/main/java/org/jctools/queues/atomic/JavaParsingAtomicLinkedQueueGenerator.java
@@ -624,26 +624,14 @@ public static void main(String[] args) throws Exception {
             new JavaParsingAtomicLinkedQueueGenerator(file.getName()).visit(cu, null);
 
             organiseImports(cu);
-            FileWriter writer = null;
 
-            String outputFileName = file.getName();
-            if (outputFileName.endsWith(".java")) {
-                outputFileName = translateQueueName(outputFileName.replace(".java", ""));
-            } else {
-                outputFileName = translateQueueName(outputFileName);
-            }
-            outputFileName += ".java";
+            String outputFileName = translateQueueName(file.getName().replace(".java", "")) + ".java";
 
-            File outputFile = new File(outputDirectory, outputFileName);
-            try {
-                writer = new FileWriter(outputFile);
+            try (FileWriter writer = new FileWriter(new File(outputDirectory, outputFileName))) {
                 writer.write(cu.toString());
-            } finally {
-                if (writer != null) {
-                    writer.close();
-                }
             }
-            System.out.println("Saved to " + outputFile);
+
+            System.out.println("Saved to " + outputFileName);
         }
     }