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 f922882f7f0b8fd3528825ce8d0923de3c129d34..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
@@ -7,11 +7,9 @@
  */
 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.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.osgi.framework.ServiceReference;
 
 @SuppressWarnings("unchecked")
@@ -23,42 +21,35 @@ public final 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);
+        return (T) createProxyImpl;
     }
 
     private static Object createProxyImpl(final ServiceReference<?> ref, final DOMMountPointService service) {
 
-        return new DOMMountPointServiceProxy(((ServiceReference<DOMMountPointService>) ref), service);
-    }
-
-    private static Object createProxyImpl(final ServiceReference<?> ref, final SchemaService service) {
-
-        return new SchemaServiceProxy(((ServiceReference<SchemaService>) ref), service);
+        return new DOMMountPointServiceProxy((ServiceReference<DOMMountPointService>) ref, service);
     }
 
     private static DOMDataBrokerProxy createProxyImpl(final ServiceReference<?> ref, final DOMDataBroker service) {
 
-        return new DOMDataBrokerProxy(((ServiceReference<DOMDataBroker>) ref), service);
+        return new DOMDataBrokerProxy((ServiceReference<DOMDataBroker>) ref, 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);
         } else if (service instanceof DOMMountPointService) {
             return createProxyImpl(ref, (DOMMountPointService) service);
-        } else if (service != null) {
-            return createProxyImplFallback(ref, service);
-        } else {
-            throw new IllegalArgumentException(
-                    "Unhandled parameter types: " + Arrays.<Object>asList(ref, service).toString());
         }
+
+        return createProxyImplFallback(ref, service);
     }
 
     private static Object createProxyImplFallback(final ServiceReference<?> reference, final BrokerService service) {
 
         return service;
     }
-}
\ No newline at end of file
+}