Expanded UnknownSchemaNode implementation, refactored java source code generation.

[controller.git] / opendaylight / sal / yang-prototype / code-generator / binding-java-api-generator / src / main / java / org / opendaylight / controller / sal / java / api / generator / GeneratorJavaFile.java

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 32b3fa03eb0814e8a3902a63e7c4e370652818da..be115c9a45fb9e5b6d40a332bafcd4909a32ae5f 100644 (file)
--- 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
@@ -44,75 +44,68 @@ public class GeneratorJavaFile {
         this.genTransferObjects = genTransferObjects;
     }
 
-    public boolean generateToFile() {
+    public List<File> generateToFile() throws IOException {
         return generateToFile(null);
     }
 
-    public boolean generateToFile(String path) {
-        try {
-            for (GeneratedType type : types) {
-                String parentPath = generateParentPath(path,
-                        type.getPackageName());
+    public List<File> generateToFile(String path) throws IOException {
+        final List<File> result = new ArrayList<File>();
 
-                File file = new File(parentPath, type.getName() + ".java");
-                File parent = file.getParentFile();
-                if (!parent.exists()) {
-                    parent.mkdirs();
-                }
+        for (GeneratedType type : types) {
+            String parentPath = generateParentPath(path,
+                    type.getPackageName());
 
-                if (!file.exists()) {
-                    FileWriter fw = null;
-                    BufferedWriter bw = null;
-
-                    file.createNewFile();
-                    fw = new FileWriter(file);
-                    bw = new BufferedWriter(fw);
-                    Writer writer = interfaceGenerator.generate(type);
-                    bw.write(writer.toString());
-
-                    if (bw != null) {
-                        try {
-                            bw.close();
-                        } catch (IOException e) {
-                            // TODO: log?
-                        }
-                    }
-                }
+            File file = new File(parentPath, type.getName() + ".java");
+            File parent = file.getParentFile();
+            if (!parent.exists()) {
+                parent.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;
+
+                file.createNewFile();
+                fw = new FileWriter(file);
+                bw = new BufferedWriter(fw);
+                Writer writer = interfaceGenerator.generate(type);
+                bw.write(writer.toString());
+
+                if (bw != null) {
+                    bw.close();
                 }
+                result.add(file);
+            }
+        }
 
-                if (!file.exists()) {
-                    FileWriter fw = null;
-                    BufferedWriter bw = null;
-
-                    file.createNewFile();
-                    fw = new FileWriter(file);
-                    bw = new BufferedWriter(fw);
-                    Writer writer = classGenerator.generate(transferObject);
-                    bw.write(writer.toString());
-
-                    if (bw != null) {
-                        try {
-                            bw.close();
-                        } catch (IOException e) {
-                            // TODO: log?
-                        }
-                    }
+        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;
+
+                file.createNewFile();
+                fw = new FileWriter(file);
+                bw = new BufferedWriter(fw);
+                Writer writer = classGenerator.generate(transferObject);
+                bw.write(writer.toString());
+
+                if (bw != null) {
+                    bw.close();
                 }
+                result.add(file);
             }
-            return true;
-        } catch (IOException e) {
-            // TODO: log?
-            return false;
         }
+
+        return result;
     }
 
     private String generateParentPath(String path, String pkg) {