Fix a few eclipse warnings

This fixes:
- unneeded else statements
- unnecessary use of a raw type
- generic argument shadowing

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

diff --git a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImpl.java b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImpl.java
index 4d95eea4638914c11f9d9f355b835a61dfa40aee..e3d2d6b89b0294f6edbc6e8b02cb1a1e2b882cec 100644 (file)
--- a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImpl.java
+++ b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImpl.java
@@ -95,10 +95,10 @@ public class ManagedNewTransactionRunnerImpl extends ManagedTransactionFactoryIm
         if (wrappedTx.isWritten()) {
             // The transaction contains changes, commit it
             return realTx.commit();
-        } else {
-            // The transaction only handled reads, cancel it
-            realTx.cancel();
-            return CommitInfo.emptyFluentFuture();
         }
+
+        // The transaction only handled reads, cancel it
+        realTx.cancel();
+        return CommitInfo.emptyFluentFuture();
     }
 }

diff --git a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionChainImpl.java b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionChainImpl.java
index f3d976c5a6c712cacb0ba97f7bd82f48eb15ad93..87bfa8b6fe699d0c200cc5be403a4ad6f0171bec 100644 (file)
--- a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionChainImpl.java
+++ b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionChainImpl.java
@@ -12,8 +12,9 @@ import org.opendaylight.mdsal.binding.api.TransactionChain;
 /**
  * Implementation of {@link ManagedTransactionChain}, based on {@link ManagedTransactionFactoryImpl}.
  */
-class ManagedTransactionChainImpl extends ManagedTransactionFactoryImpl implements ManagedTransactionChain {
-    ManagedTransactionChainImpl(TransactionChain realTxChain) {
+class ManagedTransactionChainImpl extends ManagedTransactionFactoryImpl<TransactionChain>
+        implements ManagedTransactionChain {
+    ManagedTransactionChainImpl(final TransactionChain realTxChain) {
         super(realTxChain);
     }
 }

diff --git a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionFactoryImpl.java b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionFactoryImpl.java
index 64a54b7f8b0f304a0ad44aba444b6c9fc42f5a10..d18df38327f58c0e23dbb73ea8359d5aa6d23764 100644 (file)
--- a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionFactoryImpl.java
+++ b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/ManagedTransactionFactoryImpl.java
@@ -101,10 +101,10 @@ class ManagedTransactionFactoryImpl<T extends TransactionFactory> implements Man
     }
 
     @CheckReturnValue
-    protected <D extends Datastore, T extends WriteTransaction, W, E extends Exception> FluentFuture<? extends Object>
+    protected <D extends Datastore, X extends WriteTransaction, W, E extends Exception> FluentFuture<? extends Object>
         callWithNewTransactionAndSubmit(
-            final Class<D> datastoreType, final Supplier<T> txSupplier, final BiFunction<Class<D>, T, W> txWrapper,
-            final InterruptibleCheckedConsumer<W, E> txConsumer, final BiFunction<T, W, FluentFuture<?>> txSubmitter) {
+            final Class<D> datastoreType, final Supplier<X> txSupplier, final BiFunction<Class<D>, X, W> txWrapper,
+            final InterruptibleCheckedConsumer<W, E> txConsumer, final BiFunction<X, W, FluentFuture<?>> txSubmitter) {
         return applyWithNewTransactionAndSubmit(datastoreType, txSupplier, txWrapper, tx -> {
             txConsumer.accept(tx);
             return null;
@@ -113,12 +113,12 @@ class ManagedTransactionFactoryImpl<T extends TransactionFactory> implements Man
 
     @CheckReturnValue
     @SuppressWarnings("checkstyle:IllegalCatch")
-    protected <D extends Datastore, T extends WriteTransaction, W, R, E extends Exception> FluentFuture<R>
+    protected <D extends Datastore, X extends WriteTransaction, W, R, E extends Exception> FluentFuture<R>
         applyWithNewTransactionAndSubmit(
-            final Class<D> datastoreType, final Supplier<T> txSupplier, final BiFunction<Class<D>, T, W> txWrapper,
+            final Class<D> datastoreType, final Supplier<X> txSupplier, final BiFunction<Class<D>, X, W> txWrapper,
             final InterruptibleCheckedFunction<W, R, E> txFunction,
-            final BiFunction<T, W, FluentFuture<?>> txSubmitter) {
-        T realTx = txSupplier.get();
+            final BiFunction<X, W, FluentFuture<?>> txSubmitter) {
+        X realTx = txSupplier.get();
         W wrappedTx = txWrapper.apply(datastoreType, realTx);
         R result;
         try {