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

[mdsal.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 c2d6add17a07c8ffefa711618034b690d35040ae..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
@@ -7,18 +7,13 @@
  */
 package org.opendaylight.controller.sal.dom.broker.osgi;
 
-import java.util.Arrays;
-
+import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
+import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.sal.core.api.BrokerService;
-import org.osgi.framework.ServiceReference;
-import org.opendaylight.controller.sal.core.api.data.DataBrokerService;
-import org.opendaylight.controller.sal.core.api.data.DataProviderService;
-import org.opendaylight.controller.sal.core.api.notify.NotificationPublishService;
-import org.opendaylight.controller.sal.core.api.notify.NotificationService;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.opendaylight.controller.sal.core.api.mount.MountProvisionService;
-import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
+import org.osgi.framework.ServiceReference;
+
+import java.util.Arrays;
 
 @SuppressWarnings("unchecked")
 public class ProxyFactory {
@@ -31,90 +26,44 @@ public class ProxyFactory {
         return ((T) _createProxyImpl);
     }
 
-    private static Object _createProxyImpl(final ServiceReference<?> ref,
-            final DataBrokerService service) {
-
-        return new DataBrokerServiceProxy(
-                ((ServiceReference<DataBrokerService>) ref), service);
-    }
-
-    private static Object _createProxyImpl(final ServiceReference<?> ref,
-            final DataProviderService service) {
-
-        return new DataProviderServiceProxy(
-                ((ServiceReference<DataProviderService>) ref), service);
-    }
-
-    private static Object _createProxyImpl(final ServiceReference<?> ref,
-            final NotificationPublishService service) {
-
-        return new NotificationPublishServiceProxy(
-                ((ServiceReference<NotificationPublishService>) ref), service);
-    }
-
-    private static Object _createProxyImpl(final ServiceReference<?> ref,
-            final NotificationService service) {
-
-        return new NotificationServiceProxy(
-                ((ServiceReference<NotificationService>) ref), service);
-    }
-
-    private static Object _createProxyImpl(final ServiceReference<?> ref,
-            final MountProvisionService service) {
+    private static Object createProxyImpl(final ServiceReference<?> ref,
+            final DOMMountPointService service) {
 
-        return new MountProviderServiceProxy(
-                ((ServiceReference<MountProvisionService>) ref), 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 Object _createProxyImpl(final ServiceReference<?> ref,
-            final RpcProvisionRegistry service) {
-
-        return new RpcProvisionRegistryProxy(
-                ((ServiceReference<RpcProvisionRegistry>) 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) {
 
-        throw new IllegalArgumentException("Not supported class: "
-                + service.getClass().getName());
+       return service;
     }
 
     private static Object createProxyImpl(final ServiceReference<?> ref,
             final BrokerService service) {
 
         if (service instanceof DOMDataBroker) {
-            return _createProxyImpl(ref, (DOMDataBroker) service);
-        } else if (service instanceof RpcProvisionRegistry) {
-            return _createProxyImpl(ref, (RpcProvisionRegistry) service);
-        } else if (service instanceof DataProviderService) {
-            return _createProxyImpl(ref, (DataProviderService) service);
-        } else if (service instanceof MountProvisionService) {
-            return _createProxyImpl(ref, (MountProvisionService) service);
-        } else if (service instanceof NotificationPublishService) {
-            return _createProxyImpl(ref, (NotificationPublishService) service);
-        } else if (service instanceof DataBrokerService) {
-            return _createProxyImpl(ref, (DataBrokerService) service);
+            return createProxyImpl(ref, (DOMDataBroker) service);
         } else if (service instanceof SchemaService) {
-            return _createProxyImpl(ref, (SchemaService) service);
-        } else if (service instanceof NotificationService) {
-            return _createProxyImpl(ref, (NotificationService) service);
+            return createProxyImpl(ref, (SchemaService) service);
+        } else if (service instanceof DOMMountPointService) {
+            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());