From c91d4f8dd84b66399f785421d42aa2bc22706197 Mon Sep 17 00:00:00 2001 From: Marian Dubai Date: Thu, 20 Nov 2014 13:12:21 +0100 Subject: [PATCH] Fix checkstyle warnings in yang-test-plugin. Change-Id: Ic89f1d2c4006181d8cfdcf0a4c1f71a468e977b7 Signed-off-by: Marian Dubai --- .../config/yang/test/plugin/DeleteSources.java | 7 +++---- .../config/yang/test/plugin/ProcessSources.java | 15 +++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/opendaylight/config/yang-test-plugin/src/main/java/org/opendaylight/controller/config/yang/test/plugin/DeleteSources.java b/opendaylight/config/yang-test-plugin/src/main/java/org/opendaylight/controller/config/yang/test/plugin/DeleteSources.java index 461066215f..29b37af794 100644 --- a/opendaylight/config/yang-test-plugin/src/main/java/org/opendaylight/controller/config/yang/test/plugin/DeleteSources.java +++ b/opendaylight/config/yang-test-plugin/src/main/java/org/opendaylight/controller/config/yang/test/plugin/DeleteSources.java @@ -7,12 +7,11 @@ */ package org.opendaylight.controller.config.yang.test.plugin; +import java.io.File; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import java.io.File; - /** * Delete all Module/ModuleFactory sources * @@ -35,12 +34,12 @@ public class DeleteSources extends AbstractMojo{ } File sourceDirectory = new File(directory.getPath() + Util.replaceDots(".org.opendaylight.controller.config.yang.test.impl")); if (sourceDirectory == null || !sourceDirectory.exists()) { - super.getLog().error("Source directory does not exists " + sourceDirectory.getPath()); + super.getLog().error(String.format("Source directory does not exists %s", sourceDirectory.getPath())); } File[] sourceFiles = sourceDirectory.listFiles(); for (File sourceFile: sourceFiles) { if(sourceFile.getName().endsWith("Module.java") || sourceFile.getName().endsWith("ModuleFactory.java")) { - super.getLog().debug("Source file deleted: " + sourceFile.getName()); + super.getLog().debug(String.format("Source file deleted: %s", sourceFile.getName())); sourceFile.delete(); } } diff --git a/opendaylight/config/yang-test-plugin/src/main/java/org/opendaylight/controller/config/yang/test/plugin/ProcessSources.java b/opendaylight/config/yang-test-plugin/src/main/java/org/opendaylight/controller/config/yang/test/plugin/ProcessSources.java index 7a20f22440..4e392304a0 100644 --- a/opendaylight/config/yang-test-plugin/src/main/java/org/opendaylight/controller/config/yang/test/plugin/ProcessSources.java +++ b/opendaylight/config/yang-test-plugin/src/main/java/org/opendaylight/controller/config/yang/test/plugin/ProcessSources.java @@ -7,15 +7,14 @@ */ package org.opendaylight.controller.config.yang.test.plugin; +import java.io.File; +import java.io.IOException; +import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import java.io.File; -import java.io.IOException; -import java.util.regex.Pattern; - /** * Add implementation code from stub.txt * @@ -39,7 +38,7 @@ public class ProcessSources extends AbstractMojo{ } File sourceDirectory = new File(directory.getPath() + Util.replaceDots(".org.opendaylight.controller.config.yang.test.impl")); if (!sourceDirectory.exists()) { - super.getLog().error("Source directory does not exists " + sourceDirectory.getPath()); + super.getLog().error(String.format("Source directory does not exists %s", sourceDirectory.getPath())); } File[] sourceFiles = sourceDirectory.listFiles(); @@ -49,7 +48,7 @@ public class ProcessSources extends AbstractMojo{ try { sourceContent = FileUtils.readFileToString(sourceFile); } catch (IOException e) { - getLog().error("Cannot read " + sourceFile.getAbsolutePath(), e); + getLog().error(String.format("Cannot read %s", sourceFile.getAbsolutePath()), e); continue; } if (sourceFile.getName().endsWith("Module.java") || sourceFile.getName().endsWith("ModuleFactory.java")) { @@ -59,7 +58,7 @@ public class ProcessSources extends AbstractMojo{ try { stubContent = FileUtils.readFileToString(stubFile); } catch (IOException e) { - getLog().error("Cannot read " + stubFile.getAbsolutePath(), e); + getLog().error(String.format("Cannot read %s", stubFile.getAbsolutePath()), e); } if (stubContent != null) { sourceContent = rewriteStub(sourceContent, stubContent); @@ -73,7 +72,7 @@ public class ProcessSources extends AbstractMojo{ try { FileUtils.write(sourceFile, sourceContent); } catch (IOException e) { - getLog().error("Cannot write " + sourceFile.getAbsolutePath(), e); + getLog().error(String.format("Cannot write %s", sourceFile.getAbsolutePath()), e); } } -- 2.36.6