X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-adapter%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fadapter%2FBindingDOMAdapterLoader.java;h=b0fa8f932a1a74b07a76d5d71bdf2fb7cfe5f60a;hb=c86b76bc49e598dbf62ee74be9518cef263d7586;hp=f17f30df6686e3ee658de8adee00f90ba1edd9c4;hpb=9b087694461050f829843013b4247e7d90338eaf;p=mdsal.git

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterLoader.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterLoader.java
index f17f30df66..b0fa8f932a 100644
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterLoader.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterLoader.java
@@ -11,7 +11,6 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableMap;
-import java.util.Map;
 import org.opendaylight.mdsal.binding.api.ActionProviderService;
 import org.opendaylight.mdsal.binding.api.ActionService;
 import org.opendaylight.mdsal.binding.api.BindingService;
@@ -21,12 +20,11 @@ import org.opendaylight.mdsal.binding.api.InstanceNotificationService;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.mdsal.binding.api.RpcService;
-import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
 import org.opendaylight.mdsal.dom.api.DOMService;
 
-public abstract class BindingDOMAdapterLoader extends AdapterLoader<BindingService, DOMService> {
-    private static final Map<Class<?>,BindingDOMAdapterBuilder.Factory<?>> FACTORIES =
-            ImmutableMap.<Class<?>, BindingDOMAdapterBuilder.Factory<?>>builder()
+public abstract class BindingDOMAdapterLoader extends AdapterLoader<BindingService, DOMService<?, ?>> {
+    private static final ImmutableMap<Class<?>, BindingDOMAdapterBuilder.Factory<?>> FACTORIES =
+        ImmutableMap.<Class<?>, BindingDOMAdapterBuilder.Factory<?>>builder()
             .put(NotificationService.class, BindingDOMNotificationServiceAdapter.BUILDER_FACTORY)
             .put(NotificationPublishService.class, BindingDOMNotificationPublishServiceAdapter.BUILDER_FACTORY)
             .put(DataBroker.class, BindingDOMDataBrokerAdapter.BUILDER_FACTORY)
@@ -34,20 +32,19 @@ public abstract class BindingDOMAdapterLoader extends AdapterLoader<BindingServi
             .put(ActionService.class, ActionServiceAdapter.BUILDER_FACTORY)
             .put(ActionProviderService.class, ActionProviderServiceAdapter.BUILDER_FACTORY)
             .put(InstanceNotificationService.class, InstanceNotificationServiceAdapter.BUILDER_FACTORY)
-            .put(InstanceNotificationPublishService.class,
-                InstanceNotificationPublishServiceAdapter.BUILDER_FACTORY)
+            .put(InstanceNotificationPublishService.class, InstanceNotificationPublishServiceAdapter.BUILDER_FACTORY)
             .build();
 
     private final AdapterContext codec;
 
-    public BindingDOMAdapterLoader(final AdapterContext codec) {
+    protected BindingDOMAdapterLoader(final AdapterContext codec) {
         this.codec = requireNonNull(codec);
     }
 
     @Override
-    protected final AdapterBuilder<? extends BindingService, DOMService> createBuilder(
-                final Class<? extends BindingService> key) {
-        final Factory<?> factory = FACTORIES.get(key);
+    protected final AdapterBuilder<? extends BindingService, DOMService<?, ?>> createBuilder(
+            final Class<? extends BindingService> key) {
+        final var factory = FACTORIES.get(key);
         checkArgument(factory != null, "Unsupported service type %s", key);
         return factory.newBuilder(codec);
     }