From d431c3c42ed603f4d02ee241eee3267bccbb852b Mon Sep 17 00:00:00 2001 From: Marian Dubai Date: Thu, 20 Nov 2014 11:04:15 +0100 Subject: [PATCH] Fix checkstyle warnings in config-util Change-Id: I5a8caa79f38081b65f2e25f9aaecc403584fa394 Signed-off-by: Marian Dubai --- .../config/util/ConfigRegistryClient.java | 1 - .../config/util/ConfigRegistryJMXClient.java | 19 +++++++------- .../config/util/ConfigTransactionClient.java | 1 - .../util/ConfigTransactionJMXClient.java | 2 -- .../config/util/AttributeEntryTest.java | 1 + .../util/ConfigRegistryClientsTest.java | 1 + .../util/ConfigTransactionClientsTest.java | 7 ++---- .../controller/config/util/LookupTest.java | 25 +++++++++---------- .../config/util/TestingConfigRegistry.java | 5 +--- .../TestingConfigTransactionController.java | 5 +--- 10 files changed, 27 insertions(+), 40 deletions(-) diff --git a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigRegistryClient.java b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigRegistryClient.java index e907502497..99d46cb638 100644 --- a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigRegistryClient.java +++ b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigRegistryClient.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.config.util; import javax.management.ObjectName; - import org.opendaylight.controller.config.api.jmx.ConfigRegistryMXBean; public interface ConfigRegistryClient extends ConfigRegistryMXBean { diff --git a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigRegistryJMXClient.java b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigRegistryJMXClient.java index 11f64e959b..099d010642 100644 --- a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigRegistryJMXClient.java +++ b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigRegistryJMXClient.java @@ -7,12 +7,10 @@ */ package org.opendaylight.controller.config.util; -import org.opendaylight.controller.config.api.ConflictingVersionException; -import org.opendaylight.controller.config.api.ValidationException; -import org.opendaylight.controller.config.api.jmx.CommitStatus; -import org.opendaylight.controller.config.api.jmx.ConfigRegistryMXBean; -import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; - +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; import javax.management.AttributeNotFoundException; import javax.management.InstanceNotFoundException; import javax.management.JMException; @@ -22,10 +20,11 @@ import javax.management.MBeanServer; import javax.management.ObjectInstance; import javax.management.ObjectName; import javax.management.ReflectionException; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.opendaylight.controller.config.api.ConflictingVersionException; +import org.opendaylight.controller.config.api.ValidationException; +import org.opendaylight.controller.config.api.jmx.CommitStatus; +import org.opendaylight.controller.config.api.jmx.ConfigRegistryMXBean; +import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; import org.opendaylight.controller.config.api.jmx.ServiceReferenceMXBean; public class ConfigRegistryJMXClient implements ConfigRegistryClient { diff --git a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionClient.java b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionClient.java index f5381424de..359035d51d 100644 --- a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionClient.java +++ b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionClient.java @@ -10,7 +10,6 @@ package org.opendaylight.controller.config.util; import javax.management.Attribute; import javax.management.InstanceNotFoundException; import javax.management.ObjectName; - import org.opendaylight.controller.config.api.ConflictingVersionException; import org.opendaylight.controller.config.api.ValidationException; import org.opendaylight.controller.config.api.jmx.CommitStatus; diff --git a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionJMXClient.java b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionJMXClient.java index 20e26f6508..a0af19796e 100644 --- a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionJMXClient.java +++ b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/ConfigTransactionJMXClient.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.config.util; import java.util.Map; import java.util.Set; - import javax.management.Attribute; import javax.management.InstanceAlreadyExistsException; import javax.management.InstanceNotFoundException; @@ -18,7 +17,6 @@ import javax.management.JMX; import javax.management.MBeanException; import javax.management.MBeanServer; import javax.management.ObjectName; - import org.opendaylight.controller.config.api.ConflictingVersionException; import org.opendaylight.controller.config.api.ValidationException; import org.opendaylight.controller.config.api.jmx.CommitStatus; diff --git a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/AttributeEntryTest.java b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/AttributeEntryTest.java index 200fa8854d..c7c08c44e3 100644 --- a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/AttributeEntryTest.java +++ b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/AttributeEntryTest.java @@ -2,6 +2,7 @@ package org.opendaylight.controller.config.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; + import org.junit.Before; import org.junit.Test; diff --git a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java index fc1c3f8afe..d0fcc7b6cd 100644 --- a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java +++ b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; + import com.google.common.collect.Sets; import java.lang.management.ManagementFactory; import java.util.HashMap; diff --git a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigTransactionClientsTest.java b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigTransactionClientsTest.java index 2f50513345..37b08e4671 100644 --- a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigTransactionClientsTest.java +++ b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigTransactionClientsTest.java @@ -12,16 +12,15 @@ import static org.junit.Assert.assertNull; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; +import com.google.common.collect.Sets; import java.lang.management.ManagementFactory; import java.util.Collections; import java.util.Map; import java.util.Set; - import javax.management.Attribute; import javax.management.MBeanException; import javax.management.MBeanServer; import javax.management.ObjectName; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -31,8 +30,6 @@ import org.opendaylight.controller.config.api.ValidationException; import org.opendaylight.controller.config.api.ValidationException.ExceptionMessageWithStackTrace; import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; -import com.google.common.collect.Sets; - public class ConfigTransactionClientsTest { private final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); private TestingConfigTransactionController transactionController; @@ -156,7 +153,7 @@ public class ConfigTransactionClientsTest { @Ignore public void testAssertVersion() { jmxTransactionClient.assertVersion((int)jmxTransactionClient.getParentVersion(), - (int)jmxTransactionClient.getVersion()); + (int)jmxTransactionClient.getVersion()); } @Test(expected = NullPointerException.class) diff --git a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/LookupTest.java b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/LookupTest.java index 3bc362b38c..f9d0a5c647 100644 --- a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/LookupTest.java +++ b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/LookupTest.java @@ -7,8 +7,20 @@ */ package org.opendaylight.controller.config.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; +import java.lang.management.ManagementFactory; +import java.lang.reflect.Method; +import java.util.HashSet; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import javax.management.InstanceNotFoundException; +import javax.management.MBeanServer; +import javax.management.ObjectName; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -17,19 +29,6 @@ import org.opendaylight.controller.config.api.LookupRegistry; import org.opendaylight.controller.config.api.jmx.ConfigTransactionControllerMXBean; import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; -import javax.management.InstanceNotFoundException; -import javax.management.MBeanServer; -import javax.management.ObjectName; -import java.lang.management.ManagementFactory; -import java.lang.reflect.Method; -import java.util.HashSet; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - public class LookupTest { private TestingConfigRegistry testingRegistry; diff --git a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigRegistry.java b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigRegistry.java index ab6cda935b..8732aa72d1 100644 --- a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigRegistry.java +++ b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigRegistry.java @@ -7,14 +7,13 @@ */ package org.opendaylight.controller.config.util; +import com.google.common.collect.Sets; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; - import javax.management.InstanceNotFoundException; import javax.management.ObjectName; - import org.opendaylight.controller.config.api.ConflictingVersionException; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.config.api.ValidationException; @@ -22,8 +21,6 @@ import org.opendaylight.controller.config.api.jmx.CommitStatus; import org.opendaylight.controller.config.api.jmx.ConfigRegistryMXBean; import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; -import com.google.common.collect.Sets; - public class TestingConfigRegistry implements ConfigRegistryMXBean { static final ObjectName conf1, conf2, conf3, run1, run2, run3; diff --git a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigTransactionController.java b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigTransactionController.java index ee1e61967d..e1138addc7 100644 --- a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigTransactionController.java +++ b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigTransactionController.java @@ -7,20 +7,17 @@ */ package org.opendaylight.controller.config.util; +import com.google.common.collect.Sets; import java.util.HashMap; import java.util.Map; import java.util.Set; - import javax.management.InstanceAlreadyExistsException; import javax.management.InstanceNotFoundException; import javax.management.ObjectName; - import org.opendaylight.controller.config.api.ValidationException; import org.opendaylight.controller.config.api.jmx.ConfigTransactionControllerMXBean; import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; -import com.google.common.collect.Sets; - public class TestingConfigTransactionController implements ConfigTransactionControllerMXBean { -- 2.36.6