From 803a7a1c3b45a50660a838f3d046cc127cbe6b83 Mon Sep 17 00:00:00 2001 From: David Suarez Date: Tue, 12 Sep 2017 02:04:39 +0200 Subject: [PATCH] Fix checkstyle issues to enforce it Fix checkstyle issues to enforce it. Change-Id: I4655246739b0fa44a69487314549fc00860c9ec3 Signed-off-by: David Suarez --- opendaylight/config/config-persister-api/pom.xml | 7 +++++++ .../controller/config/persist/api/ConfigPusher.java | 1 + .../config/persist/api/ConfigSnapshotHolder.java | 3 +-- .../persist/api/ConfigSnapshotHolderImpl.java | 13 +++++++------ .../config/persist/api/PropertiesProvider.java | 3 +++ .../config/persist/test/PropertiesProviderTest.java | 8 +++++--- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/opendaylight/config/config-persister-api/pom.xml b/opendaylight/config/config-persister-api/pom.xml index 749c89413e..7dc22818ab 100644 --- a/opendaylight/config/config-persister-api/pom.xml +++ b/opendaylight/config/config-persister-api/pom.xml @@ -24,6 +24,13 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationSeverity=error + + org.apache.felix maven-bundle-plugin diff --git a/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigPusher.java b/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigPusher.java index 106ab6b9f6..a7d1a7d94b 100644 --- a/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigPusher.java +++ b/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigPusher.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.config.persist.api; import java.util.List; + /* * The config pusher service pushes configs into the config subsystem */ diff --git a/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigSnapshotHolder.java b/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigSnapshotHolder.java index ba13ebb8f0..9c4145ce1a 100644 --- a/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigSnapshotHolder.java +++ b/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigSnapshotHolder.java @@ -12,7 +12,7 @@ import java.util.SortedSet; public interface ConfigSnapshotHolder { /** - * Get XML node that should be pushed to netconf's edit-config + * Get XML node that should be pushed to netconf's edit-config. */ String getConfigSnapshot(); @@ -22,5 +22,4 @@ public interface ConfigSnapshotHolder { * If no value is specified, return empty set instead of null */ SortedSet getCapabilities(); - } diff --git a/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigSnapshotHolderImpl.java b/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigSnapshotHolderImpl.java index 0bfb975dec..05af40a851 100644 --- a/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigSnapshotHolderImpl.java +++ b/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigSnapshotHolderImpl.java @@ -15,7 +15,9 @@ public class ConfigSnapshotHolderImpl implements ConfigSnapshotHolder { private final SortedSet caps; private final String fileName; - public ConfigSnapshotHolderImpl(final String configSnapshot, final SortedSet capabilities, final String fileName) { + public ConfigSnapshotHolderImpl(final String configSnapshot, + final SortedSet capabilities, + final String fileName) { this.snapshot = configSnapshot; this.caps = capabilities; this.fileName = fileName; @@ -37,10 +39,9 @@ public class ConfigSnapshotHolderImpl implements ConfigSnapshotHolder { @Override public String toString() { - return "ConfigSnapshotHolderImpl{" + - "snapshot='" + snapshot + '\'' + - ", caps=" + caps + - ", fileName='" + fileName + '\'' + - '}'; + return "snapshot='" + "ConfigSnapshotHolderImpl{" + + snapshot + '\'' + ", caps=" + + caps + ", fileName='" + + fileName + '\'' + '}'; } } diff --git a/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/PropertiesProvider.java b/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/PropertiesProvider.java index 156fa580ce..0bea336eaa 100644 --- a/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/PropertiesProvider.java +++ b/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/PropertiesProvider.java @@ -15,10 +15,13 @@ public interface PropertiesProvider { String getProperty(String key); /** + * Get full key reporting. + * * @return prefix + key as used in getProperty method. */ String getFullKeyForReporting(String key); String getPrefix(); + String getPropertyWithoutPrefix(String fullKey); } diff --git a/opendaylight/config/config-persister-api/src/test/java/org/opendaylight/controller/config/persist/test/PropertiesProviderTest.java b/opendaylight/config/config-persister-api/src/test/java/org/opendaylight/controller/config/persist/test/PropertiesProviderTest.java index d47cdbd7b5..e88968125c 100644 --- a/opendaylight/config/config-persister-api/src/test/java/org/opendaylight/controller/config/persist/test/PropertiesProviderTest.java +++ b/opendaylight/config/config-persister-api/src/test/java/org/opendaylight/controller/config/persist/test/PropertiesProviderTest.java @@ -9,14 +9,16 @@ package org.opendaylight.controller.config.persist.test; import java.util.HashMap; import java.util.Map; + import org.opendaylight.controller.config.persist.api.PropertiesProvider; public class PropertiesProviderTest implements PropertiesProvider { - private final Map properties = new HashMap<>(); + private final Map properties = new HashMap<>(); - public void addProperty(final String key, final String value){ - properties.put(key,value); + public void addProperty(final String key, final String value) { + properties.put(key, value); } + @Override public String getProperty(final String key) { return properties.get(key); -- 2.36.6