X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fjmx%2FServiceReferenceRegistrator.java;h=fa0c52699a7b1242a13caec363c43af2483c34d7;hb=refs%2Fchanges%2F73%2F46573%2F5;hp=ed366f6a290ff853fce8a10d6fd57266022daafc;hpb=597ffbbfe362fcea479b7fdb52f685289b7ea5fd;p=controller.git

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java
index ed366f6a29..fa0c52699a 100644
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java
@@ -10,11 +10,10 @@ package org.opendaylight.controller.config.manager.impl.jmx;
 import javax.management.InstanceAlreadyExistsException;
 import javax.management.ObjectName;
 import org.opendaylight.controller.config.api.jmx.ObjectNameUtil;
-import org.opendaylight.controller.config.manager.impl.jmx.InternalJMXRegistrator.InternalJMXRegistration;
 
 public interface ServiceReferenceRegistrator extends AutoCloseable {
 
-    public String getNullableTransactionName();
+    String getNullableTransactionName();
 
     ServiceReferenceJMXRegistration registerMBean(ServiceReferenceMXBeanImpl object,
                                                           ObjectName on) throws InstanceAlreadyExistsException;
@@ -22,7 +21,7 @@ public interface ServiceReferenceRegistrator extends AutoCloseable {
     @Override
     void close();
 
-    public static class ServiceReferenceJMXRegistration implements AutoCloseable {
+    class ServiceReferenceJMXRegistration implements AutoCloseable {
         private final InternalJMXRegistration registration;
 
         ServiceReferenceJMXRegistration(InternalJMXRegistration registration) {
@@ -35,11 +34,11 @@ public interface ServiceReferenceRegistrator extends AutoCloseable {
         }
     }
 
-    public static interface ServiceReferenceTransactionRegistratorFactory {
-        public ServiceReferenceRegistrator create();
+    interface ServiceReferenceTransactionRegistratorFactory {
+        ServiceReferenceRegistrator create();
     }
 
-    public static class ServiceReferenceRegistratorImpl implements ServiceReferenceRegistrator {
+    class ServiceReferenceRegistratorImpl implements ServiceReferenceRegistrator {
         private final InternalJMXRegistrator currentJMXRegistrator;
         private final String nullableTransactionName;
 
@@ -48,22 +47,24 @@ public interface ServiceReferenceRegistrator extends AutoCloseable {
             this.nullableTransactionName = nullableTransactionName;
         }
 
+        @Override
         public String getNullableTransactionName() {
             return nullableTransactionName;
         }
 
 
+        @Override
         public ServiceReferenceJMXRegistration registerMBean(ServiceReferenceMXBeanImpl object,
                                                              ObjectName on) throws InstanceAlreadyExistsException {
             String actualTransactionName = ObjectNameUtil.getTransactionName(on);
             boolean broken = false;
             broken |= (nullableTransactionName == null) != (actualTransactionName == null);
-            broken |= (nullableTransactionName != null) && nullableTransactionName.equals(actualTransactionName) == false;
+            broken |= (nullableTransactionName != null) && !nullableTransactionName.equals(actualTransactionName);
             if (broken) {
                 throw new IllegalArgumentException("Transaction name mismatch between expected "
                         + nullableTransactionName + ", got " + actualTransactionName + " in " + on);
             }
-            if (ObjectNameUtil.isServiceReference(on) == false) {
+            if (!ObjectNameUtil.isServiceReference(on)) {
                 throw new IllegalArgumentException("Invalid type of " + on);
             }
             return new ServiceReferenceJMXRegistration(currentJMXRegistrator.registerMBean(object, on));
@@ -74,13 +75,13 @@ public interface ServiceReferenceRegistrator extends AutoCloseable {
         public void close() {
             currentJMXRegistrator.close();
         }
-        public static interface ServiceReferenceTransactionRegistratorFactory {
-            public ServiceReferenceRegistrator create();
+        public interface ServiceReferenceTransactionRegistratorFactory {
+            ServiceReferenceRegistrator create();
         }
     }
 
 
-    public static class ServiceReferenceTransactionRegistratorFactoryImpl implements ServiceReferenceTransactionRegistratorFactory {
+    class ServiceReferenceTransactionRegistratorFactoryImpl implements ServiceReferenceTransactionRegistratorFactory {
         private final NestableJMXRegistrator parentRegistrator;
         private final String nullableTransactionName;
 
@@ -95,6 +96,7 @@ public interface ServiceReferenceRegistrator extends AutoCloseable {
             this.nullableTransactionName = null;
         }
 
+        @Override
         public ServiceReferenceRegistrator create() {
             return new ServiceReferenceRegistratorImpl(parentRegistrator, nullableTransactionName);
         }