X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fdom%2Fbroker%2Fosgi%2FProxyFactory.java;h=f922882f7f0b8fd3528825ce8d0923de3c129d34;hp=c397eec19240453ca0ae52c709ca8fe670dfc588;hb=4ef15f7a7e3fb5bcaa6a3202d268a5c945e0aa71;hpb=a373371d34293ce0e436700ac328a58e9ea37f2e

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 c397eec192..f922882f7f 100644
--- 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,54 +7,41 @@
  */
 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;
 
-import java.util.Arrays;
-
 @SuppressWarnings("unchecked")
-public class ProxyFactory {
-
-    public static <T extends BrokerService> T createProxy(
-            final ServiceReference<T> serviceRef, final T service) {
+public final class ProxyFactory {
 
-        Object _createProxyImpl = ProxyFactory.createProxyImpl(serviceRef,
-                service);
-        return ((T) _createProxyImpl);
+    private ProxyFactory() {
     }
 
-    private static Object createProxyImpl(final ServiceReference<?> ref,
-            final DOMMountPointService service) {
+    public static <T extends BrokerService> T createProxy(final ServiceReference<T> serviceRef, final T service) {
 
-        return new DOMMountPointServiceProxy(
-                ((ServiceReference<DOMMountPointService>) ref), service);
+        Object createProxyImpl = ProxyFactory.createProxyImpl(serviceRef, service);
+        return ((T) createProxyImpl);
     }
 
-    private static Object createProxyImpl(final ServiceReference<?> ref,
-            final SchemaService service) {
+    private static Object createProxyImpl(final ServiceReference<?> ref, final DOMMountPointService 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) {
+    private static Object createProxyImpl(final ServiceReference<?> ref, final SchemaService service) {
 
-        return new DOMDataBrokerProxy(((ServiceReference<DOMDataBroker>) ref),
-                service);
+        return new SchemaServiceProxy(((ServiceReference<SchemaService>) ref), service);
     }
 
-    private static Object createProxyImplFallback(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 instanceof DOMDataBroker) {
             return createProxyImpl(ref, (DOMDataBroker) service);
@@ -65,8 +52,13 @@ public class ProxyFactory {
         } else if (service != null) {
             return createProxyImplFallback(ref, service);
         } else {
-            throw new IllegalArgumentException("Unhandled parameter types: "
-                    + Arrays.<Object> asList(ref, service).toString());
+            throw new IllegalArgumentException(
+                    "Unhandled parameter types: " + Arrays.<Object>asList(ref, service).toString());
         }
     }
+
+    private static Object createProxyImplFallback(final ServiceReference<?> reference, final BrokerService service) {
+
+        return service;
+    }
 }
\ No newline at end of file