Refactor binding-dom-adapter

[mdsal.git] / entityownership / mdsal-eos-binding-adapter / src / main / java / org / opendaylight / mdsal / eos / binding / dom / adapter / BindingDOMEntityOwnershipServiceAdapter.java

diff --git a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java
index 97cdb69718e8690624454d26a90d1f2e745f1ba3..3c696b122f0e6abab4aa9b6283883b37ea262ffe 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java
+++ b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java
@@ -11,7 +11,7 @@ import static java.util.Objects.requireNonNull;
 
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.binding.dom.adapter.AdapterContext;
 import org.opendaylight.mdsal.eos.binding.api.Entity;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipCandidateRegistration;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListener;
@@ -21,8 +21,6 @@ import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntity;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Adapter that bridges between the binding and DOM EntityOwnershipService interfaces.
@@ -30,15 +28,13 @@ import org.slf4j.LoggerFactory;
  * @author Thomas Pantelis
  */
 public class BindingDOMEntityOwnershipServiceAdapter implements EntityOwnershipService, AutoCloseable {
-    static final Logger LOG = LoggerFactory.getLogger(BindingDOMEntityOwnershipServiceAdapter.class);
-
     private final @NonNull DOMEntityOwnershipService domService;
-    private final @NonNull BindingNormalizedNodeSerializer conversionCodec;
+    private final @NonNull AdapterContext adapterContext;
 
     public BindingDOMEntityOwnershipServiceAdapter(final @NonNull DOMEntityOwnershipService domService,
-            @NonNull final BindingNormalizedNodeSerializer conversionCodec) {
+            final @NonNull AdapterContext adapterContext) {
         this.domService = requireNonNull(domService);
-        this.conversionCodec = requireNonNull(conversionCodec);
+        this.adapterContext = requireNonNull(adapterContext);
     }
 
     @Override
@@ -52,7 +48,7 @@ public class BindingDOMEntityOwnershipServiceAdapter implements EntityOwnershipS
     public EntityOwnershipListenerRegistration registerListener(final String entityType,
             final EntityOwnershipListener listener) {
         return new BindingEntityOwnershipListenerRegistration(entityType, listener,
-            domService.registerListener(entityType, new DOMEntityOwnershipListenerAdapter(listener, conversionCodec)));
+            domService.registerListener(entityType, new DOMEntityOwnershipListenerAdapter(listener, adapterContext)));
     }
 
     @Override
@@ -66,7 +62,8 @@ public class BindingDOMEntityOwnershipServiceAdapter implements EntityOwnershipS
     }
 
     private @NonNull DOMEntity toDOMEntity(final Entity entity) {
-        return new DOMEntity(entity.getType(), conversionCodec.toYangInstanceIdentifier(entity.getIdentifier()));
+        return new DOMEntity(entity.getType(),
+            adapterContext.currentSerializer().toYangInstanceIdentifier(entity.getIdentifier()));
     }
 
     @Override