Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/05f0d1b1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05f0d1b1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05f0d1b1 Branch: refs/heads/master Commit: 05f0d1b1851ee6d2f3834831f52e3477966f5f7a Parents: eac1acb Author: Claus Ibsen <davscl...@apache.org> Authored: Tue May 26 14:16:53 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue May 26 14:16:53 2015 +0200 ---------------------------------------------------------------------- .../maven/packaging/PackageComponentMojo.java | 7 +++--- .../maven/packaging/PackageDataFormatMojo.java | 23 ++++++++++---------- .../camel/maven/packaging/PackageHelper.java | 4 ++-- .../maven/packaging/PackageLanguageMojo.java | 23 ++++++++++---------- .../maven/packaging/PrepareComponentMojo.java | 8 +++---- 5 files changed, 34 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/05f0d1b1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java index b3d8207..774e49c 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java @@ -29,6 +29,7 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; +import org.omg.IOP.IORHelper; import org.sonatype.plexus.build.incremental.BuildContext; /** @@ -141,9 +142,9 @@ public class PackageComponentMojo extends AbstractMojo { camelMetaDir.mkdirs(); File outFile = new File(camelMetaDir, "component.properties"); try { - try(OutputStream os = buildContext.newFileOutputStream(outFile)) { - properties.store(os, "Generated by camel-package-maven-plugin"); - } + OutputStream os = buildContext.newFileOutputStream(outFile); + properties.store(os, "Generated by camel-package-maven-plugin"); + os.close(); log.info("Generated " + outFile + " containing " + count + " Camel " + (count > 1 ? "components: " : "component: ") + names); http://git-wip-us.apache.org/repos/asf/camel/blob/05f0d1b1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java index b398787..d7e3371 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java @@ -16,10 +16,6 @@ */ package org.apache.camel.maven.packaging; -import static org.apache.camel.maven.packaging.PackageHelper.after; -import static org.apache.camel.maven.packaging.PackageHelper.loadText; -import static org.apache.camel.maven.packaging.PackageHelper.parseAsMap; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -44,6 +40,10 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; import org.sonatype.plexus.build.incremental.BuildContext; +import static org.apache.camel.maven.packaging.PackageHelper.after; +import static org.apache.camel.maven.packaging.PackageHelper.loadText; +import static org.apache.camel.maven.packaging.PackageHelper.parseAsMap; + /** * Analyses the Camel plugins in a project and generates extra descriptor information for easier auto-discovery in Camel. * @@ -102,7 +102,8 @@ public class PackageDataFormatMojo extends AbstractMojo { prepareDataFormat(getLog(), project, projectHelper, dataFormatOutDir, schemaOutDir, buildContext); } - public static void prepareDataFormat(Log log, MavenProject project, MavenProjectHelper projectHelper, File dataFormatOutDir, File schemaOutDir, BuildContext buildContext) throws MojoExecutionException { + public static void prepareDataFormat(Log log, MavenProject project, MavenProjectHelper projectHelper, File dataFormatOutDir, + File schemaOutDir, BuildContext buildContext) throws MojoExecutionException { File camelMetaDir = new File(dataFormatOutDir, "META-INF/services/org/apache/camel/"); @@ -232,9 +233,9 @@ public class PackageDataFormatMojo extends AbstractMojo { dir.mkdirs(); File out = new File(dir, name + ".json"); - try (OutputStream fos = buildContext.newFileOutputStream(out)) { - fos.write(schema.getBytes()); - } + OutputStream fos = buildContext.newFileOutputStream(out); + fos.write(schema.getBytes()); + fos.close(); log.debug("Generated " + out + " containing JSon schema for " + name + " data format"); } @@ -261,9 +262,9 @@ public class PackageDataFormatMojo extends AbstractMojo { camelMetaDir.mkdirs(); File outFile = new File(camelMetaDir, "dataformat.properties"); try { - try(OutputStream os = buildContext.newFileOutputStream(outFile)) { - properties.store(os, "Generated by camel-package-maven-plugin"); - } + OutputStream os = buildContext.newFileOutputStream(outFile); + properties.store(os, "Generated by camel-package-maven-plugin"); + os.close(); log.info("Generated " + outFile + " containing " + count + " Camel " + (count > 1 ? "dataformats: " : "dataformat: ") + names); http://git-wip-us.apache.org/repos/asf/camel/blob/05f0d1b1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java index c6d9009..02e00e4 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java @@ -45,9 +45,9 @@ public final class PackageHelper { file = new File(r.getDirectory().substring(baseDir.length() + 1)); } String path = file.getPath() + "/" + suffix; - log.debug("checking if "+ path + " (" + r.getDirectory() + "/" + suffix + ") has changed."); + log.debug("checking if " + path + " (" + r.getDirectory() + "/" + suffix + ") has changed."); if (buildContext.hasDelta(path)) { - log.debug("Indeed "+ suffix +" has changed."); + log.debug("Indeed " + suffix + " has changed."); return true; } } http://git-wip-us.apache.org/repos/asf/camel/blob/05f0d1b1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java index 6a932cd..0ff7a8d 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java @@ -16,10 +16,6 @@ */ package org.apache.camel.maven.packaging; -import static org.apache.camel.maven.packaging.PackageHelper.after; -import static org.apache.camel.maven.packaging.PackageHelper.loadText; -import static org.apache.camel.maven.packaging.PackageHelper.parseAsMap; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -44,6 +40,10 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; import org.sonatype.plexus.build.incremental.BuildContext; +import static org.apache.camel.maven.packaging.PackageHelper.after; +import static org.apache.camel.maven.packaging.PackageHelper.loadText; +import static org.apache.camel.maven.packaging.PackageHelper.parseAsMap; + /** * Analyses the Camel plugins in a project and generates extra descriptor information for easier auto-discovery in Camel. * @@ -102,7 +102,8 @@ public class PackageLanguageMojo extends AbstractMojo { prepareLanguage(getLog(), project, projectHelper, languageOutDir, schemaOutDir, buildContext); } - public static void prepareLanguage(Log log, MavenProject project, MavenProjectHelper projectHelper, File languageOutDir, File schemaOutDir, BuildContext buildContext) throws MojoExecutionException { + public static void prepareLanguage(Log log, MavenProject project, MavenProjectHelper projectHelper, File languageOutDir, + File schemaOutDir, BuildContext buildContext) throws MojoExecutionException { File camelMetaDir = new File(languageOutDir, "META-INF/services/org/apache/camel/"); @@ -228,9 +229,9 @@ public class PackageLanguageMojo extends AbstractMojo { dir.mkdirs(); File out = new File(dir, name + ".json"); - try (OutputStream fos = buildContext.newFileOutputStream(out)) { - fos.write(schema.getBytes()); - } + OutputStream fos = buildContext.newFileOutputStream(out); + fos.write(schema.getBytes()); + fos.close(); buildContext.refresh(out); @@ -259,9 +260,9 @@ public class PackageLanguageMojo extends AbstractMojo { camelMetaDir.mkdirs(); File outFile = new File(camelMetaDir, "language.properties"); try { - try(OutputStream os = buildContext.newFileOutputStream(outFile)) { - properties.store(os, "Generated by camel-package-maven-plugin"); - } + OutputStream os = buildContext.newFileOutputStream(outFile); + properties.store(os, "Generated by camel-package-maven-plugin"); + os.close(); log.info("Generated " + outFile + " containing " + count + " Camel " + (count > 1 ? "languages: " : "language: ") + names); http://git-wip-us.apache.org/repos/asf/camel/blob/05f0d1b1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java index 6017b96..c71f77b 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java @@ -16,10 +16,6 @@ */ package org.apache.camel.maven.packaging; -import static org.apache.camel.maven.packaging.PackageComponentMojo.prepareComponent; -import static org.apache.camel.maven.packaging.PackageDataFormatMojo.prepareDataFormat; -import static org.apache.camel.maven.packaging.PackageLanguageMojo.prepareLanguage; - import java.io.File; import org.apache.maven.plugin.AbstractMojo; @@ -29,6 +25,10 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; import org.sonatype.plexus.build.incremental.BuildContext; +import static org.apache.camel.maven.packaging.PackageComponentMojo.prepareComponent; +import static org.apache.camel.maven.packaging.PackageDataFormatMojo.prepareDataFormat; +import static org.apache.camel.maven.packaging.PackageLanguageMojo.prepareLanguage; + /** * Prepares a Camel component analyzing if the maven module contains Camel * <ul>
