Merge "Use String(byte[], Charset)"

diff --git a/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java b/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java
index ce99ea2f89c2cd88dafba6782ff0ac962fcc07be..246f31abb945c10e46029dc82b3066dd97eb8095 100644 (file)
--- a/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java
+++ b/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java
@@ -12,8 +12,8 @@ import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 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.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.ArrayList;
@@ -23,7 +23,6 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.PostConstruct;
@@ -40,11 +39,9 @@ import org.opendaylight.openflowplugin.applications.reconciliation.Reconciliatio
 import org.opendaylight.openflowplugin.applications.reconciliation.ReconciliationNotificationListener;
 import org.opendaylight.serviceutils.upgrade.UpgradeState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
@@ -62,7 +59,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.on
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.MessagesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.messages.Message;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.messages.MessageBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.bundle.inner.message.grouping.bundle.inner.message.BundleRemoveFlowCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.bundle.inner.message.grouping.bundle.inner.message.BundleRemoveFlowCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.bundle.inner.message.grouping.bundle.inner.message.BundleRemoveGroupCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.bundle.inner.message.grouping.bundle.inner.message.BundleRemoveGroupCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.bundle.inner.message.grouping.bundle.inner.message.bundle.remove.flow._case.RemoveFlowCaseDataBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.bundle.inner.message.grouping.bundle.inner.message.bundle.remove.group._case.RemoveGroupCaseDataBuilder;
@@ -77,6 +76,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.arbitrator.reconcile.service.rev180227.GetActiveBundleOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.arbitrator.reconcile.service.rev180227.GetActiveBundleOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.rf.state.rev170713.ResultState;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcError;
@@ -99,12 +99,24 @@ public class ArbitratorReconciliationManagerImpl implements ArbitratorReconcileS
     private static final String SERVICE_NAME = "ArbitratorReconciliationManager";
     private static final String SEPARATOR = ":";
 
+    private static final BundleRemoveFlowCase DELETE_ALL_FLOW = new BundleRemoveFlowCaseBuilder()
+            .setRemoveFlowCaseData(
+                new RemoveFlowCaseDataBuilder(new FlowBuilder().setTableId(OFConstants.OFPTT_ALL).build()).build())
+            .build();
+    private static final BundleRemoveGroupCase DELETE_ALL_GROUP = new BundleRemoveGroupCaseBuilder()
+            .setRemoveGroupCaseData(new RemoveGroupCaseDataBuilder(new GroupBuilder()
+                .setGroupType(GroupTypes.GroupAll)
+                .setGroupId(new GroupId(OFConstants.OFPG_ALL))
+                .build()).build())
+            .build();
+
     private final SalBundleService salBundleService;
     private final ReconciliationManager reconciliationManager;
     private final RoutedRpcRegistration routedRpcReg;
     private final UpgradeState upgradeState;
     private NotificationRegistration registration;
-    private final ExecutorService executor = Executors.newFixedThreadPool(THREAD_POOL_SIZE);
+    private final ListeningExecutorService executor = MoreExecutors.listeningDecorator(
+            Executors.newFixedThreadPool(THREAD_POOL_SIZE));
     private final Map<Uint64, BundleDetails> bundleIdMap = new ConcurrentHashMap<>();
 
     @Inject
@@ -193,7 +205,7 @@ public class ArbitratorReconciliationManagerImpl implements ArbitratorReconcileS
             return reconcileConfiguration(node);
         }
         LOG.trace("arbitrator reconciliation is disabled");
-        return Futures.immediateFuture(true);
+        return FluentFutures.immediateTrueFluentFuture();
     }
 
     @Override
@@ -202,7 +214,7 @@ public class ArbitratorReconciliationManagerImpl implements ArbitratorReconcileS
         LOG.trace("Stopping arbitrator reconciliation for node {}", datapathId);
         bundleIdMap.remove(datapathId);
         deregisterRpc(node);
-        return Futures.immediateFuture(true);
+        return FluentFutures.immediateTrueFluentFuture();
     }
 
     @Override
@@ -223,39 +235,19 @@ public class ArbitratorReconciliationManagerImpl implements ArbitratorReconcileS
     private ListenableFuture<Boolean> reconcileConfiguration(DeviceInfo node) {
         LOG.info("Triggering arbitrator reconciliation for device {}", node.getDatapathId());
         ArbitratorReconciliationTask upgradeReconTask = new ArbitratorReconciliationTask(node);
-        return JdkFutureAdapters.listenInPoolThread(executor.submit(upgradeReconTask));
+        return executor.submit(upgradeReconTask);
     }
 
     @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
             justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private Messages createMessages(final NodeRef nodeRef) {
         final List<Message> messages = new ArrayList<>();
-        messages.add(new MessageBuilder().setNode(nodeRef).setBundleInnerMessage(
-                new BundleRemoveFlowCaseBuilder()
-                .setRemoveFlowCaseData(new RemoveFlowCaseDataBuilder(getDeleteAllFlow()).build())
-                .build()).build());
-
-        messages.add(new MessageBuilder().setNode(nodeRef).setBundleInnerMessage(
-                new BundleRemoveGroupCaseBuilder()
-                .setRemoveGroupCaseData(new RemoveGroupCaseDataBuilder(getDeleteAllGroup()).build())
-                .build()).build());
+        messages.add(new MessageBuilder().setNode(nodeRef).setBundleInnerMessage(DELETE_ALL_FLOW).build());
+        messages.add(new MessageBuilder().setNode(nodeRef).setBundleInnerMessage(DELETE_ALL_GROUP).build());
         LOG.debug("The size of the flows and group messages created in createMessage() {}", messages.size());
         return new MessagesBuilder().setMessage(messages).build();
     }
 
-    private Flow getDeleteAllFlow() {
-        final FlowBuilder flowBuilder = new FlowBuilder();
-        flowBuilder.setTableId(OFConstants.OFPTT_ALL);
-        return flowBuilder.build();
-    }
-
-    private Group getDeleteAllGroup() {
-        final GroupBuilder groupBuilder = new GroupBuilder();
-        groupBuilder.setGroupType(GroupTypes.GroupAll);
-        groupBuilder.setGroupId(new GroupId(OFConstants.OFPG_ALL));
-        return groupBuilder.build();
-    }
-
     private class ArbitratorReconciliationTask implements Callable<Boolean> {
         final DeviceInfo deviceInfo;
 
@@ -297,13 +289,13 @@ public class ArbitratorReconciliationManagerImpl implements ArbitratorReconcileS
                             return salBundleService
                                     .addBundleMessages(addBundleMessagesInput);
                         }
-                        return Futures.immediateFuture(null);
+                        return FluentFutures.immediateNullFluentFuture();
                     }, MoreExecutors.directExecutor());
             Uint64 nodeId = getDpnIdFromNodeName(node);
             try {
                 if (addBundleMessagesFuture.get().isSuccessful()) {
                     bundleIdMap.put(nodeId, new BundleDetails(bundleIdValue,
-                            Futures.immediateFuture(null)));
+                        FluentFutures.immediateNullFluentFuture()));
                     LOG.debug("Arbitrator reconciliation initial task has been completed for node {} and open up"
                             + " for application programming.", nodeId);
                     return true;

diff --git a/applications/arbitratorreconciliation/pom.xml b/applications/arbitratorreconciliation/pom.xml
index 178f6c9bbc0c90713ac8fc4316ecf42fdac39b19..af74c3d15a170604108f82f9c7b5bfbc2bb2796a 100644 (file)
--- a/applications/arbitratorreconciliation/pom.xml
+++ b/applications/arbitratorreconciliation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterDirectOFRpc.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterDirectOFRpc.java
index 7ad33aba253b8b0a018624aff7a49eefb8b13c33..02bc9bd88cf7bae8e72577db2ccd1f325c1b8544 100644 (file)
--- a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterDirectOFRpc.java
+++ b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterDirectOFRpc.java
@@ -132,7 +132,7 @@ public class FlowWriterDirectOFRpc {
 
                 AddFlowInput addFlowInput = builder.build();
 
-                LOG.debug("RPC invocation for adding flow-id {} with input {}", flowId, addFlowInput.toString());
+                LOG.debug("RPC invocation for adding flow-id {} with input {}", flowId, addFlowInput);
                 LoggingFutures.addErrorLogging(flowService.addFlow(addFlowInput), LOG, "addFlow");
 
                 if (i % batchSize == 0) {

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java
index b64fe2b79468628ea47d6fea442d7f5786c12d29..9ce70732f0b0568f29b6906791403b942dddad39 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java
@@ -275,7 +275,7 @@ public class FlowForwarder extends AbstractListeningCommiter<Flow> {
     @Override
     public void createStaleMarkEntity(InstanceIdentifier<Flow> identifier, Flow del,
             InstanceIdentifier<FlowCapableNode> nodeIdent) {
-        LOG.debug("Creating Stale-Mark entry for the switch {} for flow {} ", nodeIdent.toString(), del.toString());
+        LOG.debug("Creating Stale-Mark entry for the switch {} for flow {} ", nodeIdent, del);
         StaleFlow staleFlow = makeStaleFlow(identifier, del, nodeIdent);
         persistStaleFlow(staleFlow, nodeIdent);
     }
@@ -404,7 +404,7 @@ public class FlowForwarder extends AbstractListeningCommiter<Flow> {
                         getFlowId(addFlowInput.getFlowRef()), nodeId);
             } else {
                 LOG.error("Flow add with id {} failed for node {} with error {}", getFlowId(addFlowInput.getFlowRef()),
-                        nodeId, rpcResult.getErrors().toString());
+                        nodeId, rpcResult.getErrors());
                 resultFuture.set(RpcResultBuilder.<AddFlowOutput>failed()
                         .withRpcErrors(rpcResult.getErrors()).build());
             }
@@ -454,7 +454,7 @@ public class FlowForwarder extends AbstractListeningCommiter<Flow> {
                         getFlowId(updateFlowInput.getFlowRef()), nodeId);
             } else {
                 LOG.error("Flow update with id {} failed for node {} with error {}",
-                        getFlowId(updateFlowInput.getFlowRef()), nodeId, rpcResult.getErrors().toString());
+                        getFlowId(updateFlowInput.getFlowRef()), nodeId, rpcResult.getErrors());
                 resultFuture.set(RpcResultBuilder.<UpdateFlowOutput>failed()
                         .withRpcErrors(rpcResult.getErrors()).build());
             }

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java
index c721b8500a88bdd9902d20ec7b7690a4920ac39c..f25a34c2d57059a1776f2e1ef6ad8416af406d2c 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java
@@ -55,7 +55,7 @@ public class FrmReconciliationServiceImpl implements FrmReconciliationService {
 
     @Override
     public ListenableFuture<RpcResult<ReconcileNodeOutput>> reconcileNode(ReconcileNodeInput input) {
-        LOG.debug("Triggering reconciliation for node: {}", input.getNodeId().toString());
+        LOG.debug("Triggering reconciliation for node: {}", input.getNodeId());
         Node nodeDpn = buildNode(input.getNodeId().longValue());
         InstanceIdentifier<FlowCapableNode> connectedNode = InstanceIdentifier.builder(Nodes.class)
                 .child(Node.class, nodeDpn.key()).augmentation(FlowCapableNode.class).build();
@@ -64,7 +64,7 @@ public class FrmReconciliationServiceImpl implements FrmReconciliationService {
                 .getNodeListener().reconcileConfiguration(connectedNode);
         Futures.addCallback(futureResult, new ResultCallBack(futureResult, rpcResult),
                 MoreExecutors.directExecutor());
-        LOG.debug("Completing reconciliation for node: {}", input.getNodeId().toString());
+        LOG.debug("Completing reconciliation for node: {}", input.getNodeId());
         return rpcResult;
     }
 

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java
index 0d5848d80cac00eab6b4fbdba607ff95d49fdd6f..a2522361f6f7d51ae327638bd643d7bbe9eb60b6 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java
@@ -200,7 +200,7 @@ public class GroupForwarder extends AbstractListeningCommiter<Group> {
     @Override
     public void createStaleMarkEntity(InstanceIdentifier<Group> identifier, Group del,
             InstanceIdentifier<FlowCapableNode> nodeIdent) {
-        LOG.debug("Creating Stale-Mark entry for the switch {} for Group {} ", nodeIdent.toString(), del.toString());
+        LOG.debug("Creating Stale-Mark entry for the switch {} for Group {} ", nodeIdent, del);
         StaleGroup staleGroup = makeStaleGroup(identifier, del, nodeIdent);
         persistStaleGroup(staleGroup, nodeIdent);
 

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java
index c65abc8d593c35784de22e47ec74c9c19a418d92..ef8d5d7d97a411d606fdfa87fe79ed62f124eed9 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java
@@ -149,7 +149,7 @@ public class MeterForwarder extends AbstractListeningCommiter<Meter> {
     @Override
     public void createStaleMarkEntity(InstanceIdentifier<Meter> identifier, Meter del,
             InstanceIdentifier<FlowCapableNode> nodeIdent) {
-        LOG.debug("Creating Stale-Mark entry for the switch {} for meter {} ", nodeIdent.toString(), del.toString());
+        LOG.debug("Creating Stale-Mark entry for the switch {} for meter {} ", nodeIdent, del);
         StaleMeter staleMeter = makeStaleMeter(del);
         persistStaleMeter(staleMeter, nodeIdent);
     }

diff --git a/applications/pom.xml b/applications/pom.xml
index 55a67da9d37576f8df1be6c7399ae3409134eea7..85d84e3a54a72a4b1adb08186e2590d064817894 100644 (file)
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 09b591fdbccfd78862b91682df16e1086162ae11..5460deb4d63651a4aa50ca14db9ba0b0f11d646b 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index c86334705aa449289219319062524129cc8a2dc6..839f5ee66f6a9b982743c544736d1e809737c30a 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
   </parent>
   <groupId>org.opendaylight.openflowplugin</groupId>
   <artifactId>openflowplugin-karaf</artifactId>

diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
index a6ee5e5cb28da8f18d9e54ca7c097cb21c976032..beaccd714e74524dee8d9ee31a871901c0f9dd68 100644 (file)
--- a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
+++ b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
index a56b872d5aae5c5bb7aaf2387afc41db4dbfe108..db827b8e44dcaaa54f4c482353461effa24cde94 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
index bdf500c09235fd81e7210a0e3ac14334d467759b..673dc9b4a6b277b7ca91eca13fe35f326972ba37 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
index 3f8534f43647a8ce0859032e6911b13514b01bc3..308603404feef65ea2344df231ea3ab5e112b137 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml
index 779be77e19d32b76763bffb1d9abfe5fef26f2e5..e2393d1484f123c544b36ed2cd98c1b0161548d8 100644 (file)
--- a/extension/features-extension-aggregator/pom.xml
+++ b/extension/features-extension-aggregator/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/extension/pom.xml b/extension/pom.xml
index 1a1e5cdcd72db329c279aacac166f7fe21cc6142..69fd17f7d739837d313e5c73d5ff7996f8054355 100644 (file)
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml
index f847e098cc72e03fd46e53398b0b2386e3fc207c..597ebd51a8488b953fa915e6f6a99d01cc6d11b6 100644 (file)
--- a/features-aggregator/features-openflowplugin/pom.xml
+++ b/features-aggregator/features-openflowplugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
index 02be2cd9072e74658467da980f2709a4ecacf8f5..5453d983178358c972d7211e62ca9a0e847c4e54 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
index 169dbdeb68a24a082ab138e567ca2b6506565334..95e2d9cdfb3d3e24c296b3153b3786ef3f49e690 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
index eb6c20dafed4049c511e089dc99f01813d55fa6b..c097b844c13fb633db145e95a693840c712cabfe 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
index c28bdccd179850ee02e1bbad035bffe48b020ec7..01008e149e37eda3604871f781bac7b588aa6c5e 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
index 75586c3b0ac6eae8020659beb87fcc6fa8cb79e9..eb2730a996b8450bf91940714617f0be940857b1 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
index afe1acf250050b53eb269fbf6322aa8ef4070ff9..c8924cdb654530090aec7f036a3064742a2cb26f 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
index ab7c028f8e23341d142bee552a6179f24a7d52bc..46ef6041fca45c209888f77d2deecbf0d1050848 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
index 5527d3d1e480045e4c885f807b02d8471da1c110..ad0efe370c30609ce4eca7ccfe654cc9070b1693 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
@@ -4,7 +4,7 @@
 <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <relativePath/>
 </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
index 023898558a432d058002a05d6ce302dcdf66671b..66c8d760e8c722a79328f5d718184f8d68e07703 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
index 1b1a7b2a1cb246052e5506dd129b5596b31b1ccb..981734c0258746348a833aa42352b40e6da016f1 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
index 09bc5b5ed1d72cef70b20bec41741fa851b8b516..3dc0521a279c24403a454bba500a9c05c38482a2 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
index 6acfaaf65021fde05c8967685237131db08f69f2..0835acf2e3859abea35236459508b202f37fa47f 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
index 16674b5b20e6a44dd3a9d068a2a8c2d15d76aef5..89f5e99ee9b76e1f40e9973f3e8859cf3c5ce38d 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
index 6e84bc8d72ac557a08caf789620e500d74fb9da2..dae8af11823797b2a649247b9f8a412531c12579 100644 (file)
--- a/features-aggregator/odl-openflowplugin-drop-test/pom.xml
+++ b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
index 519711605909e73820733e2bd46a03bdb752428f..5ac7142465e6d7b13b98d68592367373a7231500 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
index 26f25038cb6c9e46d9ef81c03a6a935456df0c51..1cf4af304d350f2ae57e6fb872141fffd135e41b 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-libraries/pom.xml b/features-aggregator/odl-openflowplugin-libraries/pom.xml
index 2b2c92c8614ea3f346c1e3e988824d5b9b5398ce..094c3d45723f2ad16cd509014f6d2ff3aee70041 100644 (file)
--- a/features-aggregator/odl-openflowplugin-libraries/pom.xml
+++ b/features-aggregator/odl-openflowplugin-libraries/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
index 4b30ddd133352c6e497ae5df8a5d216e786f06fc..21e001ba951431ac5df20abeb6237e3a6e86d0af 100644 (file)
--- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
+++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>5.0.3</version>
+                <version>5.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml
index 68d1d95c34e4db04a98aa01b6f688d8eb969ffcd..1b70274e369ba7ff7ac141f1629227ad0ac1c061 100644 (file)
--- a/features-aggregator/odl-openflowplugin-southbound/pom.xml
+++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/pom.xml b/features-aggregator/pom.xml
index 55b18121818ab785de519ac749ee2004f731445d..2714ae9a0ed4a5cddaf3fae0dee03e49fa0f3967 100644 (file)
--- a/features-aggregator/pom.xml
+++ b/features-aggregator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/libraries/pom.xml b/libraries/pom.xml
index 7de94b32c0100c641ce314181a525fa352d23974..210aedffcd4299ba902fada5488c8c5e19c1ede0 100644 (file)
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang b/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang
index a41176e7d5353b228efafe799759c75766695677..d764f7261a2e56dc9b899e550fe81a3410935619 100644 (file)
--- a/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang
+++ b/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang
@@ -148,7 +148,7 @@ module opendaylight-meter-statistics {
             // Empty request case
         }
         case multipart-request-meter-stats {
-            leaf meter-id {
+            leaf stat-meter-id {
                 type meter-types:meter-id;
             }
         }

diff --git a/model/pom.xml b/model/pom.xml
index 10fb01e42de2c1d7f4ad70196649a66add0a7aa3..1d5dd1d91508c7265e183fea1153bfdb5e8577d3 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
index 30074d8065ce31fc3898dfb112a1fd483bb65ff6..91d53cda08f302dc12269c943ab70fe4a479e751 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index 3058b62b9a274dae1631f78e842b67121bc8044d..f8266ca5a03814901f8c5da1a9d48624fdc6810a 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>5.0.3</version>
+                <version>5.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml
index 9e753e7cbfb1538b180a0f3230e0a43ece8f5b66..66f9d23b227ed92828666e4ad1085e9c80179b78 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/DeviceRequestFailedException.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/DeviceRequestFailedException.java
index e5df8529e7494aa56ad70ee277531c34c6371c6f..24438d01d2bd5934e4c196c69f69fe42f6a2df8d 100644 (file)
--- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/DeviceRequestFailedException.java
+++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/DeviceRequestFailedException.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.openflowjava.protocol.api.connection;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.Error;
 
@@ -21,12 +22,12 @@ public class DeviceRequestFailedException extends OutboundQueueException {
 
     public DeviceRequestFailedException(final String message, @NonNull final Error error) {
         super(message);
-        this.error = Preconditions.checkNotNull(error);
+        this.error = requireNonNull(error);
     }
 
     public DeviceRequestFailedException(final String message, @NonNull final Error error, final Throwable cause) {
         super(message, cause);
-        this.error = Preconditions.checkNotNull(error);
+        this.error = requireNonNull(error);
     }
 
     @NonNull public Error getError() {

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandler.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandler.java
index 0278bfe48f6e99b9ed7e0226888e40f8889245e8..4dae69d4fbd2668e78daca42f977c429bf5d94e4 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandler.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandler.java
@@ -5,10 +5,10 @@
  * 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.openflowjava.protocol.impl.core;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import org.opendaylight.openflowjava.protocol.impl.core.connection.ConnectionAdapterImpl;
@@ -35,7 +35,7 @@ public class DelegatingInboundHandler extends ChannelInboundHandlerAdapter {
      */
     public DelegatingInboundHandler(final MessageConsumer connectionAdapter) {
         LOG.trace("Creating DelegatingInboundHandler");
-        consumer = Preconditions.checkNotNull(connectionAdapter);
+        consumer = requireNonNull(connectionAdapter);
     }
 
     @Override

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpConnectionInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpConnectionInitializer.java
index c5a2aaf2bca479b57b9056b97ff519f8df6d5b56..2c0f711f4e3972882eb14ee4296771a0227b2ac8 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpConnectionInitializer.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpConnectionInitializer.java
@@ -5,10 +5,10 @@
  * 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.openflowjava.protocol.impl.core;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import io.netty.bootstrap.Bootstrap;
@@ -41,8 +41,7 @@ public class TcpConnectionInitializer implements ServerFacade, ConnectionInitial
      * @param workerGroup - shared worker group
      */
     public TcpConnectionInitializer(EventLoopGroup workerGroup, boolean isEpollEnabled) {
-        Preconditions.checkNotNull(workerGroup, "WorkerGroup can't be null");
-        this.workerGroup = workerGroup;
+        this.workerGroup = requireNonNull(workerGroup, "WorkerGroup can't be null");
         this.isEpollEnabled = isEpollEnabled;
     }
 

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java
index 825e385d9f8291e3f536a439a2e64b496c930d67..e40d680f55deb8663c1e4ccd5155eee51700808b 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java
@@ -5,10 +5,10 @@
  * 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.openflowjava.protocol.impl.core;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import io.netty.buffer.ByteBuf;
 
 /**
@@ -28,7 +28,7 @@ public class VersionMessageWrapper {
      */
     public VersionMessageWrapper(final short version, final ByteBuf messageBuffer) {
         this.version = version;
-        this.messageBuffer = Preconditions.checkNotNull(messageBuffer);
+        this.messageBuffer = requireNonNull(messageBuffer);
     }
 
     /**

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractConnectionAdapter.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractConnectionAdapter.java
index a07725951e0aeefb2468873fdddaa2643fb4617d..7544368d5bcdbb0113fd3099da4e2a71fcfe0b29 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractConnectionAdapter.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractConnectionAdapter.java
@@ -5,11 +5,11 @@
  * 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.openflowjava.protocol.impl.core.connection;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalCause;
@@ -101,7 +101,7 @@ abstract class AbstractConnectionAdapter implements ConnectionAdapter {
 
     AbstractConnectionAdapter(@NonNull final Channel channel, @Nullable final InetSocketAddress address,
                               @Nullable final int channelOutboundQueueSize) {
-        this.channel = Preconditions.checkNotNull(channel);
+        this.channel = requireNonNull(channel);
         this.address = address;
 
         responseCache = CacheBuilder.newBuilder().concurrencyLevel(1)

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractOutboundQueueManager.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractOutboundQueueManager.java
index f07895b44b902858a04496338b94e1283d1d334c..db77d1a7478bc80f890857fd936704d446b687fb 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractOutboundQueueManager.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractOutboundQueueManager.java
@@ -5,10 +5,11 @@
  * 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.openflowjava.protocol.impl.core.connection;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.util.concurrent.Future;
@@ -83,8 +84,8 @@ abstract class AbstractOutboundQueueManager<T extends OutboundQueueHandler, O ex
     protected final Runnable flushRunnable = this::flush;
 
     AbstractOutboundQueueManager(final ConnectionAdapterImpl parent, final InetSocketAddress address, final T handler) {
-        this.parent = Preconditions.checkNotNull(parent);
-        this.handler = Preconditions.checkNotNull(handler);
+        this.parent = requireNonNull(parent);
+        this.handler = requireNonNull(handler);
         this.address = address;
         /* Note: don't wish to use reflection here */
         currentQueue = initializeStackedOutboudnqueue();
@@ -261,8 +262,7 @@ abstract class AbstractOutboundQueueManager<T extends OutboundQueueHandler, O ex
      * selected by communication pipeline.
      */
     protected Object makeMessageListenerWrapper(@NonNull final OfHeader msg) {
-        Preconditions.checkArgument(msg != null);
-
+        checkArgument(msg != null);
         if (address == null) {
             return new MessageListenerWrapper(msg, LOG_ENCODER_LISTENER);
         }

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractRpcListener.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractRpcListener.java
index 1563d4935482efe816bb67baaa8cb2248cbece26..09783ab7594e43ab61283d42d8770e99fcc0fd67 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractRpcListener.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractRpcListener.java
@@ -7,7 +7,9 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.core.connection;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import io.netty.util.concurrent.Future;
@@ -46,8 +48,8 @@ abstract class AbstractRpcListener<T> implements GenericFutureListener<Future<Vo
     }
 
     AbstractRpcListener(final Object message, final String failureInfo) {
-        this.failureInfo = Preconditions.checkNotNull(failureInfo);
-        this.message = Preconditions.checkNotNull(message);
+        this.failureInfo = requireNonNull(failureInfo);
+        this.message = requireNonNull(message);
     }
 
     public final ListenableFuture<RpcResult<T>> getResult() {
@@ -68,7 +70,7 @@ abstract class AbstractRpcListener<T> implements GenericFutureListener<Future<Vo
     @Override
     public final Object takeMessage() {
         final Object ret = message;
-        Preconditions.checkState(ret != null, "Message has already been taken");
+        checkState(ret != null, "Message has already been taken");
         message = null;
         return ret;
     }

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java
index 8cdc59aa2e993979290855990a4a719261492873..8f9e5e47090e67e9164a68189888ba993cec116f 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java
@@ -5,11 +5,12 @@
  * 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.openflowjava.protocol.impl.core.connection;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verify;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.util.concurrent.FutureCallback;
 import io.netty.channel.Channel;
 import java.util.ArrayList;
@@ -50,7 +51,7 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue {
     protected final AbstractOutboundQueueManager<?, ?> manager;
 
     AbstractStackedOutboundQueue(final AbstractOutboundQueueManager<?, ?> manager) {
-        this.manager = Preconditions.checkNotNull(manager);
+        this.manager = requireNonNull(manager);
         firstSegment = StackedSegment.create(0L);
         uncompletedSegments.add(firstSegment);
         unflushedSegments.add(firstSegment);
@@ -102,7 +103,7 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue {
                     // Ensure we have the appropriate segment for the specified XID
                     final StackedSegment slowSegment = firstSegment;
                     final int slowOffset = (int) (xid - slowSegment.getBaseXid());
-                    Verify.verify(slowOffset >= 0);
+                    verify(slowOffset >= 0);
 
                     // Now, we let's see if we need to allocate a new segment
                     ensureSegment(slowSegment, slowOffset);
@@ -301,10 +302,10 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue {
     protected OutboundQueueEntry getEntry(final Long xid) {
         final StackedSegment fastSegment = firstSegment;
         final long calcOffset = xid - fastSegment.getBaseXid();
-        Preconditions.checkArgument(calcOffset >= 0, "Commit of XID %s does not match up with base XID %s",
+        checkArgument(calcOffset >= 0, "Commit of XID %s does not match up with base XID %s",
                 xid, fastSegment.getBaseXid());
 
-        Verify.verify(calcOffset <= Integer.MAX_VALUE);
+        verify(calcOffset <= Integer.MAX_VALUE);
         final int fastOffset = (int) calcOffset;
 
         if (fastOffset >= StackedSegment.SEGMENT_SIZE) {
@@ -315,7 +316,7 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue {
             synchronized (unflushedSegments) {
                 final StackedSegment slowSegment = firstSegment;
                 final long slowCalcOffset = xid - slowSegment.getBaseXid();
-                Verify.verify(slowCalcOffset >= 0 && slowCalcOffset <= Integer.MAX_VALUE);
+                verify(slowCalcOffset >= 0 && slowCalcOffset <= Integer.MAX_VALUE);
                 slowOffset = (int) slowCalcOffset;
 
                 LOG.debug("Queue {} recalculated offset of XID {} to {}", this, xid, slowOffset);

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue.java
index c2c8e244c0e5f8c19e79858ef771247c02576f37..493237a3a05504bee14591227d39ee05ace47a27 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue.java
@@ -5,10 +5,12 @@
  * 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.openflowjava.protocol.impl.core.connection;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
+
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
@@ -92,7 +94,7 @@ final class ChannelOutboundQueue extends ChannelInboundHandlerAdapter {
     private final InetSocketAddress address;
 
     ChannelOutboundQueue(final Channel channel, final int queueDepth, final InetSocketAddress address) {
-        Preconditions.checkArgument(queueDepth > 0, "Queue depth has to be positive");
+        checkArgument(queueDepth > 0, "Queue depth has to be positive");
 
         /*
          * This looks like a good trade-off for throughput. Alternative is
@@ -101,7 +103,7 @@ final class ChannelOutboundQueue extends ChannelInboundHandlerAdapter {
          * to less throughput.
          */
         this.queue = new LinkedBlockingQueue<>(queueDepth);
-        this.channel = Preconditions.checkNotNull(channel);
+        this.channel = requireNonNull(channel);
         this.maxWorkTime = TimeUnit.MICROSECONDS.toNanos(DEFAULT_WORKTIME_MICROS);
         this.address = address;
     }
@@ -153,8 +155,7 @@ final class ChannelOutboundQueue extends ChannelInboundHandlerAdapter {
     }
 
     private void conditionalFlush(final ChannelHandlerContext ctx) {
-        Preconditions.checkState(ctx.channel().equals(channel),
-                "Inconsistent channel %s with context %s", channel, ctx);
+        checkState(ctx.channel().equals(channel), "Inconsistent channel %s with context %s", channel, ctx);
         conditionalFlush();
     }
 

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ResponseExpectedRpcListener.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ResponseExpectedRpcListener.java
index 6a60375765b18565f42e5d878c2da9b110fda290..edb5956a1300555a559bc15df2722221920fa9e0 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ResponseExpectedRpcListener.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ResponseExpectedRpcListener.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.core.connection;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.cache.Cache;
 import java.util.concurrent.TimeoutException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
@@ -22,8 +23,8 @@ final class ResponseExpectedRpcListener<T extends OfHeader> extends AbstractRpcL
     ResponseExpectedRpcListener(final Object message, final String failureInfo,
             final Cache<RpcResponseKey, ResponseExpectedRpcListener<?>> cache, final RpcResponseKey key) {
         super(message, failureInfo);
-        this.cache = Preconditions.checkNotNull(cache);
-        this.key = Preconditions.checkNotNull(key);
+        this.cache = requireNonNull(cache);
+        this.key = requireNonNull(key);
     }
 
     public void discard() {

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedSegment.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedSegment.java
index 0b4559eaec2fe93f3fe63aafacaf78baf7374cc3..92a92ebfb3c13466b5936dc33feb4b94d61c1560 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedSegment.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedSegment.java
@@ -7,11 +7,12 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.core.connection;
 
+import static com.google.common.base.Verify.verify;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.FinalizableReferenceQueue;
 import com.google.common.base.FinalizableSoftReference;
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
 import java.lang.ref.Reference;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import org.opendaylight.openflowjava.protocol.api.connection.DeviceRequestFailedException;
@@ -53,7 +54,7 @@ final class StackedSegment {
     StackedSegment(final long baseXid, final OutboundQueueEntry[] entries) {
         this.baseXid = baseXid;
         this.endXid = baseXid + SEGMENT_SIZE;
-        this.entries = Preconditions.checkNotNull(entries);
+        this.entries = requireNonNull(entries);
     }
 
     static StackedSegment create(final long baseXid) {
@@ -151,7 +152,7 @@ final class StackedSegment {
             lastBarrierOffset = offset;
 
             final boolean success = completeEntry(entry, response);
-            Verify.verify(success, "Barrier request failed to complete");
+            verify(success, "Barrier request failed to complete");
             completeCount++;
         } else if (completeEntry(entry, response)) {
             completeCount++;

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializer.java
index 4230f24d35812bc5202fe1ef78a387925bbff26f..40453b39807a388a5d7c3ac8e93a6d7d775925aa 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializer.java
@@ -22,7 +22,7 @@ public class MultipartRequestMeterStatsSerializer implements OFSerializer<Multip
     @Override
     public void serialize(final MultipartRequestMeterStats multipartRequestMeterStats, final ByteBuf byteBuf) {
         byteBuf.writeInt(MoreObjects
-            .firstNonNull(multipartRequestMeterStats.getMeterId(), new MeterId(OFConstants.OFPM_ALL))
+            .firstNonNull(multipartRequestMeterStats.getStatMeterId(), new MeterId(OFConstants.OFPM_ALL))
                 .getValue().intValue());
         byteBuf.writeZero(PADDING_IN_MULTIPART_REQUEST_METER_BODY);
     }

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java
index 4c7dc1daf0bbf8ae825d3c275f009e4de615064f..c0193904cd0d910eac9f2f0d050898323615303e 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java
@@ -53,7 +53,7 @@ public class MeterDirectStatisticsService extends AbstractMeterDirectStatisticsS
             .setVersion(getVersion())
             .setRequestMore(false)
             .setMultipartRequestBody(new MultipartRequestMeterStatsBuilder()
-                .setMeterId(input.getMeterId())
+                .setStatMeterId(input.getMeterId())
                 .build())
             .build();
     }

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializerTest.java
index 788b8fd659560a6405ff789905585fdf0c4d8308..18f6ad529db6599ba629558625647993b71dda43 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializerTest.java
@@ -24,7 +24,7 @@ public class MultipartRequestMeterStatsSerializerTest extends AbstractSerializer
     private static final byte PADDING_IN_MULTIPART_REQUEST_METER_BODY = 4;
     private static final long METER_ID = 42;
     private static final MultipartRequestMeterStats BODY = new MultipartRequestMeterStatsBuilder()
-            .setMeterId(new MeterId(METER_ID))
+            .setStatMeterId(new MeterId(METER_ID))
             .build();
 
     private MultipartRequestMeterStatsSerializer serializer;
@@ -45,4 +45,4 @@ public class MultipartRequestMeterStatsSerializerTest extends AbstractSerializer
         assertEquals(out.readableBytes(), 0);
     }
 
-}
\ No newline at end of file
+}

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java
index 5ccb4d506f7d2b7950a8fce2954dfdc56cc98c40..d61b1cf11828b563d7c52907b79ce625e23eb1ea 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java
@@ -62,7 +62,7 @@ public class MeterDirectStatisticsServiceTest extends AbstractDirectStatisticsSe
             .buildRequest(new Xid(Uint32.valueOf(42L)), input))
             .getMultipartRequestBody();
 
-        assertEquals(METER_NO, body.getMeterId().getValue());
+        assertEquals(METER_NO, body.getStatMeterId().getValue());
     }
 
     @Override

diff --git a/parent/pom.xml b/parent/pom.xml
index 3b9ed5fac445c3024d1b7a73a5522e1a25c3a2aa..21f9d446d8a6a41bdb74167136c17e23eda2b346 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>5.0.3</version>
+        <version>5.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/samples/pom.xml b/samples/pom.xml
index d633724724bdcf368309d02d074c7c25c9d8d54a..54b95b8f84887fb184434fdaf3d4baa5f6f6a03e 100644 (file)
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/CallableClient.java b/samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/CallableClient.java
index 9242908aebb116715ea488a5679860165c53a271..fc70a14f354c18f110f5211d2d88f01f2bbe8fb8 100644 (file)
--- a/samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/CallableClient.java
+++ b/samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/CallableClient.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.clients;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.util.concurrent.SettableFuture;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.EventLoopGroup;
@@ -16,7 +17,6 @@ import java.net.InetAddress;
 import java.util.concurrent.Callable;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * Callable client class, inspired by SimpleClient class.
  * Simulating device/switch connected to controller.
@@ -46,16 +46,13 @@ public class CallableClient implements Callable<Boolean>, OFClient {
             final ScenarioHandler scenarioHandler,
             final Bootstrap bootstrap,
             final EventLoopGroup eventExecutors) {
-
-        Preconditions.checkNotNull(ipAddress, "IP address cannot be null");
-        Preconditions.checkNotNull(scenarioHandler, "Scenario handler cannot be null");
         this.port = port;
         this.securedClient = securedClient;
-        this.ipAddress = ipAddress;
+        this.ipAddress = requireNonNull(ipAddress, "IP address cannot be null");
         this.workerGroup = eventExecutors;
         this.bootstrap = bootstrap;
         this.name = name;
-        this.scenarioHandler = scenarioHandler;
+        this.scenarioHandler = requireNonNull(scenarioHandler, "Scenario handler cannot be null");
     }
 
     @Override
@@ -82,8 +79,8 @@ public class CallableClient implements Callable<Boolean>, OFClient {
     @Override
     @SuppressWarnings("checkstyle:IllegalCatch")
     public Boolean call() throws Exception {
-        Preconditions.checkNotNull(bootstrap);
-        Preconditions.checkNotNull(workerGroup);
+        requireNonNull(bootstrap);
+        requireNonNull(workerGroup);
         LOG.info("Switch {} trying connect to controller", this.name);
         SimpleClientInitializer clientInitializer = new SimpleClientInitializer(isOnlineFuture, securedClient);
         clientInitializer.setScenario(scenarioHandler);