Fix checkstyle in maven-sal-api-gen-plugin

[mdsal.git] / binding / maven-sal-api-gen-plugin / src / main / java / org / opendaylight / mdsal / binding / maven / api / gen / plugin / CodeGeneratorImpl.java

diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java
index 26d935d46882a49893a0ff63d0c7091b6e79ce8e..84f94eca6c10facadabfea3deef23fa040812f47 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java
+++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java
@@ -51,6 +51,13 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext
     private MavenProject mavenProject;
     private File resourceBaseDir;
 
+    @Override
+    public Collection<File> generateSources(final SchemaContext context, final File outputBaseDir,
+            final Set<Module> currentModules) throws IOException {
+        return generateSources(context, outputBaseDir, currentModules,
+            module -> Optional.of("/" + module.getModuleSourcePath().replace(File.separator, "/")));
+    }
+
     @Override
     public Collection<File> generateSources(final SchemaContext context, final File outputDir,
             final Set<Module> yangModules, final Function<Module, Optional<String>> moduleResourcePathResolver)
@@ -150,7 +157,7 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext
     private Set<File> generateYangModuleInfo(final File outputBaseDir, final Module module, final SchemaContext ctx,
             final Function<Module, Optional<String>> moduleResourcePathResolver,
             final Builder<String> providerSourceSet) {
-        Builder<File> generatedFiles = ImmutableSet.<File> builder();
+        Builder<File> generatedFiles = ImmutableSet.builder();
 
         final YangModuleInfoTemplate template = new YangModuleInfoTemplate(module, ctx, moduleResourcePathResolver);
         String moduleInfoSource = template.generate();
@@ -180,10 +187,11 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext
         return file;
     }
 
+    @SuppressWarnings("checkstyle:illegalCatch")
     private File writeFile(final File file, final String source) {
-        try (final OutputStream stream = buildContext.newFileOutputStream(file)) {
-            try (final Writer fw = new OutputStreamWriter(stream, StandardCharsets.UTF_8)) {
-                try (final BufferedWriter bw = new BufferedWriter(fw)) {
+        try (OutputStream stream = buildContext.newFileOutputStream(file)) {
+            try (Writer fw = new OutputStreamWriter(stream, StandardCharsets.UTF_8)) {
+                try (BufferedWriter bw = new BufferedWriter(fw)) {
                     bw.write(source);
                 }
             } catch (Exception e) {
@@ -194,12 +202,4 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext
         }
         return file;
     }
-
-    @Override
-    public Collection<File> generateSources(final SchemaContext context, final File outputBaseDir, final Set<Module> currentModules)
-            throws IOException {
-        return generateSources(context, outputBaseDir, currentModules,
-            m -> Optional.of("/" + m.getModuleSourcePath().replace(File.separator, "/")));
-    }
-
 }