From 69c815a7e0dbe79ba36c2238a2d185234cca774a Mon Sep 17 00:00:00 2001 From: Andrej Leitner Date: Thu, 28 Jul 2016 11:53:36 +0200 Subject: [PATCH] FRS - sonar issues and repackage - forwarders moved to strategy package - functions converted to labmdas - simplified statements - remove comments Change-Id: I103d02f0dab3234ca9338f207a4102d814da2019 Signed-off-by: Andrej Leitner --- .../impl/ForwardingRulesSyncProvider.java | 1 + .../impl/SyncReactorFutureDecorator.java | 4 +- .../clustering/DeviceMastershipManager.java | 6 +- .../impl/{ => strategy}/FlowForwarder.java | 6 +- .../impl/{ => strategy}/GroupForwarder.java | 6 +- .../impl/{ => strategy}/MeterForwarder.java | 6 +- .../SyncPlanPushStrategyFlatBatchImpl.java | 34 +++++---- .../SyncPlanPushStrategyIncrementalImpl.java | 69 ++++++------------- .../impl/{ => strategy}/TableForwarder.java | 6 +- .../frsync/util/ReconcileUtil.java | 14 ++-- .../applications/frsync/util/SyncupEntry.java | 20 ++++-- .../impl/SyncReactorClusterDecoratorTest.java | 3 +- .../SyncReactorFutureZipDecoratorTest.java | 3 +- .../impl/SyncReactorGuardDecoratorTest.java | 9 +-- .../impl/SyncReactorRetryDecoratorTest.java | 3 +- .../{ => strategy}/FlowForwarderTest.java | 4 +- .../{ => strategy}/GroupForwarderTest.java | 4 +- .../{ => strategy}/MeterForwarderTest.java | 4 +- ...SyncPlanPushStrategyFlatBatchImplTest.java | 1 - ...ncPlanPushStrategyIncrementalImplTest.java | 12 +--- .../{ => strategy}/TableForwarderTest.java | 4 +- 21 files changed, 89 insertions(+), 130 deletions(-) rename applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/{ => strategy}/FlowForwarder.java (98%) rename applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/{ => strategy}/GroupForwarder.java (98%) rename applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/{ => strategy}/MeterForwarder.java (98%) rename applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/{ => strategy}/TableForwarder.java (97%) rename applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/{ => strategy}/FlowForwarderTest.java (99%) rename applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/{ => strategy}/GroupForwarderTest.java (99%) rename applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/{ => strategy}/MeterForwarderTest.java (99%) rename applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/{ => strategy}/TableForwarderTest.java (99%) diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/ForwardingRulesSyncProvider.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/ForwardingRulesSyncProvider.java index 5292ac13f2..996f3ef4c0 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/ForwardingRulesSyncProvider.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/ForwardingRulesSyncProvider.java @@ -31,6 +31,7 @@ import org.opendaylight.openflowplugin.applications.frsync.dao.FlowCapableNodeOd import org.opendaylight.openflowplugin.applications.frsync.dao.FlowCapableNodeSnapshotDao; import org.opendaylight.openflowplugin.applications.frsync.impl.clustering.DeviceMastershipManager; import org.opendaylight.openflowplugin.applications.frsync.impl.strategy.SyncPlanPushStrategyFlatBatchImpl; +import org.opendaylight.openflowplugin.applications.frsync.impl.strategy.TableForwarder; import org.opendaylight.openflowplugin.applications.frsync.util.ReconciliationRegistry; import org.opendaylight.openflowplugin.applications.frsync.util.SemaphoreKeeperGuavaImpl; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.SalFlatBatchService; diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureDecorator.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureDecorator.java index 9907d605d4..ba3a1d8c59 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureDecorator.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureDecorator.java @@ -41,7 +41,7 @@ public class SyncReactorFutureDecorator implements SyncReactor { final NodeId nodeId = PathUtil.digNodeId(flowcapableNodePath); LOG.trace("syncup future decorator: {}", nodeId.getValue()); - final ListenableFuture syncup = executorService.submit(() -> { + return executorService.submit(() -> { final String oldThreadName = updateThreadName(nodeId); try { @@ -56,8 +56,6 @@ public class SyncReactorFutureDecorator implements SyncReactor { updateThreadName(oldThreadName); } }); - - return syncup; } protected ListenableFuture doSyncupInFuture(final InstanceIdentifier flowcapableNodePath, diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/clustering/DeviceMastershipManager.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/clustering/DeviceMastershipManager.java index 0a9a8be9b6..41f736c05d 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/clustering/DeviceMastershipManager.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/clustering/DeviceMastershipManager.java @@ -55,11 +55,7 @@ public class DeviceMastershipManager { } public boolean isDeviceMastered(final NodeId nodeId) { - if (deviceMasterships.get(nodeId) == null) { - return false; - } else { - return deviceMasterships.get(nodeId).isDeviceMastered(); - } + return deviceMasterships.get(nodeId) != null && deviceMasterships.get(nodeId).isDeviceMastered(); } @VisibleForTesting diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/FlowForwarder.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/FlowForwarder.java similarity index 98% rename from applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/FlowForwarder.java rename to applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/FlowForwarder.java index 62837d7269..ca752470fe 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/FlowForwarder.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/FlowForwarder.java @@ -1,12 +1,12 @@ -/** - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. +/* + * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.openflowplugin.applications.frsync.impl; +package org.opendaylight.openflowplugin.applications.frsync.impl.strategy; import com.google.common.base.Preconditions; import java.util.concurrent.Future; diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/GroupForwarder.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/GroupForwarder.java similarity index 98% rename from applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/GroupForwarder.java rename to applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/GroupForwarder.java index bb0aec9a5b..4a43ad1a2b 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/GroupForwarder.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/GroupForwarder.java @@ -1,12 +1,12 @@ -/** - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. +/* + * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.openflowplugin.applications.frsync.impl; +package org.opendaylight.openflowplugin.applications.frsync.impl.strategy; import java.util.concurrent.Future; import org.opendaylight.openflowplugin.applications.frsync.ForwardingRulesCommitter; diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/MeterForwarder.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/MeterForwarder.java similarity index 98% rename from applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/MeterForwarder.java rename to applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/MeterForwarder.java index aef44f12b6..20f1fc8fd8 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/MeterForwarder.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/MeterForwarder.java @@ -1,12 +1,12 @@ -/** - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. +/* + * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.openflowplugin.applications.frsync.impl; +package org.opendaylight.openflowplugin.applications.frsync.impl.strategy; import java.util.concurrent.Future; import org.opendaylight.openflowplugin.applications.frsync.ForwardingRulesCommitter; diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImpl.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImpl.java index 99f5df16f8..70ce219708 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImpl.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImpl.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.concurrent.Future; import javax.annotation.Nullable; import org.opendaylight.openflowplugin.applications.frsync.SyncPlanPushStrategy; -import org.opendaylight.openflowplugin.applications.frsync.impl.TableForwarder; import org.opendaylight.openflowplugin.applications.frsync.util.FxChainUtil; import org.opendaylight.openflowplugin.applications.frsync.util.ItemSyncBox; import org.opendaylight.openflowplugin.applications.frsync.util.PathUtil; @@ -144,7 +143,8 @@ public class SyncPlanPushStrategyFlatBatchImpl implements SyncPlanPushStrategy { final ProcessFlatBatchInput flatBatchInput = new ProcessFlatBatchInputBuilder() .setNode(new NodeRef(PathUtil.digNodePath(diffInput.getNodeIdent()))) - .setExitOnFirstError(false) // TODO: propagate from input + // TODO: propagate from input + .setExitOnFirstError(false) .setBatch(batchBag) .build(); @@ -382,23 +382,21 @@ public class SyncPlanPushStrategyFlatBatchImpl implements SyncPlanPushStrategy { @VisibleForTesting static int assembleRemoveMeters(final List batchBag, int batchOrder, final ItemSyncBox meterItemSyncBox) { // process meter remove - if (meterItemSyncBox != null) { - if (!meterItemSyncBox.getItemsToPush().isEmpty()) { - final List flatBatchRemoveMeterBag = - new ArrayList<>(meterItemSyncBox.getItemsToUpdate().size()); - int itemOrder = 0; - for (Meter meter : meterItemSyncBox.getItemsToPush()) { - flatBatchRemoveMeterBag.add(new FlatBatchRemoveMeterBuilder(meter).setBatchOrder(itemOrder++).build()); - } - final Batch batch = new BatchBuilder() - .setBatchChoice(new FlatBatchRemoveMeterCaseBuilder() - .setFlatBatchRemoveMeter(flatBatchRemoveMeterBag) - .build()) - .setBatchOrder(batchOrder) - .build(); - batchOrder += itemOrder; - batchBag.add(batch); + if (meterItemSyncBox != null && !meterItemSyncBox.getItemsToPush().isEmpty()) { + final List flatBatchRemoveMeterBag = + new ArrayList<>(meterItemSyncBox.getItemsToUpdate().size()); + int itemOrder = 0; + for (Meter meter : meterItemSyncBox.getItemsToPush()) { + flatBatchRemoveMeterBag.add(new FlatBatchRemoveMeterBuilder(meter).setBatchOrder(itemOrder++).build()); } + final Batch batch = new BatchBuilder() + .setBatchChoice(new FlatBatchRemoveMeterCaseBuilder() + .setFlatBatchRemoveMeter(flatBatchRemoveMeterBag) + .build()) + .setBatchOrder(batchOrder) + .build(); + batchOrder += itemOrder; + batchBag.add(batch); } return batchOrder; } diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImpl.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImpl.java index 3f4b53efdb..6d8ca69066 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImpl.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImpl.java @@ -18,10 +18,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import org.opendaylight.openflowplugin.applications.frsync.SyncPlanPushStrategy; -import org.opendaylight.openflowplugin.applications.frsync.impl.FlowForwarder; -import org.opendaylight.openflowplugin.applications.frsync.impl.GroupForwarder; -import org.opendaylight.openflowplugin.applications.frsync.impl.MeterForwarder; -import org.opendaylight.openflowplugin.applications.frsync.impl.TableForwarder; import org.opendaylight.openflowplugin.applications.frsync.util.CrudCounts; import org.opendaylight.openflowplugin.applications.frsync.util.FxChainUtil; import org.opendaylight.openflowplugin.applications.frsync.util.ItemSyncBox; @@ -67,9 +63,9 @@ public class SyncPlanPushStrategyIncrementalImpl implements SyncPlanPushStrategy private static final Logger LOG = LoggerFactory.getLogger(SyncPlanPushStrategyIncrementalImpl.class); private FlowForwarder flowForwarder; - private TableForwarder tableForwarder; private MeterForwarder meterForwarder; private GroupForwarder groupForwarder; + private TableForwarder tableForwarder; private FlowCapableTransactionService transactionService; @Override @@ -153,9 +149,9 @@ public class SyncPlanPushStrategyIncrementalImpl implements SyncPlanPushStrategy ListenableFuture> addMissingFlows(final NodeId nodeId, - final InstanceIdentifier nodeIdent, - final Map> flowsInTablesSyncBox, - final SyncCrudCounters counters) { + final InstanceIdentifier nodeIdent, + final Map> flowsInTablesSyncBox, + final SyncCrudCounters counters) { if (flowsInTablesSyncBox.isEmpty()) { LOG.trace("no tables in config for node: {} -> SKIPPING", nodeId.getValue()); return RpcResultBuilder.success().buildFuture(); @@ -204,22 +200,14 @@ public class SyncPlanPushStrategyIncrementalImpl implements SyncPlanPushStrategy Futures.allAsList(allUpdateResults), ReconcileUtil.createRpcResultCondenser("flow updating")); - final ListenableFuture> summaryResult = Futures.transform( - Futures.allAsList(singleVoidAddResult, singleVoidUpdateResult), + return Futures.transform(Futures.allAsList(singleVoidAddResult, singleVoidUpdateResult), ReconcileUtil.createRpcResultCondenser("flow add/update")); - - return summaryResult; - - /* - return Futures.transform(summaryResult, - ReconcileUtil.chainBarrierFlush(PathUtil.digNodePath(nodeIdent), transactionService)); - */ } ListenableFuture> removeRedundantFlows(final NodeId nodeId, - final InstanceIdentifier nodeIdent, - final Map> removalPlan, - final SyncCrudCounters counters) { + final InstanceIdentifier nodeIdent, + final Map> removalPlan, + final SyncCrudCounters counters) { if (removalPlan.isEmpty()) { LOG.trace("no tables in operational for node: {} -> SKIPPING", nodeId.getValue()); return RpcResultBuilder.success().buildFuture(); @@ -250,9 +238,9 @@ public class SyncPlanPushStrategyIncrementalImpl implements SyncPlanPushStrategy } ListenableFuture> removeRedundantMeters(final NodeId nodeId, - final InstanceIdentifier nodeIdent, - final ItemSyncBox meterRemovalPlan, - final SyncCrudCounters counters) { + final InstanceIdentifier nodeIdent, + final ItemSyncBox meterRemovalPlan, + final SyncCrudCounters counters) { if (meterRemovalPlan.isEmpty()) { LOG.trace("no meters on device for node: {} -> SKIPPING", nodeId.getValue()); return RpcResultBuilder.success().buildFuture(); @@ -271,14 +259,8 @@ public class SyncPlanPushStrategyIncrementalImpl implements SyncPlanPushStrategy meterCrudCounts.incRemoved(); } - final ListenableFuture> singleVoidResult = Futures.transform( - Futures.allAsList(allResults), + return Futures.transform(Futures.allAsList(allResults), ReconcileUtil.createRpcResultCondenser("meter remove")); - return singleVoidResult; - /* - return Futures.transform(singleVoidResult, - ReconcileUtil.chainBarrierFlush(PathUtil.digNodePath(nodeIdent), transactionService)); - */ } ListenableFuture> removeRedundantGroups(final NodeId nodeId, @@ -407,15 +389,14 @@ public class SyncPlanPushStrategyIncrementalImpl implements SyncPlanPushStrategy ReconcileUtil.createRpcResultCondenser("group add/update")); - return Futures.transform(summaryResult, - ReconcileUtil.chainBarrierFlush( - PathUtil.digNodePath(nodeIdent), transactionService)); + return Futures.transform(summaryResult, ReconcileUtil.chainBarrierFlush( + PathUtil.digNodePath(nodeIdent), transactionService)); } ListenableFuture> addMissingMeters(final NodeId nodeId, - final InstanceIdentifier nodeIdent, - final ItemSyncBox syncBox, - final SyncCrudCounters counters) { + final InstanceIdentifier nodeIdent, + final ItemSyncBox syncBox, + final SyncCrudCounters counters) { if (syncBox.isEmpty()) { LOG.trace("no meters configured for node: {} -> SKIPPING", nodeId.getValue()); return RpcResultBuilder.success().buildFuture(); @@ -451,22 +432,14 @@ public class SyncPlanPushStrategyIncrementalImpl implements SyncPlanPushStrategy Futures.allAsList(allUpdateResults), ReconcileUtil.createRpcResultCondenser("meter update")); - final ListenableFuture> summaryResults = Futures.transform( - Futures.allAsList(singleVoidUpdateResult, singleVoidAddResult), + return Futures.transform(Futures.allAsList(singleVoidUpdateResult, singleVoidAddResult), ReconcileUtil.createRpcResultCondenser("meter add/update")); - - return summaryResults; - - /* - return Futures.transform(summaryResults, - ReconcileUtil.chainBarrierFlush(PathUtil.digNodePath(nodeIdent), transactionService)); - */ } ListenableFuture> addMissingGroups(final NodeId nodeId, - final InstanceIdentifier nodeIdent, - final List> groupsAddPlan, - final SyncCrudCounters counters) { + final InstanceIdentifier nodeIdent, + final List> groupsAddPlan, + final SyncCrudCounters counters) { if (groupsAddPlan.isEmpty()) { LOG.trace("no groups configured for node: {} -> SKIPPING", nodeId.getValue()); return RpcResultBuilder.success().buildFuture(); diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/TableForwarder.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/TableForwarder.java similarity index 97% rename from applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/TableForwarder.java rename to applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/TableForwarder.java index 74347b1a87..92c1ad51b3 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/TableForwarder.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/TableForwarder.java @@ -1,12 +1,12 @@ -/** - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. +/* + * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.openflowplugin.applications.frsync.impl; +package org.opendaylight.openflowplugin.applications.frsync.impl.strategy; import java.util.Collections; import java.util.concurrent.Future; diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtil.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtil.java index 166dd02170..79fd17a697 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtil.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtil.java @@ -14,7 +14,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.JdkFutureAdapters; -import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -127,14 +126,11 @@ public class ReconcileUtil { public static AsyncFunction, RpcResult> chainBarrierFlush( final InstanceIdentifier nodeIdent, final FlowCapableTransactionService flowCapableTransactionService) { - return new AsyncFunction, RpcResult>() { - @Override - public ListenableFuture> apply(final RpcResult input) throws Exception { - final SendBarrierInput barrierInput = new SendBarrierInputBuilder() - .setNode(new NodeRef(nodeIdent)) - .build(); - return JdkFutureAdapters.listenInPoolThread(flowCapableTransactionService.sendBarrier(barrierInput)); - } + return input -> { + final SendBarrierInput barrierInput = new SendBarrierInputBuilder() + .setNode(new NodeRef(nodeIdent)) + .build(); + return JdkFutureAdapters.listenInPoolThread(flowCapableTransactionService.sendBarrier(barrierInput)); }; } diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/SyncupEntry.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/SyncupEntry.java index fa4b80849a..151724c563 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/SyncupEntry.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/util/SyncupEntry.java @@ -50,14 +50,24 @@ public class SyncupEntry { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SyncupEntry that = (SyncupEntry) o; - if (after != null ? !after.equals(that.after) : that.after != null) return false; - if (dsTypeAfter != that.dsTypeAfter) return false; - if (before != null ? !before.equals(that.before) : that.before != null) return false; + if (after != null ? !after.equals(that.after) : that.after != null) { + return false; + } + if (dsTypeAfter != that.dsTypeAfter) { + return false; + } + if (before != null ? !before.equals(that.before) : that.before != null) { + return false; + } return dsTypeBefore == that.dsTypeBefore; } diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorClusterDecoratorTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorClusterDecoratorTest.java index 5a6646ca99..3330dd44f9 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorClusterDecoratorTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorClusterDecoratorTest.java @@ -14,6 +14,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; +import org.opendaylight.openflowplugin.applications.frsync.SyncReactor; import org.opendaylight.openflowplugin.applications.frsync.impl.clustering.DeviceMastershipManager; import org.opendaylight.openflowplugin.applications.frsync.util.SyncupEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; @@ -34,7 +35,7 @@ public class SyncReactorClusterDecoratorTest { private InstanceIdentifier fcNodePath; @Mock - private SyncReactorFutureZipDecorator delegate; + private SyncReactor delegate; @Mock private DeviceMastershipManager deviceMastershipManager; @Mock diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecoratorTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecoratorTest.java index 717744af7a..9180e62b87 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecoratorTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecoratorTest.java @@ -31,6 +31,7 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.openflowplugin.applications.frsync.SyncReactor; import org.opendaylight.openflowplugin.applications.frsync.util.SyncupEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; @@ -56,7 +57,7 @@ public class SyncReactorFutureZipDecoratorTest { private final LogicalDatastoreType operationalDS = LogicalDatastoreType.OPERATIONAL; @Mock - private SyncReactorGuardDecorator delegate; + private SyncReactor delegate; @Mock private SyncupEntry syncupEntry; diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorGuardDecoratorTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorGuardDecoratorTest.java index c91862a21f..5b43181d65 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorGuardDecoratorTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorGuardDecoratorTest.java @@ -16,7 +16,7 @@ import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.openflowplugin.applications.frsync.SyncReactor; import org.opendaylight.openflowplugin.applications.frsync.util.SemaphoreKeeperGuavaImpl; import org.opendaylight.openflowplugin.applications.frsync.util.SyncupEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; @@ -35,10 +35,9 @@ public class SyncReactorGuardDecoratorTest { private static final NodeId NODE_ID = new NodeId("test-node"); private SyncReactorGuardDecorator reactor; private InstanceIdentifier fcNodePath; - private final LogicalDatastoreType dsType = LogicalDatastoreType.CONFIGURATION; @Mock - private SyncReactorRetryDecorator delegate; + private SyncReactor delegate; @Mock private FlowCapableNode fcConfigNode; @Mock @@ -63,10 +62,8 @@ public class SyncReactorGuardDecoratorTest { Mockito.when(delegate.syncup(Matchers.>any(), Matchers.any())) .thenReturn(Futures.immediateFuture(Boolean.TRUE)); -// reactor.syncup(fcNodePath, fcConfigNode, fcOperationalNode, dsType); reactor.syncup(fcNodePath, syncupEntry); -// Mockito.verify(delegate).syncup(fcNodePath, fcConfigNode, fcOperationalNode, dsType); Mockito.verify(delegate).syncup(fcNodePath, syncupEntry); Mockito.verifyNoMoreInteractions(delegate); } @@ -76,10 +73,8 @@ public class SyncReactorGuardDecoratorTest { Mockito.when(delegate.syncup(Matchers.>any(), Matchers.any())) .thenReturn(Futures.immediateFailedFuture(new Exception())); -// reactor.syncup(fcNodePath, fcConfigNode, fcOperationalNode, dsType); reactor.syncup(fcNodePath, syncupEntry); -// Mockito.verify(delegate).syncup(fcNodePath, fcConfigNode, fcOperationalNode, dsType); Mockito.verify(delegate).syncup(fcNodePath, syncupEntry); Mockito.verifyNoMoreInteractions(delegate); diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorRetryDecoratorTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorRetryDecoratorTest.java index 1c82ef21a4..8151e620df 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorRetryDecoratorTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorRetryDecoratorTest.java @@ -16,6 +16,7 @@ import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; +import org.opendaylight.openflowplugin.applications.frsync.SyncReactor; import org.opendaylight.openflowplugin.applications.frsync.util.ReconciliationRegistry; import org.opendaylight.openflowplugin.applications.frsync.util.SyncupEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; @@ -36,7 +37,7 @@ public class SyncReactorRetryDecoratorTest { private InstanceIdentifier fcNodePath; @Mock - private SyncReactorImpl delegate; + private SyncReactor delegate; @Mock private ReconciliationRegistry reconciliationRegistry; @Mock diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/FlowForwarderTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/FlowForwarderTest.java similarity index 99% rename from applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/FlowForwarderTest.java rename to applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/FlowForwarderTest.java index 7feb84aa58..90c7a70986 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/FlowForwarderTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/FlowForwarderTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.openflowplugin.applications.frsync.impl; +package org.opendaylight.openflowplugin.applications.frsync.impl.strategy; import java.math.BigInteger; import java.util.Collections; diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/GroupForwarderTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/GroupForwarderTest.java similarity index 99% rename from applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/GroupForwarderTest.java rename to applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/GroupForwarderTest.java index 8e980dcb60..4dd05c3c77 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/GroupForwarderTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/GroupForwarderTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.openflowplugin.applications.frsync.impl; +package org.opendaylight.openflowplugin.applications.frsync.impl.strategy; import java.math.BigInteger; import java.util.concurrent.Future; diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/MeterForwarderTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/MeterForwarderTest.java similarity index 99% rename from applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/MeterForwarderTest.java rename to applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/MeterForwarderTest.java index 28ae5dc4c3..779ebfccb1 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/MeterForwarderTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/MeterForwarderTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.openflowplugin.applications.frsync.impl; +package org.opendaylight.openflowplugin.applications.frsync.impl.strategy; import java.math.BigInteger; import java.util.concurrent.Future; diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java index a48d7dcd6b..4bea89fd48 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java @@ -25,7 +25,6 @@ import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import org.opendaylight.openflowplugin.applications.frsync.impl.TableForwarder; import org.opendaylight.openflowplugin.applications.frsync.util.ItemSyncBox; import org.opendaylight.openflowplugin.applications.frsync.util.SyncCrudCounters; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchInput; diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImplTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImplTest.java index 38721f10a8..a0d84c429f 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImplTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyIncrementalImplTest.java @@ -26,15 +26,10 @@ import org.mockito.InOrder; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.openflowplugin.applications.frsync.impl.DSInputFactory; -import org.opendaylight.openflowplugin.applications.frsync.impl.FlowForwarder; -import org.opendaylight.openflowplugin.applications.frsync.impl.GroupForwarder; -import org.opendaylight.openflowplugin.applications.frsync.impl.MeterForwarder; -import org.opendaylight.openflowplugin.applications.frsync.impl.TableForwarder; import org.opendaylight.openflowplugin.applications.frsync.util.ItemSyncBox; import org.opendaylight.openflowplugin.applications.frsync.util.SyncCrudCounters; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; @@ -226,12 +221,7 @@ public class SyncPlanPushStrategyIncrementalImplTest { } private Answer>> createSalServiceFutureAnswer() { - return new Answer>>() { - @Override - public Future> answer(final InvocationOnMock invocation) throws Throwable { - return RpcResultBuilder.success().buildFuture(); - } - }; + return invocation -> RpcResultBuilder.success().buildFuture(); } @Test diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/TableForwarderTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/TableForwarderTest.java similarity index 99% rename from applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/TableForwarderTest.java rename to applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/TableForwarderTest.java index 86cf17bf4c..31c472c64f 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/TableForwarderTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/TableForwarderTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.openflowplugin.applications.frsync.impl; +package org.opendaylight.openflowplugin.applications.frsync.impl.strategy; import java.math.BigInteger; import java.util.concurrent.Future; -- 2.36.6