Remove sal.core.api.model

[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..250ef7d463951cf7061e4d56b8ab502009db7e17 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
@@ -10,63 +10,46 @@ package org.opendaylight.controller.sal.dom.broker.osgi;
 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.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.osgi.framework.ServiceReference;
 
-import java.util.Arrays;
-
 @SuppressWarnings("unchecked")
-public class ProxyFactory {
-
-    public static <T extends BrokerService> T createProxy(
-            final ServiceReference<T> serviceRef, final T service) {
-
-        Object _createProxyImpl = ProxyFactory.createProxyImpl(serviceRef,
-                service);
-        return ((T) _createProxyImpl);
-    }
-
-    private static Object _createProxyImpl(final ServiceReference<?> ref,
-            final DOMMountPointService service) {
+public final class ProxyFactory {
 
-        return new DOMMountPointServiceProxy(
-                ((ServiceReference<DOMMountPointService>) ref), service);
+    private ProxyFactory() {
     }
 
-    private static Object _createProxyImpl(final ServiceReference<?> ref,
-            final SchemaService service) {
+    public static <T extends BrokerService> T createProxy(final ServiceReference<T> serviceRef, final T service) {
 
-        return new SchemaServiceProxy(((ServiceReference<SchemaService>) ref),
-                service);
+        Object createProxyImpl = ProxyFactory.createProxyImpl(serviceRef, service);
+        return (T) createProxyImpl;
     }
 
-    private static DOMDataBrokerProxy _createProxyImpl(
-            final ServiceReference<?> ref, final DOMDataBroker service) {
+    private static Object createProxyImpl(final ServiceReference<?> ref, final DOMMountPointService service) {
 
-        return new DOMDataBrokerProxy(((ServiceReference<DOMDataBroker>) ref),
-                service);
+        return new DOMMountPointServiceProxy((ServiceReference<DOMMountPointService>) ref, service);
     }
 
-    private static Object _createProxyImpl(final ServiceReference<?> reference,
-            final BrokerService service) {
+    private static DOMDataBrokerProxy createProxyImpl(final ServiceReference<?> ref, final DOMDataBroker service) {
 
-       return service;
+        return new DOMDataBrokerProxy((ServiceReference<DOMDataBroker>) ref, service);
     }
 
-    private static Object createProxyImpl(final ServiceReference<?> ref,
-            final BrokerService service) {
+    private static Object createProxyImpl(final ServiceReference<?> ref, final BrokerService service) {
+        if (service == null) {
+            throw new IllegalArgumentException("service can't be null");
+        }
 
         if (service instanceof DOMDataBroker) {
-            return _createProxyImpl(ref, (DOMDataBroker) service);
-        } else if (service instanceof SchemaService) {
-            return _createProxyImpl(ref, (SchemaService) service);
+            return createProxyImpl(ref, (DOMDataBroker) service);
         } else if (service instanceof DOMMountPointService) {
-            return _createProxyImpl(ref, (DOMMountPointService) service);
-        } else if (service != null) {
-            return _createProxyImpl(ref, service);
-        } else {
-            throw new IllegalArgumentException("Unhandled parameter types: "
-                    + Arrays.<Object> asList(ref, service).toString());
+            return createProxyImpl(ref, (DOMMountPointService) service);
         }
+
+        return createProxyImplFallback(ref, service);
+    }
+
+    private static Object createProxyImplFallback(final ServiceReference<?> reference, final BrokerService service) {
+
+        return service;
     }
-}
\ No newline at end of file
+}