Hide TypedTransaction.datastoreType

This field has a proper accessor, hence we do not need to make
it package-private. Also shorten local variable name used in cast
so we lower verbosity.

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

diff --git a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TransactionAdapter.java b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TransactionAdapter.java
index 65b2618a2d9f5f667daa4dc401bfb335b35bd93d..2e98178d83f0cf87e83162ddc55862dbd2a1dc9a 100644 (file)
--- a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TransactionAdapter.java
+++ b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TransactionAdapter.java
@@ -46,13 +46,11 @@ public final class TransactionAdapter {
     public static ReadWriteTransaction toReadWriteTransaction(
             final TypedReadWriteTransaction<? extends Datastore> datastoreTx) {
         if (datastoreTx instanceof TypedReadWriteTransactionImpl) {
-            TypedReadWriteTransactionImpl<?> nonSubmitCancelableDatastoreReadWriteTransaction =
-                    (TypedReadWriteTransactionImpl<?>) datastoreTx;
-            return new ReadWriteTransactionAdapter<>(nonSubmitCancelableDatastoreReadWriteTransaction.datastoreType,
-                    nonSubmitCancelableDatastoreReadWriteTransaction);
+            final TypedReadWriteTransactionImpl<?> txImpl = (TypedReadWriteTransactionImpl<?>) datastoreTx;
+            return new ReadWriteTransactionAdapter<>(txImpl.getDatastoreType(), txImpl);
         }
-        throw new IllegalArgumentException(
-                "Unsupported TypedWriteTransaction implementation " + datastoreTx.getClass());
+        throw new IllegalArgumentException("Unsupported TypedWriteTransaction implementation "
+                + datastoreTx.getClass());
     }
 
     /**
@@ -64,13 +62,11 @@ public final class TransactionAdapter {
      */
     public static WriteTransaction toWriteTransaction(final TypedWriteTransaction<? extends Datastore> datastoreTx) {
         if (datastoreTx instanceof TypedWriteTransactionImpl) {
-            TypedWriteTransactionImpl<?> nonSubmitCancelableDatastoreWriteTransaction =
-                    (TypedWriteTransactionImpl<?>) datastoreTx;
-            return new WriteTransactionAdapter<>(nonSubmitCancelableDatastoreWriteTransaction.datastoreType,
-                    nonSubmitCancelableDatastoreWriteTransaction);
+            final TypedWriteTransactionImpl<?> txImpl = (TypedWriteTransactionImpl<?>) datastoreTx;
+            return new WriteTransactionAdapter<>(txImpl.getDatastoreType(), txImpl);
         }
-        throw new IllegalArgumentException(
-                "Unsupported TypedWriteTransaction implementation " + datastoreTx.getClass());
+        throw new IllegalArgumentException("Unsupported TypedWriteTransaction implementation "
+                + datastoreTx.getClass());
     }
 
     private static class WriteTransactionAdapter<S extends Datastore, D extends TypedWriteTransaction<S>>

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 1e9c5088c433ecd49025239ef8c87edc9693c781..3880805348bbb1a74678af64f29cc5c5bc502ec8 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
@@ -10,14 +10,13 @@ package org.opendaylight.mdsal.binding.util;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 
 abstract class TypedTransaction<D extends Datastore> {
-    // Temporarily package protected for TransactionAdapter
-    final LogicalDatastoreType datastoreType;
+    private final LogicalDatastoreType datastoreType;
 
-    TypedTransaction(Class<D> datastoreType) {
+    TypedTransaction(final Class<D> datastoreType) {
         this.datastoreType = Datastore.toType(datastoreType);
     }
 
-    LogicalDatastoreType getDatastoreType() {
+    final LogicalDatastoreType getDatastoreType() {
         return this.datastoreType;
     }
 }