X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fbinding-java-api-generator%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fjava%2Fapi%2Fgenerator%2FGeneratorJavaFile.java;h=474e4ad0f931f8f9ec0685680db9c07ea440460d;hp=32b3fa03eb0814e8a3902a63e7c4e370652818da;hb=193bf712a646cd9464d4af055f637ba33bf30cdd;hpb=4221068644c7e8d08880b4d54e2a099a646796b9

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorJavaFile.java b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorJavaFile.java
index 32b3fa03eb..474e4ad0f9 100644
--- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorJavaFile.java
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorJavaFile.java
@@ -20,18 +20,23 @@ import java.util.Set;
 import org.opendaylight.controller.sal.binding.model.api.CodeGenerator;
 import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject;
 import org.opendaylight.controller.sal.binding.model.api.GeneratedType;
+import org.opendaylight.controller.sal.binding.model.api.Type;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GeneratorJavaFile {
 
+    private static final Logger log = LoggerFactory
+            .getLogger(GeneratorJavaFile.class);
     private final CodeGenerator interfaceGenerator;
     private final ClassCodeGenerator classGenerator;
-    private final Set<GeneratedType> types;
+    private final Set<GeneratedType> genTypes;
     private final Set<GeneratedTransferObject> genTransferObjects;
 
     public GeneratorJavaFile(final CodeGenerator codeGenerator,
             final Set<GeneratedType> types) {
         this.interfaceGenerator = codeGenerator;
-        this.types = types;
+        this.genTypes = types;
         this.genTransferObjects = new HashSet<GeneratedTransferObject>();
         classGenerator = new ClassCodeGenerator();
     }
@@ -40,79 +45,87 @@ public class GeneratorJavaFile {
             final Set<GeneratedTransferObject> genTransferObjects) {
         this.interfaceGenerator = new InterfaceGenerator();
         this.classGenerator = new ClassCodeGenerator();
-        this.types = types;
+        this.genTypes = types;
         this.genTransferObjects = genTransferObjects;
     }
 
-    public boolean generateToFile() {
-        return generateToFile(null);
+    @Deprecated
+    public List<File> generateToFile(String path) throws IOException {
+        final List<File> result = new ArrayList<File>();
+
+        for (GeneratedType genType : genTypes) {
+            final String parentPath = generateParentPath(path,
+                    genType.getPackageName());
+
+            final File directory = new File(parentPath);
+            final File genFile = generateTypeToJavaFile(directory, genType,
+                    interfaceGenerator);
+            
+            if (genFile != null) {
+                result.add(genFile);
+            }
+        }
+
+        for (GeneratedTransferObject transferObject : genTransferObjects) {
+            final String parentPath = generateParentPath(path,
+                    transferObject.getPackageName());
+
+            final File directory = new File(parentPath);
+            final File genFile = generateTypeToJavaFile(directory,
+                    transferObject, classGenerator);
+
+            if (genFile != null) {
+                result.add(genFile);
+            }
+        }
+        return result;
     }
 
-    public boolean generateToFile(String path) {
-        try {
-            for (GeneratedType type : types) {
-                String parentPath = generateParentPath(path,
-                        type.getPackageName());
+    public List<File> generateToFile(final File directory) throws IOException {
+        final List<File> result = new ArrayList<File>();
+        for (GeneratedType type : genTypes) {
+            final File genFile = generateTypeToJavaFile(directory, type,
+                    interfaceGenerator);
 
-                File file = new File(parentPath, type.getName() + ".java");
-                File parent = file.getParentFile();
-                if (!parent.exists()) {
-                    parent.mkdirs();
-                }
+            if (genFile != null) {
+                result.add(genFile);
+            }
+        }
+        for (GeneratedTransferObject transferObject : genTransferObjects) {
+            final File genFile = generateTypeToJavaFile(directory,
+                    transferObject, classGenerator);
 
-                if (!file.exists()) {
-                    FileWriter fw = null;
-                    BufferedWriter bw = null;
+            if (genFile != null) {
+                result.add(genFile);
+            }
+        }
+        return result;
+    }
 
-                    file.createNewFile();
-                    fw = new FileWriter(file);
-                    bw = new BufferedWriter(fw);
-                    Writer writer = interfaceGenerator.generate(type);
-                    bw.write(writer.toString());
+    private File generateTypeToJavaFile(final File directory, final Type type,
+            final CodeGenerator generator) throws IOException {
+        if ((directory != null) && (type != null) && (generator != null)) {
 
-                    if (bw != null) {
-                        try {
-                            bw.close();
-                        } catch (IOException e) {
-                            // TODO: log?
-                        }
-                    }
-                }
+            if (!directory.exists()) {
+                directory.mkdirs();
             }
-            for (GeneratedTransferObject transferObject : genTransferObjects) {
-                String parentPath = generateParentPath(path,
-                        transferObject.getPackageName());
-
-                File file = new File(parentPath, transferObject.getName() + ".java");
-                File parent = file.getParentFile();
-                if (!parent.exists()) {
-                    parent.mkdirs();
-                }
 
-                if (!file.exists()) {
-                    FileWriter fw = null;
-                    BufferedWriter bw = null;
+            final File file = new File(directory, type.getName() + ".java");
+            try (final FileWriter fw = new FileWriter(file)) {
+                file.createNewFile();
 
-                    file.createNewFile();
-                    fw = new FileWriter(file);
-                    bw = new BufferedWriter(fw);
-                    Writer writer = classGenerator.generate(transferObject);
+                try (final BufferedWriter bw = new BufferedWriter(fw)) {
+                    Writer writer = generator.generate(type);
                     bw.write(writer.toString());
-
-                    if (bw != null) {
-                        try {
-                            bw.close();
-                        } catch (IOException e) {
-                            // TODO: log?
-                        }
-                    }
                 }
+            } catch (IOException e) {
+                log.error(e.getMessage());
+                throw new IOException(e.getMessage());
             }
-            return true;
-        } catch (IOException e) {
-            // TODO: log?
-            return false;
+
+            return file;
         }
+        return null;
     }
 
     private String generateParentPath(String path, String pkg) {
@@ -149,5 +162,4 @@ public class GeneratorJavaFile {
         }
         return fullPath;
     }
-
 }