Bug 4035: Fixed some sonar / findbugs issues in DOM MD-SAL.

[controller.git] / opendaylight / md-sal / sal-dom-broker / src / main / java / org / opendaylight / controller / sal / dom / broker / osgi / ProxyFactory.java

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.java
index fdacd8b3d6ab34210cfa1ad328c1ab573ab89f84..c397eec19240453ca0ae52c709ca8fe670dfc588 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.java
@@ -26,28 +26,28 @@ public class ProxyFactory {
         return ((T) _createProxyImpl);
     }
 
-    private static Object _createProxyImpl(final ServiceReference<?> ref,
+    private static Object createProxyImpl(final ServiceReference<?> ref,
             final DOMMountPointService service) {
 
         return new DOMMountPointServiceProxy(
                 ((ServiceReference<DOMMountPointService>) ref), service);
     }
 
-    private static Object _createProxyImpl(final ServiceReference<?> ref,
+    private static Object createProxyImpl(final ServiceReference<?> ref,
             final SchemaService service) {
 
         return new SchemaServiceProxy(((ServiceReference<SchemaService>) ref),
                 service);
     }
 
-    private static DOMDataBrokerProxy _createProxyImpl(
+    private static DOMDataBrokerProxy createProxyImpl(
             final ServiceReference<?> ref, final DOMDataBroker service) {
 
         return new DOMDataBrokerProxy(((ServiceReference<DOMDataBroker>) ref),
                 service);
     }
 
-    private static Object _createProxyImpl(final ServiceReference<?> reference,
+    private static Object createProxyImplFallback(final ServiceReference<?> reference,
             final BrokerService service) {
 
        return service;
@@ -57,13 +57,13 @@ public class ProxyFactory {
             final BrokerService service) {
 
         if (service instanceof DOMDataBroker) {
-            return _createProxyImpl(ref, (DOMDataBroker) service);
+            return createProxyImpl(ref, (DOMDataBroker) service);
         } else if (service instanceof SchemaService) {
-            return _createProxyImpl(ref, (SchemaService) service);
+            return createProxyImpl(ref, (SchemaService) service);
         } else if (service instanceof DOMMountPointService) {
-            return _createProxyImpl(ref, (DOMMountPointService) service);
+            return createProxyImpl(ref, (DOMMountPointService) service);
         } else if (service != null) {
-            return _createProxyImpl(ref, service);
+            return createProxyImplFallback(ref, service);
         } else {
             throw new IllegalArgumentException("Unhandled parameter types: "
                     + Arrays.<Object> asList(ref, service).toString());