Bump upstreams for Silicon

Adopt the following upstream versions:
- odlparent-8.0.0
- yangtools-6.0.0
- mdsal-7.0.0
- controller-3.0.0
- infrautils-1.9.0

There are a few javadoc references to things that disappeared
from infrautils.

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

diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java
index 4a073ac65c6acf0a6176f86391131a536839c4d5..1aa554fbe5509d91872cf3c143b41b0fb2fa5050 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java
+++ b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerARP.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.genius.alivenessmonitor.protocols.internal;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.genius.alivenessmonitor.protocols.AlivenessMonitorAndProtocolsConstants.SEPERATOR;
 
-import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -131,16 +131,16 @@ public class AlivenessProtocolHandlerARP extends AbstractAlivenessProtocolHandle
             return;
         }
         EndpointType source = monitorInfo.getSource().getEndpointType();
-        final String sourceInterface = Preconditions.checkNotNull(AlivenessMonitorUtil.getInterfaceName(source),
+        final String sourceInterface = requireNonNull(AlivenessMonitorUtil.getInterfaceName(source),
                 "Source interface is required to send ARP Packet for monitoring");
 
-        final String srcIp = Preconditions.checkNotNull(AlivenessMonitorUtil.getIpAddress(source),
+        final String srcIp = requireNonNull(AlivenessMonitorUtil.getIpAddress(source),
                 "Source Ip address is required to send ARP Packet for monitoring");
         final Optional<PhysAddress> srcMacAddressOptional = getMacAddress(source);
         if (srcMacAddressOptional.isPresent()) {
             PhysAddress srcMacAddress = srcMacAddressOptional.get();
             EndpointType target = monitorInfo.getDestination().getEndpointType();
-            final String targetIp = Preconditions.checkNotNull(AlivenessMonitorUtil.getIpAddress(target),
+            final String targetIp = requireNonNull(AlivenessMonitorUtil.getIpAddress(target),
                     "Target Ip address is required to send ARP Packet for monitoring");
             if (LOG.isTraceEnabled()) {
                 LOG.trace("sendArpRequest interface {}, senderIPAddress {}, targetAddress {}", sourceInterface, srcIp,

diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerIPv6ND.java b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerIPv6ND.java
index aab1e604ad44e0ee7e701c918b32c4da3738b634..b1748d28d9bf2561d23c235584967a1624a40947 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerIPv6ND.java
+++ b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerIPv6ND.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.genius.alivenessmonitor.protocols.internal;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.genius.alivenessmonitor.protocols.AlivenessMonitorAndProtocolsConstants.SEPERATOR;
 
-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.ListenableFuture;
@@ -133,15 +133,15 @@ public class AlivenessProtocolHandlerIPv6ND extends AbstractAlivenessProtocolHan
     @Override
     public void startMonitoringTask(MonitoringInfo monitorInfo) {
         EndpointType source = monitorInfo.getSource().getEndpointType();
-        final String sourceInterface = Preconditions.checkNotNull(AlivenessMonitorUtil.getInterfaceName(source),
+        final String sourceInterface = requireNonNull(AlivenessMonitorUtil.getInterfaceName(source),
                 "Source interface is required to send Ipv6 ND Packet for monitoring");
-        final String srcIp = Preconditions.checkNotNull(AlivenessMonitorUtil.getIpAddress(source),
+        final String srcIp = requireNonNull(AlivenessMonitorUtil.getIpAddress(source),
                 "Source IP address is required to send Ipv6 ND Packet for monitoring");
-        final PhysAddress srcMacAddress = Preconditions.checkNotNull(AlivenessMonitorUtil.getMacAddress(source),
+        final PhysAddress srcMacAddress = requireNonNull(AlivenessMonitorUtil.getMacAddress(source),
                 "Source MAC address is required to send Ipv6 ND Packet for monitoring");
 
         EndpointType target = monitorInfo.getDestination().getEndpointType();
-        final String targetIp = Preconditions.checkNotNull(AlivenessMonitorUtil.getIpAddress(target),
+        final String targetIp = requireNonNull(AlivenessMonitorUtil.getIpAddress(target),
                 "Target Ip address is required to send ipv6 ND Packet for monitoring");
         LOG.trace("sendNA interface {}, senderIPAddress {}, targetAddress {}", sourceInterface, srcIp, targetIp);
 

diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/genius/alivenessmonitor/protocols/test/AlivenessMonitorTest.java b/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/genius/alivenessmonitor/protocols/test/AlivenessMonitorTest.java
index 370220da657ee78b65be4ae824236de5ee7b5807..9d22e25f862af7467c283a4e840c75a0bd1783da 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/genius/alivenessmonitor/protocols/test/AlivenessMonitorTest.java
+++ b/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/genius/alivenessmonitor/protocols/test/AlivenessMonitorTest.java
@@ -208,8 +208,8 @@ public class AlivenessMonitorTest {
     public void testMonitorProfileCreate()
             throws InterruptedException, ExecutionException {
         MonitorProfileCreateInput input = new MonitorProfileCreateInputBuilder()
-                .setProfile(new ProfileBuilder().setFailureThreshold(10L)
-                        .setMonitorInterval(10000L).setMonitorWindow(10L)
+                .setProfile(new ProfileBuilder().setFailureThreshold(Uint32.TEN)
+                        .setMonitorInterval(10000L).setMonitorWindow(Uint32.TEN)
                         .setProtocolType(MonitorProtocolType.Arp).build())
                 .build();
         doReturn(FluentFutures.immediateFluentFuture(Optional.empty()))
@@ -227,8 +227,8 @@ public class AlivenessMonitorTest {
     public void testMonitorProfileCreateAlreadyExist()
             throws InterruptedException, ExecutionException {
         MonitorProfileCreateInput input = new MonitorProfileCreateInputBuilder()
-                .setProfile(new ProfileBuilder().setFailureThreshold(10L)
-                        .setMonitorInterval(10000L).setMonitorWindow(10L)
+                .setProfile(new ProfileBuilder().setFailureThreshold(Uint32.TEN)
+                        .setMonitorInterval(10000L).setMonitorWindow(Uint32.TEN)
                         .setProtocolType(MonitorProtocolType.Arp).build())
                 .build();
         doReturn(FluentFutures.immediateFluentFuture(Optional.of(input))).when(readWriteTx).read(
@@ -280,7 +280,7 @@ public class AlivenessMonitorTest {
     public void testMonitorPause()
             throws InterruptedException, ExecutionException {
         MonitorPauseInput input = new MonitorPauseInputBuilder()
-                .setMonitorId(2L).build();
+                .setMonitorId(Uint32.TWO).build();
         Optional<MonitorProfile> optProfile = Optional
                 .of(getTestMonitorProfile());
         when(readTx.read(eq(LogicalDatastoreType.OPERATIONAL),
@@ -292,13 +292,13 @@ public class AlivenessMonitorTest {
                 argThat(isType(MonitoringInfo.class))))
                         .thenReturn(FluentFutures.immediateFluentFuture(optInfo));
         Optional<MonitoringState> optState = Optional
-                .of(new MonitoringStateBuilder()
+                .of(new MonitoringStateBuilder().setMonitorKey("foo")
                         .setStatus(MonitorStatus.Started).build());
         when(readWriteTx.read(eq(LogicalDatastoreType.OPERATIONAL),
                 argThat(isType(MonitoringState.class))))
                         .thenReturn(FluentFutures.immediateFluentFuture(optState));
         Optional<MonitoridKeyEntry> optMap = Optional
-                .of(new MonitoridKeyEntryBuilder().setMonitorId(2L)
+                .of(new MonitoridKeyEntryBuilder().setMonitorId(Uint32.TWO)
                         .setMonitorKey("Test monitor Key").build());
         when(readTx.read(eq(LogicalDatastoreType.OPERATIONAL),
                 argThat(isType(MonitoridKeyEntry.class))))
@@ -313,15 +313,15 @@ public class AlivenessMonitorTest {
     public void testMonitorUnpause()
             throws InterruptedException, ExecutionException {
         MonitorUnpauseInput input = new MonitorUnpauseInputBuilder()
-                .setMonitorId(2L).build();
+                .setMonitorId(Uint32.TWO).build();
         Optional<MonitoringState> optState = Optional
-                .of(new MonitoringStateBuilder().setStatus(MonitorStatus.Paused)
+                .of(new MonitoringStateBuilder().setMonitorKey("foo").setStatus(MonitorStatus.Paused)
                         .build());
         when(readWriteTx.read(eq(LogicalDatastoreType.OPERATIONAL),
                 argThat(isType(MonitoringState.class))))
                         .thenReturn(FluentFutures.immediateFluentFuture(optState));
         Optional<MonitoringInfo> optInfo = Optional.of(
-                new MonitoringInfoBuilder().setId(2L).setProfileId(1L).build());
+                new MonitoringInfoBuilder().setId(Uint32.TWO).setProfileId(Uint32.ONE).build());
         when(readTx.read(eq(LogicalDatastoreType.OPERATIONAL),
                 argThat(isType(MonitoringInfo.class))))
                         .thenReturn(FluentFutures.immediateFluentFuture(optInfo));
@@ -331,7 +331,7 @@ public class AlivenessMonitorTest {
                 argThat(isType(MonitorProfile.class))))
                         .thenReturn(FluentFutures.immediateFluentFuture(optProfile));
         Optional<MonitoridKeyEntry> optMap = Optional
-                .of(new MonitoridKeyEntryBuilder().setMonitorId(2L)
+                .of(new MonitoridKeyEntryBuilder().setMonitorId(Uint32.TWO)
                         .setMonitorKey("Test monitor Key").build());
         when(readTx.read(eq(LogicalDatastoreType.OPERATIONAL),
                 argThat(isType(MonitoridKeyEntry.class))))
@@ -346,18 +346,17 @@ public class AlivenessMonitorTest {
     @Test
     public void testMonitorStop()
             throws InterruptedException, ExecutionException {
-        MonitorStopInput input = new MonitorStopInputBuilder().setMonitorId(2L)
+        MonitorStopInput input = new MonitorStopInputBuilder().setMonitorId(Uint32.TWO)
                 .build();
         Optional<MonitoringInfo> optInfo = Optional
-                .of(new MonitoringInfoBuilder().setSource(new SourceBuilder()
-                        .setEndpointType(
-                                getInterface("testInterface", "10.1.1.1"))
-                        .build()).build());
+                .of(new MonitoringInfoBuilder().setId(Uint32.MAX_VALUE).setSource(new SourceBuilder()
+                        .setEndpointType(getInterface("testInterface", "10.1.1.1"))
+                        .build()).setProfileId(Uint32.ZERO).build());
         FluentFuture<Optional<MonitoringInfo>> outFuture = FluentFutures.immediateFluentFuture(optInfo);
         when(readTx.read(eq(LogicalDatastoreType.OPERATIONAL),
                 argThat(isType(MonitoringInfo.class)))).thenReturn(outFuture);
         Optional<MonitoridKeyEntry> optMap = Optional
-                .of(new MonitoridKeyEntryBuilder().setMonitorId(2L)
+                .of(new MonitoridKeyEntryBuilder().setMonitorId(Uint32.TWO)
                         .setMonitorKey("Test monitor Key").build());
         when(readTx.read(eq(LogicalDatastoreType.OPERATIONAL),
                 argThat(isType(MonitoridKeyEntry.class))))
@@ -383,7 +382,7 @@ public class AlivenessMonitorTest {
     public void testMonitorProfileDelete()
             throws InterruptedException, ExecutionException {
         MonitorProfileDeleteInput input = new MonitorProfileDeleteInputBuilder()
-                .setProfileId(1L).build();
+                .setProfileId(Uint32.ONE).build();
         Optional<MonitorProfile> optProfile = Optional
                 .of(getTestMonitorProfile());
         when(readWriteTx.read(eq(LogicalDatastoreType.OPERATIONAL),
@@ -401,8 +400,8 @@ public class AlivenessMonitorTest {
     private long createProfile()
             throws InterruptedException, ExecutionException {
         MonitorProfileCreateInput input = new MonitorProfileCreateInputBuilder()
-                .setProfile(new ProfileBuilder().setFailureThreshold(10L)
-                        .setMonitorInterval(10000L).setMonitorWindow(10L)
+                .setProfile(new ProfileBuilder().setFailureThreshold(Uint32.TEN)
+                        .setMonitorInterval(10000L).setMonitorWindow(Uint32.TEN)
                         .setProtocolType(MonitorProtocolType.Arp).build())
                 .build();
         doReturn(FluentFutures.immediateFluentFuture(Optional.empty()))
@@ -415,8 +414,8 @@ public class AlivenessMonitorTest {
     }
 
     private MonitorProfile getTestMonitorProfile() {
-        return new MonitorProfileBuilder().setFailureThreshold(10L)
-                .setMonitorInterval(10000L).setMonitorWindow(10L)
+        return new MonitorProfileBuilder().setId(Uint32.MAX_VALUE).setFailureThreshold(Uint32.TEN)
+                .setMonitorInterval(10000L).setMonitorWindow(Uint32.TEN)
                 .setProtocolType(MonitorProtocolType.Arp).build();
     }
 

diff --git a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/AlivenessMonitor.java b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/AlivenessMonitor.java
index 02405b89c116c0c1d5798cd9b0366f0596efa7f8..a5f6e606020a3092b930dc9dfc137a3f5332d695 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/AlivenessMonitor.java
+++ b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/AlivenessMonitor.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.genius.alivenessmonitor.internal;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.genius.alivenessmonitor.utils.AlivenessMonitorUtil.getInterfaceMonitorMapId;
 import static org.opendaylight.genius.alivenessmonitor.utils.AlivenessMonitorUtil.getMonitorMapId;
 import static org.opendaylight.genius.alivenessmonitor.utils.AlivenessMonitorUtil.getMonitorProfileId;
@@ -14,8 +15,6 @@ import static org.opendaylight.genius.alivenessmonitor.utils.AlivenessMonitorUti
 import static org.opendaylight.genius.alivenessmonitor.utils.AlivenessMonitorUtil.getMonitoringInfoId;
 import static org.opendaylight.mdsal.binding.util.Datastore.OPERATIONAL;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -40,6 +39,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -360,7 +360,7 @@ public class AlivenessMonitor extends AbstractClusteredSyncDataTreeChangeListene
             }
         }
 
-        Preconditions.checkNotNull(monitorKey, "Monitor Key required to process the state");
+        requireNonNull(monitorKey, "Monitor Key required to process the state");
 
         LOG.debug("Processing monitorKey: {} for received packet", monitorKey);
 
@@ -1230,7 +1230,7 @@ public class AlivenessMonitor extends AbstractClusteredSyncDataTreeChangeListene
         FluentFuture<? extends CommitInfo> writeResult = readResult.transformAsync(optState -> {
             if (optState.isPresent()) {
                 MonitoringState state = optState.get();
-                if (isValidStatus.apply(state.getStatus())) {
+                if (isValidStatus.test(state.getStatus())) {
                     MonitoringState updatedState = new MonitoringStateBuilder().setMonitorKey(monitorKey)
                                 .setStatus(newStatus).build();
                     tx.merge(LogicalDatastoreType.OPERATIONAL, getMonitorStateId(monitorKey), updatedState);

diff --git a/alivenessmonitor/pom.xml b/alivenessmonitor/pom.xml
index 93070ab77d9336ce1155d248a374c6686c53c6cd..af569a4c184d86e56f8d113535bf970df569935d 100644 (file)
--- a/alivenessmonitor/pom.xml
+++ b/alivenessmonitor/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java b/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java
index 788f69f9cd1287866fb5ba88f5b813a1982f04e9..c074ffc7d595e84eab6c2312df151054c9a449c0 100644 (file)
--- a/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java
+++ b/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java
@@ -9,6 +9,7 @@ package org.opendaylight.genius.arputil.internal;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.mdsal.binding.util.Datastore.OPERATIONAL;
 
 import com.google.common.util.concurrent.FutureCallback;
@@ -240,7 +241,7 @@ public class ArpUtilImpl extends AbstractLifecycle implements OdlArputilService,
                 srcIpBytes = getIpAddressBytes(interfaceAddress.getIpAddress());
 
                 GetPortFromInterfaceOutput portResult = getPortFromInterface(interfaceName);
-                checkNotNull(portResult);
+                requireNonNull(portResult);
                 dpnId = portResult.getDpid();
                 Long portid = portResult.getPortno().toJava();
                 checkArgument(null != dpnId && !Uint64.ZERO.equals(dpnId),
@@ -346,7 +347,7 @@ public class ArpUtilImpl extends AbstractLifecycle implements OdlArputilService,
         try {
             String interfaceName = input.getInterface();
             GetPortFromInterfaceOutput portResult = getPortFromInterface(interfaceName);
-            checkNotNull(portResult);
+            requireNonNull(portResult);
             dpnId = portResult.getDpid();
             Long portid = portResult.getPortno().toJava();
             NodeConnectorRef ref = MDSALUtil.getNodeConnRef(dpnId, portid.toString());

diff --git a/arputil/pom.xml b/arputil/pom.xml
index 69f389d41b2dab8d24d7ce91829a9a2bc3af690a..e241fa4052024234d9bf61670163c9965b0ad3de 100644 (file)
--- a/arputil/pom.xml
+++ b/arputil/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index c065e30cc704339f7925578a49bd251a7c93e92c..615d18a3bd1e206b5b2c8b5a02c9cc172826db48 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/cloudscaler/pom.xml b/cloudscaler/pom.xml
index d8b640ad0e2fa52896d536b0d96e9b4fa9308bab..874d509d505c4f149919dfe56605fe5f9019dad4 100644 (file)
--- a/cloudscaler/pom.xml
+++ b/cloudscaler/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index a2bb8e9c6b56bcb5965ff1e049091a7e831416b0..1a62b7cc65a77b27584403e941ea4dcba33335df 100644 (file)
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.5</version>
+    <version>7.0.0</version>
     <relativePath/>
   </parent>
 
@@ -33,14 +33,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>2.0.4</version>
+        <version>3.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.8.1</version>
+        <version>1.9.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/commons/checkstyle/pom.xml b/commons/checkstyle/pom.xml
index 287cd1acc1832fec891cf2a05fc521a12c58d5de..cee6b32dcfab3592950e5b790601d7484198b228 100644 (file)
--- a/commons/checkstyle/pom.xml
+++ b/commons/checkstyle/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/commons/pom.xml b/commons/pom.xml
index d4da0efa193c2030a8b37bb0cd9cedbb79654bce..c941477d57d676fbd7974c0ac897c69adccaeb31 100644 (file)
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/commons/quality-parent/pom.xml b/commons/quality-parent/pom.xml
index fd8f387c8ddfd5c9505fc1857e906473f507e03e..ed83ec689b1775a8ac4bc980fb5f5b01a51da416 100644 (file)
--- a/commons/quality-parent/pom.xml
+++ b/commons/quality-parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.infrautils</groupId>
     <artifactId>parent</artifactId>
-    <version>1.8.1</version>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 
@@ -22,21 +22,21 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>5.0.6</version>
+        <version>6.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>2.0.4</version>
+        <version>3.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/fcapsapplication/fcapsapplication-impl/src/main/java/org/opendaylight/genius/fcapsapp/FcapsProvider.java b/fcapsapplication/fcapsapplication-impl/src/main/java/org/opendaylight/genius/fcapsapp/FcapsProvider.java
index 0c8d5dc4b8fbe5b29e3d37cae114d5831b016d2e..e546da63524f02336571a6f07b77bce74c3ef615 100644 (file)
--- a/fcapsapplication/fcapsapplication-impl/src/main/java/org/opendaylight/genius/fcapsapp/FcapsProvider.java
+++ b/fcapsapplication/fcapsapplication-impl/src/main/java/org/opendaylight/genius/fcapsapp/FcapsProvider.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.genius.fcapsapp;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
@@ -52,11 +53,10 @@ public class FcapsProvider implements AutoCloseable {
                          @Reference final NotificationService notificationService,
                          final PacketInCounterHandler packetInCounterHandler,
                          final NodeEventListener nodeEventListener) {
-        this.dataBroker = Preconditions.checkNotNull(dataBroker, "DataBroker can not be null!");
+        this.dataBroker = requireNonNull(dataBroker, "DataBroker can not be null!");
         LOG.info("FcapsProvider dataBroker is set");
 
-        this.notificationService = Preconditions.checkNotNull(notificationService,
-                "notificationService can not be null!");
+        this.notificationService = requireNonNull(notificationService, "notificationService can not be null!");
         LOG.info("FcapsProvider notificationProviderService is set");
 
         this.packetInCounterHandler = packetInCounterHandler;

diff --git a/fcapsapplication/fcapsapplication-impl/src/main/java/org/opendaylight/genius/fcapsapp/performancecounter/FlowNodeConnectorInventoryTranslatorImpl.java b/fcapsapplication/fcapsapplication-impl/src/main/java/org/opendaylight/genius/fcapsapp/performancecounter/FlowNodeConnectorInventoryTranslatorImpl.java
index ff9fe85558e4ac4c2a539b8ba4c65e95f1e130db..268718e8daa3a4bdd9af35f216470d3b0856dd87 100644 (file)
--- a/fcapsapplication/fcapsapplication-impl/src/main/java/org/opendaylight/genius/fcapsapp/performancecounter/FlowNodeConnectorInventoryTranslatorImpl.java
+++ b/fcapsapplication/fcapsapplication-impl/src/main/java/org/opendaylight/genius/fcapsapp/performancecounter/FlowNodeConnectorInventoryTranslatorImpl.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.genius.fcapsapp.performancecounter;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Multimap;
@@ -62,7 +63,7 @@ public class FlowNodeConnectorInventoryTranslatorImpl extends NodeConnectorEvent
     public FlowNodeConnectorInventoryTranslatorImpl(@Reference final DataBroker dataBroker,
                                                     final EntityOwnershipUtils entityOwnershipUtils,
                                                     @Reference MetricProvider metricProvider) {
-        Preconditions.checkNotNull(dataBroker, "DataBroker can not be null!");
+        requireNonNull(dataBroker, "DataBroker can not be null!");
         this.entityOwnershipUtils = entityOwnershipUtils;
         packetInCounter =  metricProvider.newCounter(MetricDescriptor.builder().anchor(this)
                 .project("genius").module("fcapsapplication")

diff --git a/fcapsapplication/pom.xml b/fcapsapplication/pom.xml
index 637eb7679532f3e57bb8d67d2eef865594221349..ef17c2228a3b41d6cffac75013bf139d53263cd7 100644 (file)
--- a/fcapsapplication/pom.xml
+++ b/fcapsapplication/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/fcapsmanager/pom.xml b/fcapsmanager/pom.xml
index e51c813d65ae83787e78e8eaee6262ada0d54e49..060a53cdec4fc15b094ff08ba61dd8838bfc1541 100644 (file)
--- a/fcapsmanager/pom.xml
+++ b/fcapsmanager/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/genius-features/pom.xml b/features/genius-features/pom.xml
index 934ce49c9865230a44308f915c7e461f546cbfb2..8836ff694c7eca658d323d6b42ec5514cc6b3e29 100644 (file)
--- a/features/genius-features/pom.xml
+++ b/features/genius-features/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml
index 6b3ac88f00f0f3305f93cf4e3d4c92732c5bee15..a41459249e930968fdc68601b109c77081e531ad 100644 (file)
--- a/features/odl-genius-api/pom.xml
+++ b/features/odl-genius-api/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 
@@ -27,14 +27,14 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.8.1</version>
+        <version>1.9.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/features/odl-genius-api/src/main/feature/feature.xml b/features/odl-genius-api/src/main/feature/feature.xml
index 286cb376965aca61729b0891be56560bb2612f84..01385d8553ff1b26ecd78581845260b76e1d6bbc 100644 (file)
--- a/features/odl-genius-api/src/main/feature/feature.xml
+++ b/features/odl-genius-api/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-genius-api">
     <feature name="odl-genius-api">
-        <feature version="[7,8)">odl-apache-commons-net</feature>
-        <feature version="[6,7)">odl-mdsal-model-rfc7224</feature>
+        <feature version="[8,9)">odl-apache-commons-net</feature>
+        <feature version="[7,8)">odl-mdsal-model-rfc7224</feature>
     </feature>
 </features>

diff --git a/features/odl-genius-fcaps-application/pom.xml b/features/odl-genius-fcaps-application/pom.xml
index 2874a2bb9da5673c24ca5b1a5728a1f4ba3d315b..3dee34ce24f1b68ae8491aad304bc7ede7c3be9a 100644 (file)
--- a/features/odl-genius-fcaps-application/pom.xml
+++ b/features/odl-genius-fcaps-application/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.8.1</version>
+        <version>1.9.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/features/odl-genius-fcaps-framework/pom.xml b/features/odl-genius-fcaps-framework/pom.xml
index e9020faf0494f40f64aa0087a79f631f13bcc41a..beb55cd064300a5deb110f192903778679612bf2 100644 (file)
--- a/features/odl-genius-fcaps-framework/pom.xml
+++ b/features/odl-genius-fcaps-framework/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.8.1</version>
+        <version>1.9.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/odl-genius-rest/pom.xml b/features/odl-genius-rest/pom.xml
index ae75b2357d2b897ad76cb7044d7bbe0e4caa2710..dc5d6ee1041b142c79f4e50ec32ee99a5112994c 100644 (file)
--- a/features/odl-genius-rest/pom.xml
+++ b/features/odl-genius-rest/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-genius/pom.xml b/features/odl-genius/pom.xml
index cd882b35a19330567d234db8748c4bf6d1659ba8..92fa67b61c37478cbf63e74bc45a576bbb3a7d3b 100644 (file)
--- a/features/odl-genius/pom.xml
+++ b/features/odl-genius/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.8.1</version>
+        <version>1.9.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/pom.xml b/features/pom.xml
index 4932c697ed5059f1bf6633a257ac21a3753c5505..39cb6b29c29d1cb73b20e9291bd65407dad22253 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/idmanager/pom.xml b/idmanager/pom.xml
index 7c1f0328c490b0a76beaf1f467956060b6e73462..77658f9526072e4bd8c4133a977b3def6507fc33 100644 (file)
--- a/idmanager/pom.xml
+++ b/idmanager/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/FrmNodeAndTablesBuilder.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/FrmNodeAndTablesBuilder.java
index 2c5cd72e9b9e93091a0fd9cd1bb6b41665417cfa..8dd22ae0db0a51f8bae1c6888ed9a1602b9ebfba 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/FrmNodeAndTablesBuilder.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/FrmNodeAndTablesBuilder.java
@@ -5,12 +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.genius.interfacemanager;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.mdsal.binding.util.Datastore.CONFIGURATION;
 
-import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.concurrent.ExecutionException;
@@ -66,8 +65,7 @@ public class FrmNodeAndTablesBuilder implements ReconciliationNotificationListen
                                    ReconciliationManager reconciliationManager) {
         this.dataBroker = dataBroker;
         this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
-        reconciliationManager = Preconditions.checkNotNull(reconciliationManager,
-                "ReconciliationManager cannot be null!");
+        reconciliationManager = requireNonNull(reconciliationManager, "ReconciliationManager cannot be null!");
         reconciliationManager.registerService(this);
         LOGGER.info("FrmNodeAndTablesBuilder has started successfully.");
     }

diff --git a/interfacemanager/pom.xml b/interfacemanager/pom.xml
index 9dfa13ae70af44afb986fe356736e770af43c52c..d2f7ab9393ccf233b5d6f189a27e2443d78dd47d 100644 (file)
--- a/interfacemanager/pom.xml
+++ b/interfacemanager/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/ipv6util/api/src/main/java/org/opendaylight/genius/ipv6util/api/Ipv6Util.java b/ipv6util/api/src/main/java/org/opendaylight/genius/ipv6util/api/Ipv6Util.java
index a314b5c9d8a067e9d8cb15b3ecd712988db7269d..09c98d5ee00f598434fa3633556dec72b4ca5708 100644 (file)
--- a/ipv6util/api/src/main/java/org/opendaylight/genius/ipv6util/api/Ipv6Util.java
+++ b/ipv6util/api/src/main/java/org/opendaylight/genius/ipv6util/api/Ipv6Util.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.genius.ipv6util.api;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -256,7 +256,7 @@ public final class Ipv6Util {
      * @return the formatted IP address
      */
     public static String getFormattedIpAddress(IpAddress ipAddress) {
-        Preconditions.checkNotNull(ipAddress, "ipAddress is null");
+        requireNonNull(ipAddress, "ipAddress is null");
         if (ipAddress.getIpv4Address() != null) {
             // No formatting required for IPv4 address.
             return ipAddress.getIpv4Address().getValue();

diff --git a/ipv6util/impl/src/main/java/org/opendaylight/genius/ipv6util/nd/Ipv6NdUtilServiceImpl.java b/ipv6util/impl/src/main/java/org/opendaylight/genius/ipv6util/nd/Ipv6NdUtilServiceImpl.java
index 0f6f43f371154c5d924615fed9aa82476a7e7d8e..4032f9b65abe02554b5a8957c9b6a3af5fd775f8 100644 (file)
--- a/ipv6util/impl/src/main/java/org/opendaylight/genius/ipv6util/nd/Ipv6NdUtilServiceImpl.java
+++ b/ipv6util/impl/src/main/java/org/opendaylight/genius/ipv6util/nd/Ipv6NdUtilServiceImpl.java
@@ -9,6 +9,7 @@ package org.opendaylight.genius.ipv6util.nd;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.concurrent.ExecutionException;
@@ -73,7 +74,7 @@ public class Ipv6NdUtilServiceImpl implements Ipv6NdUtilService {
                 srcIpv6Address = interfaceAddress.getSrcIpAddress();
 
                 GetPortFromInterfaceOutput portResult = getPortFromInterface(interfaceName);
-                checkNotNull(portResult);
+                requireNonNull(portResult);
                 dpnId = portResult.getDpid();
                 Long portid = portResult.getPortno().toJava();
                 checkArgument(null != dpnId && Uint64.ZERO != dpnId, DPN_NOT_FOUND_ERROR, interfaceName);

diff --git a/ipv6util/pom.xml b/ipv6util/pom.xml
index 043e50672186d9e7ef5bed458f33463bcd822f08..c91b8d290ae5ba50e09bfd62fe3ccde593225614 100644 (file)
--- a/ipv6util/pom.xml
+++ b/ipv6util/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java
index 90b916fe41f79f0a04709ac8d6a03eb09973d141..d2f901ccd17e86bbc503febdf000aee77b632d51 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java
@@ -11,7 +11,6 @@ import static org.opendaylight.mdsal.binding.util.Datastore.CONFIGURATION;
 import static org.opendaylight.serviceutils.tools.rpc.FutureRpcResults.fromListenableFuture;
 import static org.opendaylight.yangtools.yang.common.RpcResultBuilder.failed;
 
-import com.google.common.base.Objects;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -1139,7 +1138,7 @@ public class ItmManagerRpcService implements ItmRpcService {
         long retVal;
 
         if (!dcGatewayIpList.isEmpty()
-                && dcGatewayIpList.values().stream().anyMatch(gwIp -> Objects.equal(gwIp.getIpAddress(), dcgwIpAddr))) {
+                && dcGatewayIpList.values().stream().anyMatch(gwIp -> dcgwIpAddr.equals(gwIp.getIpAddress()))) {
             //Match found
             retVal = 1;
             IsDcgwPresentOutputBuilder output = new IsDcgwPresentOutputBuilder().setRetVal(retVal);

diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java
index 70c53226c019f7c2ece99a3b4af86c825a526f6c..10394183b1a1ef50d8cec04044bda126a6ebb8e2 100644 (file)
--- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java
+++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java
@@ -207,7 +207,7 @@ public class TepCommandHelperTest {
                 .setNodeId(sourceDevice).setTopologyId(destinationDevice).build();
         vteps = new VtepsBuilder().setDpnId(dpId2)
                 .setIpAddress(ipAddress1).withKey(new VtepsKey(dpId2)).build();
-        vtepsTest = new VtepsBuilder().build();
+        vtepsTest = new VtepsBuilder().setDpnId(Uint64.TEN).build();
         deviceVtepsList.add(deviceVteps);
         vtepsList.add(vteps);
         transportZone = new TransportZoneBuilder().setZoneName(transportZone1).setTunnelType(tunnelType1).withKey(new
@@ -243,7 +243,7 @@ public class TepCommandHelperTest {
                 .setOperState(TunnelOperStatus.Up).build();
         stateTunnelList.add(stateTunnelListTest);
         lowerLayerIfList.add(dpId1.toString());
-        interfaceTest = new InterfaceBuilder().setOperStatus(Interface.OperStatus.Up)
+        interfaceTest = new InterfaceBuilder().setName("foo").setOperStatus(Interface.OperStatus.Up)
                 .setAdminStatus(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508
                         .interfaces.state.Interface.AdminStatus.Up)
                 .setPhysAddress(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715

diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelDeleteTest.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelDeleteTest.java
index ada0f2ef09b21caadfbeaa40f913d86bfd817194..4ac6d586f4211e4bf6110812993e2d051e7d0b23 100644 (file)
--- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelDeleteTest.java
+++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelDeleteTest.java
@@ -100,17 +100,21 @@ public class ItmInternalTunnelDeleteTest {
     List<DPNTEPsInfo> cfgdDpnListVxlan = new ArrayList<>() ;
     List<TunnelEndPoints> tunnelEndPointsListVxlan = new ArrayList<>();
     List<TunnelEndPoints> tunnelEndPointsListVxlanNew = new ArrayList<>();
-    java.lang.Class<? extends TunnelTypeBase> tunnelType1 = TunnelTypeVxlan.class;
+    Class<? extends TunnelTypeBase> tunnelType1 = TunnelTypeVxlan.class;
     TunnelMonitorParams tunnelMonitorParams = null;
     TunnelMonitorInterval tunnelMonitorInterval = null;
-    InternalTunnel internalTunnel = new InternalTunnelBuilder().build();
+    InternalTunnel internalTunnel = new InternalTunnelBuilder()
+            .setDestinationDPN(Uint64.ONE)
+            .setSourceDPN(Uint64.TWO)
+            .setTransportType(tunnelType1)
+            .build();
     InstanceIdentifier<TunnelMonitorParams> tunnelMonitorParamsInstanceIdentifier =
             InstanceIdentifier.create(TunnelMonitorParams.class);
     InstanceIdentifier<TunnelMonitorInterval> tunnelMonitorIntervalIdentifier =
             InstanceIdentifier.create(TunnelMonitorInterval.class);
     Class<? extends TunnelMonitoringTypeBase> monitorProtocol = TunnelMonitoringTypeBfd.class;
     InstanceIdentifier<InternalTunnel> internalTunnelIdentifier = InstanceIdentifier.builder(TunnelList.class)
-            .child(InternalTunnel.class, new InternalTunnelKey(Uint64.ONE, Uint64.valueOf(2), tunnelType1))
+            .child(InternalTunnel.class, new InternalTunnelKey(Uint64.ONE, Uint64.TWO, tunnelType1))
             .build();
 
     @Mock DataBroker dataBroker;

diff --git a/itm/pom.xml b/itm/pom.xml
index cc0773e49f247f0e4c7d5d996176b1a14fb0ef58..a74c6cdc92a60416827ba2d4ee82f3f7bc87b63a 100644 (file)
--- a/itm/pom.xml
+++ b/itm/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 0944dccf0d997549771840c26b6f99381d3eae28..bb15082312ce33ccdba5985eef37c4c720679ae3 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/genius/lockmanager/tests/LockManagerTest.java b/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/genius/lockmanager/tests/LockManagerTest.java
index 7b386f044f91f3970e87e7e6dd6f66ea30de28ea..72964889366ecaf814f913b7808b29ac64565628 100644 (file)
--- a/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/genius/lockmanager/tests/LockManagerTest.java
+++ b/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/genius/lockmanager/tests/LockManagerTest.java
@@ -133,7 +133,7 @@ public class LockManagerTest extends AbstractConcurrentDataBrokerTest {
     @Test
     public void testEternalTransactionCommitFailedExceptionOnLock()
             throws InterruptedException, ExecutionException, TimeoutException {
-        logCaptureRule.expectError("RPC lock() failed; input = LockInput{_lockName=testLock, augmentation=[]}");
+        logCaptureRule.expectError("RPC lock() failed; input = LockInput{lockName=testLock, augmentation=[]}");
         dbFailureSimulator.failSubmits(new TransactionCommitFailedException("bada boum bam!"));
         LockInput lockInput = new LockInputBuilder().setLockName("testLock").build();
         assertRpcErrorCause(lockManager.lock(lockInput), TransactionCommitFailedException.class, "bada boum bam!");

diff --git a/lockmanager/pom.xml b/lockmanager/pom.xml
index 026a75374875d82cbfbc9452fb628fab9cec1b99..e5ee33e18e18492342167f8e74f665181fa9e461 100644 (file)
--- a/lockmanager/pom.xml
+++ b/lockmanager/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunner.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunner.java
index 5c3487d988e695cc949daf7ea8fd5b720b9c7698..c5b73de9f2832f14f842892862a36252565481d0 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunner.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunner.java
@@ -14,7 +14,7 @@ import edu.umd.cs.findbugs.annotations.CheckReturnValue;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Future;
 import java.util.function.Function;
-import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
 import org.opendaylight.infrautils.utils.function.CheckedConsumer;
 import org.opendaylight.infrautils.utils.function.InterruptibleCheckedConsumer;
 import org.opendaylight.infrautils.utils.function.InterruptibleCheckedFunction;
@@ -52,9 +52,8 @@ public interface ManagedNewTransactionRunner extends ManagedTransactionFactory {
      * or pending;
      * calling code therefore <b>must</b> handle the returned future, e.g. by passing it onwards (return),
      * or by itself adding callback listeners to it using {@link Futures}' methods, or by transforming it into a
-     * {@link CompletionStage} using {@link ListenableFutures#toCompletionStage(ListenableFuture)} and chaining on
-     * that, or at the very least simply by using
-     * {@link ListenableFutures#addErrorLogging(ListenableFuture, org.slf4j.Logger, String)}
+     * {@link CompletionStage} and chaining on that, or at the very least simply by using
+     * {@link LoggingFutures#addErrorLogging(ListenableFuture, org.slf4j.Logger, String)}
      * (but better NOT by using the blocking {@link Future#get()} on it).
      *
      * @param txConsumer the {@link CheckedConsumer} that needs a new write only transaction
@@ -83,9 +82,8 @@ public interface ManagedNewTransactionRunner extends ManagedTransactionFactory {
      * or pending;
      * calling code therefore <b>must</b> handle the returned future, e.g. by passing it onwards (return),
      * or by itself adding callback listeners to it using {@link Futures}' methods, or by transforming it into a
-     * {@link CompletionStage} using {@link ListenableFutures#toCompletionStage(ListenableFuture)} and chaining on
-     * that, or at the very least simply by using
-     * {@link ListenableFutures#addErrorLogging(ListenableFuture, org.slf4j.Logger, String)}
+     * {@link CompletionStage} and chaining on that, or at the very least simply by using
+     * {@link LoggingFutures#addErrorLogging(ListenableFuture, org.slf4j.Logger, String)}
      * (but better NOT by using the blocking {@link Future#get()} on it).
      *
      * @param txConsumer the {@link CheckedConsumer} that needs a new read-write transaction

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactory.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactory.java
index 1cf72c58f2043a22d4b49b40eed2b4368c88f272..82322b6ebe056f2e8eb4d427b314723b47960328 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactory.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactory.java
@@ -13,7 +13,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import edu.umd.cs.findbugs.annotations.CheckReturnValue;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Future;
-import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
 import org.opendaylight.infrautils.utils.function.InterruptibleCheckedConsumer;
 import org.opendaylight.infrautils.utils.function.InterruptibleCheckedFunction;
 import org.opendaylight.mdsal.binding.api.DataBroker;
@@ -72,9 +72,8 @@ public interface ManagedTransactionFactory {
      * or pending;
      * calling code therefore <b>must</b> handle the returned future, e.g. by passing it onwards (return),
      * or by itself adding callback listeners to it using {@link Futures}' methods, or by transforming it into a
-     * {@link CompletionStage} using {@link ListenableFutures#toCompletionStage(ListenableFuture)} and chaining on
-     * that, or at the very least simply by using
-     * {@link ListenableFutures#addErrorLogging(ListenableFuture, org.slf4j.Logger, String)}
+     * {@link CompletionStage} and chaining on that, or at the very least simply by using
+     * {@link LoggingFutures#addErrorLogging(ListenableFuture, org.slf4j.Logger, String)}
      * (but better NOT by using the blocking {@link Future#get()} on it).
      *
      * @param datastoreType the {@link Datastore} type that will be accessed
@@ -131,9 +130,8 @@ public interface ManagedTransactionFactory {
      * or pending;
      * calling code therefore <b>must</b> handle the returned future, e.g. by passing it onwards (return),
      * or by itself adding callback listeners to it using {@link Futures}' methods, or by transforming it into a
-     * {@link CompletionStage} using {@link ListenableFutures#toCompletionStage(ListenableFuture)} and chaining on
-     * that, or at the very least simply by using
-     * {@link ListenableFutures#addErrorLogging(ListenableFuture, org.slf4j.Logger, String)}
+     * {@link CompletionStage} and chaining on that, or at the very least simply by using
+     * {@link LoggingFutures#addErrorLogging(ListenableFuture, org.slf4j.Logger, String)}
      * (but better NOT by using the blocking {@link Future#get()} on it).
      *
      * @param datastoreType the {@link Datastore} type that will be accessed
@@ -166,9 +164,8 @@ public interface ManagedTransactionFactory {
      * or pending;
      * calling code therefore <b>must</b> handle the returned future, e.g. by passing it onwards (return),
      * or by itself adding callback listeners to it using {@link Futures}' methods, or by transforming it into a
-     * {@link CompletionStage} using {@link ListenableFutures#toCompletionStage(ListenableFuture)} and chaining on
-     * that, or at the very least simply by using
-     * {@link ListenableFutures#addErrorLogging(ListenableFuture, org.slf4j.Logger, String)}
+     * {@link CompletionStage} using and chaining on that, or at the very least simply by using
+     * {@link LoggingFutures#addErrorLogging(ListenableFuture, org.slf4j.Logger, String)}
      * (but better NOT by using the blocking {@link Future#get()} on it).
      *
      * @param datastoreType the {@link Datastore} type that will be accessed

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java
index 962ffed1f29671a8a2d0ce4bb2c0b5b77c65fb8a..8d6b3570aec320a662032b6fbeaf0852a8126414 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.genius.utils.batching;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -110,8 +111,8 @@ public class ResourceBatchingManager implements AutoCloseable {
 
     public void registerBatchableResource(final String resourceType,
             final BlockingQueue<ActionableResource<?>> resQueue, final ResourceHandler resHandler) {
-        Preconditions.checkNotNull(resQueue, "ResourceQueue to use for batching cannot not be null.");
-        Preconditions.checkNotNull(resHandler, "ResourceHandler cannot not be null.");
+        requireNonNull(resQueue, "ResourceQueue to use for batching cannot not be null.");
+        requireNonNull(resHandler, "ResourceHandler cannot not be null.");
 
         resourceHandlerMapper.put(resourceType, new ImmutablePair<>(resQueue, resHandler));
         ScheduledExecutorService resDelegatorService =

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/hwvtep/HwvtepSouthboundUtils.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/hwvtep/HwvtepSouthboundUtils.java
index efbd5e78b95f56b50055faa261a7f78f74601295..7348be6324376a1c4abe98ce1419f2e20256c2bb 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/hwvtep/HwvtepSouthboundUtils.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/hwvtep/HwvtepSouthboundUtils.java
@@ -5,12 +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.genius.utils.hwvtep;
 
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableBiMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -323,7 +321,7 @@ public final class HwvtepSouthboundUtils {
     }
 
     public static Class<? extends EncapsulationTypeBase> createEncapsulationType(String type) {
-        Preconditions.checkNotNull(type);
+        requireNonNull(type);
         if (type.isEmpty()) {
             return EncapsulationTypeVxlanOverIpv4.class;
         } else {

diff --git a/mdsalutil/pom.xml b/mdsalutil/pom.xml
index ce307c454f07c6775bab005caeea6de35558ec72..389c10f90672f39a7f40a2ca0389e84b7b15420c 100644 (file)
--- a/mdsalutil/pom.xml
+++ b/mdsalutil/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/networkutils/pom.xml b/networkutils/pom.xml
index 01391aa81ca0122a83df004866535df9f91ed2c7..ee6f9791230a2602cfef4aac4d9d9fb83a8615da 100644 (file)
--- a/networkutils/pom.xml
+++ b/networkutils/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 61022b8e0427fb425a53e0d9027118ef3b1335e4..e4f1a58ce6069badd12488ed26d0c935cf224467 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>