MDSAL-17: Binding V2 - Simplify InstanceIdentifer creation

[mdsal.git] / binding2 / mdsal-binding2-java-api-generator / src / main / java / org / opendaylight / mdsal / binding / javav2 / java / api / generator / GeneratorJavaFile.java

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java
index ab869983b6ce5d5ffd0c39cb901728df97b66036..99d814143f8def731075b93f03bf3f1cbb5906ab 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java
@@ -22,10 +22,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.JavaCodePrettyPrint;
 import org.opendaylight.mdsal.binding.javav2.model.api.CodeGenerator;
 import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject;
 import org.opendaylight.mdsal.binding.javav2.model.api.Type;
 import org.opendaylight.mdsal.binding.javav2.model.api.UnitName;
+import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTypeForBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonatype.plexus.build.incremental.BuildContext;
@@ -68,11 +70,10 @@ public final class GeneratorJavaFile {
     public GeneratorJavaFile(final BuildContext buildContext, final Collection<? extends Type> types) {
         this.buildContext = Preconditions.checkNotNull(buildContext);
         this.types = Preconditions.checkNotNull(types);
-        generators.add(new EnumGenerator());
-        generators.add(new InterfaceGenerator());
-        generators.add(new BuilderGenerator());
-        //TODO: finish generators below
-//        generators.add(new TOGenerator());
+        this.generators.add(new EnumGenerator());
+        this.generators.add(new InterfaceGenerator());
+        this.generators.add(new BuilderGenerator());
+        this.generators.add(new TOGenerator());
     }
 
     /**
@@ -91,14 +92,14 @@ public final class GeneratorJavaFile {
     public List<File> generateToFile(final File generatedSourcesDirectory, final File persistentSourcesDirectory)
             throws IOException {
         final List<File> result = new ArrayList<>();
-        for (Type type : types) {
+        for (final Type type : this.types) {
             if (type != null) {
-                for (CodeGenerator generator : generators) {
+                for (final CodeGenerator generator : this.generators) {
                     File generatedJavaFile = null;
                     if (type instanceof GeneratedTransferObject
                             && ((GeneratedTransferObject) type).isUnionTypeBuilder()) {
-                        File packageDir = packageToDirectory(persistentSourcesDirectory, type.getPackageName());
-                        File file = new File(packageDir, generator.getUnitName(type) + ".java");
+                        final File packageDir = packageToDirectory(persistentSourcesDirectory, type.getPackageName());
+                        final File file = new File(packageDir, generator.getUnitName(type) + ".java");
                         if (!file.exists()) {
                             generatedJavaFile = generateTypeToJavaFile(persistentSourcesDirectory, type, generator);
                         }
@@ -182,14 +183,20 @@ public final class GeneratorJavaFile {
             LOG.error("Cannot generate Type into Java File because " + "Code Generator instance is NULL!");
             throw new IllegalArgumentException("Code Generator Cannot be NULL!");
         }
-        final File packageDir = packageToDirectory(parentDir, type.getPackageName());
-
-        if (!packageDir.exists()) {
-            packageDir.mkdirs();
-        }
 
         if (generator.isAcceptable(type)) {
-            final String generatedCode = generator.generate(type);
+            File packageDir;
+            if (generator instanceof BuilderGenerator) {
+                packageDir = packageToDirectory(parentDir, ((GeneratedTypeForBuilder)type).getPackageNameForBuilder());
+            } else {
+                packageDir = packageToDirectory(parentDir, type.getPackageName());
+            }
+
+            if (!packageDir.exists()) {
+                packageDir.mkdirs();
+            }
+
+            final String generatedCode = JavaCodePrettyPrint.perform(generator.generate(type));
             Preconditions.checkState(!generatedCode.isEmpty(), "Generated code should not be empty!");
             final File file = new File(packageDir, ((UnitName) generator.getUnitName(type)).getValue() + ".java");
 
@@ -199,12 +206,12 @@ public final class GeneratorJavaFile {
                 return null;
             }
 
-            try (final OutputStream stream = buildContext.newFileOutputStream(file)) {
+            try (final OutputStream stream = this.buildContext.newFileOutputStream(file)) {
                 try (final Writer fw = new OutputStreamWriter(stream, StandardCharsets.UTF_8)) {
                     try (final BufferedWriter bw = new BufferedWriter(fw)) {
                         bw.write(generatedCode);
                     }
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     LOG.error("Failed to write generate output into {}", file.getPath(), e);
                     throw e;
                 }