Fixup AbstractForwardedTransaction.doExecute()

This should be a static method, also modernize it a bit.

Change-Id: Iecea13d78146c235dea389f1e72543751ed255fb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedTransaction.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedTransaction.java
index 851d18aef03eb9b5f4c50c85f774771753ef2331..e7bbc922a23bf6fb18ca266d5b9f5548a6db6b9a 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedTransaction.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedTransaction.java
@@ -83,17 +83,17 @@ abstract class AbstractForwardedTransaction<T extends DOMDataTreeTransaction> im
         return readOps.exists(store, adapterContext.currentSerializer().toYangInstanceIdentifier(path));
     }
 
-    protected final <T extends @NonNull DataObject> @NonNull FluentFuture<QueryResult<T>> doExecute(
+    protected static final <T extends @NonNull DataObject> @NonNull FluentFuture<QueryResult<T>> doExecute(
             final DOMDataTreeReadOperations readOps, final @NonNull LogicalDatastoreType store,
             final @NonNull QueryExpression<T> query) {
         checkArgument(query instanceof DefaultQuery, "Unsupported query type %s", query);
-        final DefaultQuery<T> defaultQuery = (DefaultQuery<T>) query;
+        final var defaultQuery = (DefaultQuery<T>) query;
 
-        final FluentFuture<DOMQueryResult> domResult = readOps instanceof DOMDataTreeQueryOperations
-            ? ((DOMDataTreeQueryOperations) readOps).execute(store, defaultQuery.asDOMQuery())
+        final var domFuture = requireNonNull(readOps) instanceof DOMDataTreeQueryOperations dtqOps
+            ? dtqOps.execute(store, defaultQuery.asDOMQuery())
                 : fallbackExecute(readOps, store, defaultQuery.asDOMQuery());
 
-        return domResult.transform(defaultQuery::toQueryResult, MoreExecutors.directExecutor());
+        return domFuture.transform(defaultQuery::toQueryResult, MoreExecutors.directExecutor());
     }
 
     private static FluentFuture<DOMQueryResult> fallbackExecute(final @NonNull DOMDataTreeReadOperations readOps,