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%2FInterfaceGenerator.java;h=38d3bcdc070dd4522a7c9d28ef28e2721bd10561;hp=abaf4fad21bb03caa81b2b1d82677bfbd7718618;hb=37ff82351675cc5c279dfe88c6daf10cbbf9f48b;hpb=35ba67e73cf9fea55535c1aef8303e7d12c982e7

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceGenerator.java b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceGenerator.java
index abaf4fad21..38d3bcdc07 100644
--- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceGenerator.java
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceGenerator.java
@@ -24,63 +24,86 @@ import org.opendaylight.controller.sal.binding.model.api.GeneratedType;
 import org.opendaylight.controller.sal.binding.model.api.MethodSignature;
 import org.opendaylight.controller.sal.binding.model.api.Type;
 
-public class InterfaceGenerator implements CodeGenerator {
-
-    private Map<String, LinkedHashMap<String, Integer>> imports;
-
-    public Writer generate(Type type) throws IOException {
-        Writer writer = new StringWriter();
-        if (type instanceof GeneratedType
-                && !(type instanceof GeneratedTransferObject)) {
-            GeneratedType genType = (GeneratedType) type;
-            imports = GeneratorUtil.createImports(genType);
-
-            final String currentPkg = genType.getPackageName();
-            final List<Constant> constants = genType.getConstantDefinitions();
-            final List<MethodSignature> methods = genType
-                    .getMethodDefinitions();
-            final List<Enumeration> enums = genType.getEnumDefintions();
-
-            writer.write(GeneratorUtil.createPackageDeclaration(genType
-                    .getPackageName()));
-            writer.write(NL);
-
-            List<String> importLines = GeneratorUtil.createImportLines(imports);
-            for (String line : importLines) {
-                writer.write(line + NL);
-            }
-            writer.write(NL);
-
-            writer.write(GeneratorUtil.createIfcDeclaration(genType, "",
-                    imports));
-            writer.write(NL);
-
-            if (constants != null) {
-                for (Constant c : constants) {
-                    writer.write(GeneratorUtil.createConstant(c, TAB, imports,
-                            currentPkg) + NL);
-                }
-                writer.write(NL);
-            }
-
-            if (methods != null) {
-                for (MethodSignature m : methods) {
-                    writer.write(GeneratorUtil.createMethodDeclaration(m, TAB,
-                            imports, currentPkg) + NL);
-                }
-                writer.write(NL);
-            }
-
-            if (enums != null) {
-                for (Enumeration e : enums) {
-                    writer.write(GeneratorUtil.createEnum(e, TAB) + NL);
-                }
-                writer.write(NL);
-            }
-
-            writer.write(RCB);
-        }
-        return writer;
-    }
+public final class InterfaceGenerator implements CodeGenerator {
+
+	private Map<String, LinkedHashMap<String, Integer>> imports;
+
+	private String generateEnums(List<Enumeration> enums) {
+		String result = "";
+		if (enums != null) {
+			EnumGenerator enumGenerator = new EnumGenerator();
+			for (Enumeration en : enums) {
+				try {
+					result = result
+							+ (enumGenerator.generateInnerEnumeration(en, TAB).toString() + NL);
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return result;
+	}
+
+	private String generateConstants(List<Constant> constants, String pkgName) {
+		String result = "";
+		if (constants != null) {
+			for (Constant c : constants) {
+				result = result
+						+ GeneratorUtil
+								.createConstant(c, TAB, imports, pkgName) + NL;
+			}
+			result.concat(NL);
+		}
+		return result;
+	}
+
+	public String generateMethods(List<MethodSignature> methods, String pkgName) {
+		String result = "";
+
+		if (methods != null) {
+			for (MethodSignature m : methods) {
+				result = result
+						+ GeneratorUtil.createMethodDeclaration(m, TAB,
+								imports, pkgName) + NL;
+			}
+			result = result + NL;
+		}
+		return result;
+	}
+
+	public Writer generate(Type type) throws IOException {
+		Writer writer = new StringWriter();
+		if (type instanceof GeneratedType
+				&& !(type instanceof GeneratedTransferObject)) {
+			GeneratedType genType = (GeneratedType) type;
+			imports = GeneratorUtil.createImports(genType);
+
+			final String currentPkg = genType.getPackageName();
+			final List<Constant> constants = genType.getConstantDefinitions();
+			final List<MethodSignature> methods = genType
+					.getMethodDefinitions();
+			final List<Enumeration> enums = genType.getEnumDefintions();
+
+			writer.write(GeneratorUtil.createPackageDeclaration(genType
+					.getPackageName()));
+			writer.write(NL);
+
+			List<String> importLines = GeneratorUtil.createImportLines(imports);
+			for (String line : importLines) {
+				writer.write(line + NL);
+			}
+			writer.write(NL);
+			writer.write(GeneratorUtil.createIfcDeclaration(genType, "",
+					imports));
+			writer.write(NL);
+
+			writer.write(generateEnums(enums));
+			writer.write(generateConstants(constants, currentPkg));
+			writer.write(generateMethods(methods, currentPkg));
+
+			writer.write(RCB);
+		}
+		return writer;
+	}
 
 }