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=55b8d777b790522fea9ec27d0919ec3bac36e766;hp=474e4ad0f931f8f9ec0685680db9c07ea440460d;hb=c9006d027a5c5b639e57aa7b8484ec1ff3497dc8;hpb=7ec533b6d0c7dd15146839b2c6e07647d66f82dc 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 474e4ad0f9..55b8d777b7 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 @@ -7,159 +7,121 @@ */ package org.opendaylight.controller.sal.java.api.generator; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; +import java.io.*; import java.util.ArrayList; import java.util.HashSet; import java.util.List; 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.opendaylight.controller.sal.binding.model.api.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class GeneratorJavaFile { +public final class GeneratorJavaFile { - private static final Logger log = LoggerFactory - .getLogger(GeneratorJavaFile.class); + private static final Logger log = LoggerFactory.getLogger(GeneratorJavaFile.class); private final CodeGenerator interfaceGenerator; private final ClassCodeGenerator classGenerator; + private final EnumGenerator enumGenerator; + private final Set genTypes; private final Set genTransferObjects; + private final Set enumerations; - public GeneratorJavaFile(final CodeGenerator codeGenerator, - final Set types) { + public GeneratorJavaFile(final CodeGenerator codeGenerator, final Set types) { this.interfaceGenerator = codeGenerator; this.genTypes = types; - this.genTransferObjects = new HashSet(); - classGenerator = new ClassCodeGenerator(); + this.genTransferObjects = new HashSet<>(); + this.enumerations = new HashSet<>(); + this.classGenerator = new ClassCodeGenerator(); + this.enumGenerator = new EnumGenerator(); } - public GeneratorJavaFile(final Set types, - final Set genTransferObjects) { + public GeneratorJavaFile(final Set types, final Set genTransferObjects, + final Set enumerations) { this.interfaceGenerator = new InterfaceGenerator(); this.classGenerator = new ClassCodeGenerator(); + this.enumGenerator = new EnumGenerator(); + this.genTypes = types; this.genTransferObjects = genTransferObjects; + this.enumerations = enumerations; } - @Deprecated - public List generateToFile(String path) throws IOException { - final List result = new ArrayList(); - - for (GeneratedType genType : genTypes) { - final String parentPath = generateParentPath(path, - genType.getPackageName()); + public List generateToFile(final File parentDirectory) throws IOException { + final List result = new ArrayList<>(); + for (GeneratedType type : genTypes) { + final File genFile = generateTypeToJavaFile(parentDirectory, type, interfaceGenerator); - 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); + final File genFile = generateTypeToJavaFile(parentDirectory, transferObject, classGenerator); if (genFile != null) { result.add(genFile); } } - return result; - } - public List generateToFile(final File directory) throws IOException { - final List result = new ArrayList(); - for (GeneratedType type : genTypes) { - final File genFile = generateTypeToJavaFile(directory, type, - interfaceGenerator); + for (Enumeration enumeration : enumerations) { + final File genFile = generateTypeToJavaFile(parentDirectory, enumeration, enumGenerator); if (genFile != null) { result.add(genFile); } } - for (GeneratedTransferObject transferObject : genTransferObjects) { - final File genFile = generateTypeToJavaFile(directory, - transferObject, classGenerator); - if (genFile != null) { - result.add(genFile); - } - } return result; } - private File generateTypeToJavaFile(final File directory, final Type type, - final CodeGenerator generator) throws IOException { - if ((directory != null) && (type != null) && (generator != null)) { + private File generateTypeToJavaFile(final File parentDir, final Type type, final CodeGenerator generator) + throws IOException { + if (parentDir == null) { + log.warn("Parent Directory not specified, files will be generated " + + "accordingly to generated Type package path."); + } + if (type == null) { + log.error("Cannot generate Type into Java File because " + "Generated Type is NULL!"); + throw new IllegalArgumentException("Generated Type Cannot be NULL!"); + } + if (generator == null) { + 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 (!directory.exists()) { - directory.mkdirs(); - } + if (!packageDir.exists()) { + packageDir.mkdirs(); + } + final File file = new File(packageDir, type.getName() + ".java"); + try (final FileWriter fw = new FileWriter(file)) { + file.createNewFile(); - final File file = new File(directory, type.getName() + ".java"); - try (final FileWriter fw = new FileWriter(file)) { - file.createNewFile(); - - try (final BufferedWriter bw = new BufferedWriter(fw)) { - Writer writer = generator.generate(type); - bw.write(writer.toString()); - } - } catch (IOException e) { - log.error(e.getMessage()); - throw new IOException(e.getMessage()); + try (final BufferedWriter bw = new BufferedWriter(fw)) { + Writer writer = generator.generate(type); + bw.write(writer.toString()); } - - return file; + } catch (IOException e) { + log.error(e.getMessage()); + throw new IOException(e.getMessage()); } - return null; + return file; } - private String generateParentPath(String path, String pkg) { - List dirs = new ArrayList(); - String pkgPath = ""; - if (pkg != null) { - if (pkg.length() > 0) { - if (pkg.contains(".")) { - String[] split = pkg.split("\\."); - for (String dir : split) { - dirs.add(dir); - } - } else { - dirs.add(pkg); - } - for (int i = 0; i < dirs.size(); i++) { - if (i == 0) { - pkgPath += dirs.get(i); - } else { - pkgPath += File.separator + dirs.get(i); - } - } - } + private File packageToDirectory(final File parentDirectory, final String packageName) { + if (packageName == null) { + throw new IllegalArgumentException("Package Name cannot be NULL!"); } - String fullPath = ""; - if (path != null) { - if (path.endsWith(File.separator)) { - fullPath = path + pkgPath; - } else { - fullPath = path + File.separator + pkgPath; - } - } else { - fullPath = pkgPath; + + final String[] subDirNames = packageName.split("\\."); + final StringBuilder dirPathBuilder = new StringBuilder(); + dirPathBuilder.append(subDirNames[0]); + for (int i = 1; i < subDirNames.length; ++i) { + dirPathBuilder.append(File.separator); + dirPathBuilder.append(subDirNames[i]); } - return fullPath; + return new File(parentDirectory, dirPathBuilder.toString()); } }