From 5227114eef7071613af11f230a917308eb169403 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20Su=C3=A1rez?= Date: Fri, 20 Oct 2017 13:45:18 +0200 Subject: [PATCH] Remove deprecated MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - CheckedFuture - Futures.addCallback - Some other changes regarding checkstyle, sonar and annotations Change-Id: I6ab7b10a6170bee6e78895b21d40ee1a047d961a Signed-off-by: David Suárez --- .../applications/bulk/o/matic/FlowReader.java | 2 +- .../bulk/o/matic/FlowWriterConcurrent.java | 4 ++- .../bulk/o/matic/FlowWriterSequential.java | 8 +++-- .../bulk/o/matic/FlowWriterTxChain.java | 4 ++- .../bulk/o/matic/SalBulkFlowServiceImpl.java | 32 +++---------------- .../bulk/o/matic/TableWriter.java | 11 +++---- 6 files changed, 23 insertions(+), 38 deletions(-) diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowReader.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowReader.java index 9fa1aa5e49..de5f8952a4 100644 --- a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowReader.java +++ b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowReader.java @@ -28,7 +28,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class FlowReader implements Runnable, FlowCounterMBean { +public final class FlowReader implements Runnable, FlowCounterMBean { private static final Logger LOG = LoggerFactory.getLogger(FlowReader.class); private final DataBroker dataBroker; private final Integer dpnCount; diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterConcurrent.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterConcurrent.java index f644849aee..d86cecdde5 100644 --- a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterConcurrent.java +++ b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterConcurrent.java @@ -9,6 +9,8 @@ package org.opendaylight.openflowplugin.applications.bulk.o.matic; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.MoreExecutors; + import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -132,7 +134,7 @@ public class FlowWriterConcurrent implements FlowCounterMBean { } } Futures.addCallback(writeTransaction.submit(), - new DsCallBack(dpId, tableId, calculatedTableId, sourceIp)); + new DsCallBack(dpId, tableId, calculatedTableId, sourceIp), MoreExecutors.directExecutor()); // Wrap around tableId = (short) ((calculatedTableId + 1) % (short) (endTableId - startTableId + 1) + startTableId); newBatchSize += batchSize; diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterSequential.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterSequential.java index 2fc3a2802b..bc10525785 100644 --- a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterSequential.java +++ b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterSequential.java @@ -9,6 +9,8 @@ package org.opendaylight.openflowplugin.applications.bulk.o.matic; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.MoreExecutors; + import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -132,7 +134,8 @@ public class FlowWriterSequential implements FlowCounterMBean { LOG.debug("Submitting Txn for dpId: {}, begin tableId: {}, end tableId: {}, sourceIp: {}", dpId, tableId, calculatedTableId, sourceIp); - Futures.addCallback(writeTransaction.submit(), new DsCallBack(dpId, sourceIp, calculatedTableId)); + Futures.addCallback(writeTransaction.submit(), new DsCallBack(dpId, sourceIp, calculatedTableId), + MoreExecutors.directExecutor()); } private void addFlowToTx(WriteTransaction writeTransaction, String flowId, InstanceIdentifier flowIid, @@ -203,7 +206,8 @@ public class FlowWriterSequential implements FlowCounterMBean { } LOG.debug("OnSuccess: Submitting Txn for dpId: {}, begin tableId: {}, end tableId: {}, sourceIp: {}", dpId, tableId, calculatedTableId, sourceIp); - Futures.addCallback(writeTransaction.submit(), new DsCallBack(dpId, sourceIp, calculatedTableId)); + Futures.addCallback(writeTransaction.submit(), new DsCallBack(dpId, sourceIp, calculatedTableId), + MoreExecutors.directExecutor()); } @Override diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterTxChain.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterTxChain.java index f45202f4b3..f427542da7 100644 --- a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterTxChain.java +++ b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterTxChain.java @@ -9,6 +9,8 @@ package org.opendaylight.openflowplugin.applications.bulk.o.matic; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.MoreExecutors; + import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -144,7 +146,7 @@ public class FlowWriterTxChain implements FlowCounterMBean { LOG.debug("Submitting Txn for dpId: {}, begin tableId: {}, end tableId: {}, sourceIp: {}", dpId, tableId, calculatedTableId, sourceIp - 1); Futures.addCallback(writeTransaction.submit(), - new DsCallBack(dpId, tableId, calculatedTableId, sourceIp)); + new DsCallBack(dpId, tableId, calculatedTableId, sourceIp), MoreExecutors.directExecutor()); // Wrap around tableId = (short) ((calculatedTableId + 1) % (short) (endTableId - startTableId + 1) + startTableId); newBatchSize += batchSize; diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/SalBulkFlowServiceImpl.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/SalBulkFlowServiceImpl.java index 94eca21e5c..4e017a5b07 100644 --- a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/SalBulkFlowServiceImpl.java +++ b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/SalBulkFlowServiceImpl.java @@ -10,11 +10,11 @@ package org.opendaylight.openflowplugin.applications.bulk.o.matic; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.JdkFutureAdapters; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; import java.lang.management.ManagementFactory; import java.util.ArrayList; @@ -32,7 +32,6 @@ import javax.management.ObjectName; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.yang.gen.v1.urn.opendaylight.bulk.flow.service.rev150608.AddFlowsDsInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.bulk.flow.service.rev150608.AddFlowsRpcInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.bulk.flow.service.rev150608.BulkFlowBaseContentGrouping; @@ -97,8 +96,8 @@ public class SalBulkFlowServiceImpl implements SalBulkFlowService { flowBuilder.build(), createParents); createParents = createParentsNextTime; } - CheckedFuture submitFuture = writeTransaction.submit(); - return handleResultFuture(submitFuture); + ListenableFuture submitFuture = writeTransaction.submit(); + return handleResultFuture(Futures.allAsList(submitFuture)); } private InstanceIdentifier getFlowInstanceIdentifier(BulkFlowDsItem bulkFlow) { @@ -114,28 +113,7 @@ public class SalBulkFlowServiceImpl implements SalBulkFlowService { for (BulkFlowDsItem bulkFlow : input.getBulkFlowDsItem()) { writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, getFlowInstanceIdentifier(bulkFlow)); } - CheckedFuture submitFuture = writeTransaction.submit(); - return handleResultFuture(submitFuture); - } - - private ListenableFuture> handleResultFuture( - CheckedFuture submitFuture) { - final SettableFuture> rpcResult = SettableFuture.create(); - Futures.addCallback(submitFuture, new FutureCallback() { - @Override - public void onSuccess(Void result) { - rpcResult.set(RpcResultBuilder.success(result).build()); - } - - @Override - public void onFailure(Throwable throwable) { - RpcResultBuilder rpcResultBld = RpcResultBuilder.failed() - .withRpcErrors(Collections.singleton(RpcResultBuilder.newError(RpcError.ErrorType.APPLICATION, - null, throwable.getMessage()))); - rpcResult.set(rpcResultBld.build()); - } - }); - return rpcResult; + return handleResultFuture(Futures.allAsList(writeTransaction.submit())); } private ListenableFuture> handleResultFuture(ListenableFuture> submitFuture) { @@ -153,7 +131,7 @@ public class SalBulkFlowServiceImpl implements SalBulkFlowService { null, throwable.getMessage()))); rpcResult.set(rpcResultBld.build()); } - }); + }, MoreExecutors.directExecutor()); return rpcResult; } diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/TableWriter.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/TableWriter.java index ed0be50bb5..ae354e8f01 100644 --- a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/TableWriter.java +++ b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/TableWriter.java @@ -7,16 +7,17 @@ */ package org.opendaylight.openflowplugin.applications.bulk.o.matic; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.MoreExecutors; + import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; + import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey; @@ -98,9 +99,7 @@ public class TableWriter implements FlowCounterMBean { wtx.delete(LogicalDatastoreType.CONFIGURATION, tableIId); } - CheckedFuture future = wtx.submit(); - - Futures.addCallback(future, new FutureCallback() { + Futures.addCallback(wtx.submit(), new FutureCallback() { @Override public void onSuccess(Void voidParameter) { if (successfulWrites.incrementAndGet() == totalTables) { @@ -119,7 +118,7 @@ public class TableWriter implements FlowCounterMBean { writeOpStatus.set(FlowCounter.OperationStatus.FAILURE.status()); } } - }); + }, MoreExecutors.directExecutor()); } } } -- 2.36.6