From e8d56c4814a987cc0d52dc7e5c30947d30183446 Mon Sep 17 00:00:00 2001 From: Marian Dubai Date: Thu, 20 Nov 2014 10:51:24 +0100 Subject: [PATCH] Fix checkstyle warnings in config-api Change-Id: I56eedb15f3c5892731a757bdb06c34d9d15efab7 Signed-off-by: Marian Dubai --- .../controller/config/api/ConfigRegistry.java | 2 -- .../config/api/ConfigTransactionController.java | 1 - .../config/api/DynamicMBeanWithInstance.java | 1 - .../controller/config/api/IdentityAttributeRef.java | 3 +-- .../controller/config/api/LookupRegistry.java | 2 +- .../config/api/ServiceReferenceReadableRegistry.java | 4 ++-- .../controller/config/api/jmx/CommitStatus.java | 6 +++--- .../controller/config/api/jmx/ObjectNameUtil.java | 11 +++++------ .../opendaylight/controller/config/spi/Module.java | 3 +-- .../controller/config/spi/ModuleFactory.java | 3 +-- .../config/api/IdentityAttributeRefTest.java | 1 + .../controller/config/api/JmxAttributeTest.java | 4 ++-- .../api/JmxAttributeValidationExceptionTest.java | 1 + .../controller/config/api/ModuleIdentifierTest.java | 1 + .../config/api/ValidationExceptionTest.java | 1 + .../controller/config/api/jmx/ObjectNameUtilTest.java | 1 + 16 files changed, 21 insertions(+), 24 deletions(-) diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigRegistry.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigRegistry.java index d81c48a602..5c9ed8767c 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigRegistry.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigRegistry.java @@ -9,9 +9,7 @@ package org.opendaylight.controller.config.api; import java.util.List; import java.util.Set; - import javax.management.ObjectName; - import org.opendaylight.controller.config.api.jmx.CommitStatus; import org.opendaylight.controller.config.api.jmx.constants.ConfigRegistryConstants; diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigTransactionController.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigTransactionController.java index 264751318c..8afc80a4f3 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigTransactionController.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigTransactionController.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.config.api; import java.util.Set; - import javax.management.InstanceAlreadyExistsException; import javax.management.InstanceNotFoundException; import javax.management.ObjectName; diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DynamicMBeanWithInstance.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DynamicMBeanWithInstance.java index cf0cb6a245..61a1148d86 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DynamicMBeanWithInstance.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DynamicMBeanWithInstance.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.config.api; import javax.management.DynamicMBean; - import org.opendaylight.controller.config.spi.Module; /** diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/IdentityAttributeRef.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/IdentityAttributeRef.java index 48aa6ae646..e1462b6b70 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/IdentityAttributeRef.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/IdentityAttributeRef.java @@ -7,9 +7,8 @@ */ package org.opendaylight.controller.config.api; -import org.opendaylight.yangtools.yang.binding.BaseIdentity; - import java.beans.ConstructorProperties; +import org.opendaylight.yangtools.yang.binding.BaseIdentity; public final class IdentityAttributeRef { diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/LookupRegistry.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/LookupRegistry.java index 376ecdb52a..b90fc9c034 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/LookupRegistry.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/LookupRegistry.java @@ -7,9 +7,9 @@ */ package org.opendaylight.controller.config.api; +import java.util.Set; import javax.management.InstanceNotFoundException; import javax.management.ObjectName; -import java.util.Set; public interface LookupRegistry { diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ServiceReferenceReadableRegistry.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ServiceReferenceReadableRegistry.java index d7e94e8a76..a364e54bff 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ServiceReferenceReadableRegistry.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ServiceReferenceReadableRegistry.java @@ -7,10 +7,10 @@ */ package org.opendaylight.controller.config.api; -import javax.management.InstanceNotFoundException; -import javax.management.ObjectName; import java.util.Map; import java.util.Set; +import javax.management.InstanceNotFoundException; +import javax.management.ObjectName; public interface ServiceReferenceReadableRegistry { diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/CommitStatus.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/CommitStatus.java index 4f9ea7ac6b..3b724e8ebe 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/CommitStatus.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/CommitStatus.java @@ -7,16 +7,16 @@ */ package org.opendaylight.controller.config.api.jmx; -import javax.annotation.concurrent.Immutable; -import javax.management.ObjectName; import java.beans.ConstructorProperties; import java.util.Collections; import java.util.List; +import javax.annotation.concurrent.Immutable; +import javax.management.ObjectName; @Immutable public class CommitStatus { private final List newInstances, reusedInstances, - recreatedInstances; + recreatedInstances; /** * @param newInstances newly created instances diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java index c23a0cbf69..ee23206eeb 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java @@ -7,12 +7,6 @@ */ package org.opendaylight.controller.config.api.jmx; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.config.api.jmx.constants.ConfigRegistryConstants; - -import javax.annotation.concurrent.ThreadSafe; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -20,6 +14,11 @@ import java.util.Hashtable; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import javax.annotation.concurrent.ThreadSafe; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; +import org.opendaylight.controller.config.api.ModuleIdentifier; +import org.opendaylight.controller.config.api.jmx.constants.ConfigRegistryConstants; /** * Provides ObjectName creation. Each created ObjectName consists of domain that diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java index 1b16ec8284..b557108d4d 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java @@ -7,11 +7,10 @@ */ package org.opendaylight.controller.config.spi; +import javax.annotation.concurrent.NotThreadSafe; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.yangtools.concepts.Identifiable; -import javax.annotation.concurrent.NotThreadSafe; - /** * Represents one service that is to be configured. These methods need to be diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/ModuleFactory.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/ModuleFactory.java index c86b381493..e28608a198 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/ModuleFactory.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/ModuleFactory.java @@ -7,14 +7,13 @@ */ package org.opendaylight.controller.config.spi; +import java.util.Set; import org.opendaylight.controller.config.api.DependencyResolver; import org.opendaylight.controller.config.api.DependencyResolverFactory; import org.opendaylight.controller.config.api.DynamicMBeanWithInstance; import org.opendaylight.controller.config.api.annotations.AbstractServiceInterface; import org.osgi.framework.BundleContext; -import java.util.Set; - /** * Factory which creates {@link Module instances. An instance of this interface * needs to be exported into the OSGi Service Registry. Such an instance diff --git a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/IdentityAttributeRefTest.java b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/IdentityAttributeRefTest.java index 91e1f14849..9cb64c5cc8 100644 --- a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/IdentityAttributeRefTest.java +++ b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/IdentityAttributeRefTest.java @@ -4,6 +4,7 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; + import org.junit.Assert; import org.junit.Test; import org.opendaylight.yangtools.yang.binding.BaseIdentity; diff --git a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeTest.java b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeTest.java index 39609a0e16..d82d8f99a0 100644 --- a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeTest.java +++ b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeTest.java @@ -1,11 +1,11 @@ package org.opendaylight.controller.config.api; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; +import org.junit.Test; + public class JmxAttributeTest { @Test diff --git a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeValidationExceptionTest.java b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeValidationExceptionTest.java index 9ff7405257..313b225f98 100644 --- a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeValidationExceptionTest.java +++ b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeValidationExceptionTest.java @@ -2,6 +2,7 @@ package org.opendaylight.controller.config.api; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; + import com.google.common.collect.Lists; import java.nio.file.AccessDeniedException; import java.util.ArrayList; diff --git a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ModuleIdentifierTest.java b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ModuleIdentifierTest.java index 2771b407f4..c37b61d997 100644 --- a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ModuleIdentifierTest.java +++ b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ModuleIdentifierTest.java @@ -2,6 +2,7 @@ package org.opendaylight.controller.config.api; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; + import org.junit.Test; public class ModuleIdentifierTest { diff --git a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ValidationExceptionTest.java b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ValidationExceptionTest.java index 8b4f2fe258..bc9a8c71ba 100644 --- a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ValidationExceptionTest.java +++ b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ValidationExceptionTest.java @@ -5,6 +5,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; + import com.google.common.collect.Lists; import java.util.Map; import org.junit.Assert; diff --git a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java index e69ff921cc..ad1a53a543 100644 --- a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java +++ b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java @@ -11,6 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; + import com.google.common.base.Throwables; import com.google.common.collect.Maps; import java.util.HashMap; -- 2.36.6