X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?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=a7496e8c96d2ab43424d88a72e337f2fac61ad40;hb=97d2f10bea5bdd773453bc7202b9dd04f4b70c3b;hp=55b8d777b790522fea9ec27d0919ec3bac36e766;hpb=a1124bebabbd033f4f19f991ce8e3b0b45e18d29;p=controller.git

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 55b8d777b7..a7496e8c96 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
@@ -21,8 +21,9 @@ public final class GeneratorJavaFile {
 
     private static final Logger log = LoggerFactory.getLogger(GeneratorJavaFile.class);
     private final CodeGenerator interfaceGenerator;
-    private final ClassCodeGenerator classGenerator;
+    private final ClassGenerator classGenerator;
     private final EnumGenerator enumGenerator;
+    private final BuilderGenerator builderGenerator;
 
     private final Set<GeneratedType> genTypes;
     private final Set<GeneratedTransferObject> genTransferObjects;
@@ -33,15 +34,17 @@ public final class GeneratorJavaFile {
         this.genTypes = types;
         this.genTransferObjects = new HashSet<>();
         this.enumerations = new HashSet<>();
-        this.classGenerator = new ClassCodeGenerator();
+        this.classGenerator = new ClassGenerator();
         this.enumGenerator = new EnumGenerator();
+        this.builderGenerator = new BuilderGenerator();
     }
 
     public GeneratorJavaFile(final Set<GeneratedType> types, final Set<GeneratedTransferObject> genTransferObjects,
             final Set<Enumeration> enumerations) {
         this.interfaceGenerator = new InterfaceGenerator();
-        this.classGenerator = new ClassCodeGenerator();
+        this.classGenerator = new ClassGenerator();
         this.enumGenerator = new EnumGenerator();
+        this.builderGenerator = new BuilderGenerator();
 
         this.genTypes = types;
         this.genTransferObjects = genTransferObjects;
@@ -51,14 +54,19 @@ public final class GeneratorJavaFile {
     public List<File> generateToFile(final File parentDirectory) throws IOException {
         final List<File> result = new ArrayList<>();
         for (GeneratedType type : genTypes) {
-            final File genFile = generateTypeToJavaFile(parentDirectory, type, interfaceGenerator);
+            final File genFile = generateTypeToJavaFile(parentDirectory, type, interfaceGenerator, "");
+            final File genBuilderFile = generateTypeToJavaFile(parentDirectory, type, builderGenerator,
+                    BuilderGenerator.FILE_NAME_SUFFIX);
 
             if (genFile != null) {
                 result.add(genFile);
             }
+            if (genBuilderFile != null) {
+                result.add(genBuilderFile);
+            }
         }
         for (GeneratedTransferObject transferObject : genTransferObjects) {
-            final File genFile = generateTypeToJavaFile(parentDirectory, transferObject, classGenerator);
+            final File genFile = generateTypeToJavaFile(parentDirectory, transferObject, classGenerator, "");
 
             if (genFile != null) {
                 result.add(genFile);
@@ -66,7 +74,7 @@ public final class GeneratorJavaFile {
         }
 
         for (Enumeration enumeration : enumerations) {
-            final File genFile = generateTypeToJavaFile(parentDirectory, enumeration, enumGenerator);
+            final File genFile = generateTypeToJavaFile(parentDirectory, enumeration, enumGenerator, "");
 
             if (genFile != null) {
                 result.add(genFile);
@@ -76,7 +84,7 @@ public final class GeneratorJavaFile {
         return result;
     }
 
-    private File generateTypeToJavaFile(final File parentDir, final Type type, final CodeGenerator generator)
+    private File generateTypeToJavaFile(final File parentDir, final Type type, final CodeGenerator generator, String fileNameSuffix)
             throws IOException {
         if (parentDir == null) {
             log.warn("Parent Directory not specified, files will be generated "
@@ -95,7 +103,7 @@ public final class GeneratorJavaFile {
         if (!packageDir.exists()) {
             packageDir.mkdirs();
         }
-        final File file = new File(packageDir, type.getName() + ".java");
+        final File file = new File(packageDir, type.getName() + fileNameSuffix + ".java");
         try (final FileWriter fw = new FileWriter(file)) {
             file.createNewFile();