Clean up Datastore addressing

[mdsal.git] / binding / mdsal-binding-util / src / main / java / org / opendaylight / mdsal / binding / util / TypedTransaction.java

diff --git a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TypedTransaction.java b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TypedTransaction.java
index 3a0a5d6c70ac98f47211f29f00374a5529656fab..1496958e7887fed1584e1d2f3e371248fce8b4dc 100644 (file)
--- a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TypedTransaction.java
+++ b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TypedTransaction.java
@@ -20,8 +20,8 @@ abstract class TypedTransaction<D extends Datastore, X extends Transaction> exte
     private final LogicalDatastoreType datastoreType;
     private final X delegate;
 
-    TypedTransaction(final Class<D> datastoreType, final X delegate) {
-        this.datastoreType = Datastore.toType(datastoreType);
+    TypedTransaction(final D datastore, final X delegate) {
+        this.datastoreType = datastore.type();
         this.delegate = delegate;
     }
 
@@ -35,8 +35,8 @@ abstract class TypedTransaction<D extends Datastore, X extends Transaction> exte
     }
 
     final <T extends DataObject> FluentFuture<QueryResult<T>> doExecute(final QueryExpression<T> query) {
-        if (delegate instanceof QueryOperations) {
-            return ((QueryOperations) delegate).execute(datastoreType, query);
+        if (delegate instanceof QueryOperations queryOps) {
+            return queryOps.execute(datastoreType, query);
         }
         throw new UnsupportedOperationException("Query execution requires backend support");
     }