Merge "Use FluentFuture in DOMDataTransactionValidator"

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 705d846e4a56a34d4c39e3745055ab9b89f030bb..9505858c6d04bdbedc048967cf8dd7d88273b06a 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -37,9 +37,9 @@
     </modules>
 
     <scm>
-        <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</developerConnection>
         <tag>HEAD</tag>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary</url>
+        <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=summary</url>
     </scm>
 </project>

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 85e2f0a4a161524beec7ac90896d6eabbfea808f..ee73498c826a011cb66a1d3708ea943e9024ce45 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -45,9 +45,9 @@
   </modules>
 
   <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <connection>scm:git:https://git.opendaylight.org/gerrit/netconf</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf</developerConnection>
     <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+    <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=tree</url>
   </scm>
 </project>

diff --git a/features/protocol-framework/pom.xml b/features/protocol-framework/pom.xml
index 8073e1d9db48a205ee9e7b43d0548e01f1f7c032..c3589ad82f3e511f34f424b569125d04f00e5b83 100644 (file)
--- a/features/protocol-framework/pom.xml
+++ b/features/protocol-framework/pom.xml
@@ -31,9 +31,9 @@
     </modules>
 
     <scm>
-        <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</developerConnection>
         <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+        <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=summary</url>
     </scm>
 </project>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 3f615c756a1b1152a57198152a32cfcc47dda09f..2c2fd738d631ac56c7ae547a0c0d4fdb93da3c97 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -38,9 +38,9 @@
     </modules>
 
     <scm>
-        <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+        <connection>scm:git:https://git.opendaylight.org/gerrit/netconf</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf</developerConnection>
         <tag>HEAD</tag>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary</url>
+        <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=tree</url>
     </scm>
 </project>

diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
index 308e737fb05abe212596fdc534a985a88e01601e..c48c9e33cde335dd32f50e8e9cdfe228e285f0ac 100644 (file)
--- a/features/yanglib/pom.xml
+++ b/features/yanglib/pom.xml
@@ -31,9 +31,9 @@
     </modules>
 
     <scm>
-        <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</developerConnection>
         <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+        <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=summary</url>
     </scm>
 </project>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 735a91a9713249298615910d289969211fb10c89..80d829c1fdeec4b59c6b81221756f05650cb8ca2 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -83,6 +83,7 @@
       </plugin>
     </plugins>
   </build>
+
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</developerConnection>

diff --git a/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java b/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java
index cdb0462d8f95ef0a0acd704ba87d12ac680acb75..ae4ccc86490d996cd723102af98b35dbc3d83be1 100644 (file)
--- a/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java
+++ b/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java
@@ -79,7 +79,7 @@ public class ContextKeyTest {
         // expect
         assertTrue(instance1.equals(instance1));
         assertFalse(instance1.equals(null));
-        assertFalse(instance1.equals(new Long(123456)));
+        assertFalse(instance1.equals(123456L));
         assertFalse(instance1.equals(instance2));
         assertFalse(instance1.equals(instance3));
         assertFalse(instance1.equals(instance4));

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java
index 2dbc49fe83ddee6ada9035a4ff10b70cf514d43d..5db8a6c811d247c34d78d751e822cabeda1b9f58 100644 (file)
--- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java
+++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java
@@ -82,7 +82,7 @@ public class NetconfHelloMessageAdditionalHeader {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("NetconfHelloMessageAdditionalHeader{");
+        final StringBuilder sb = new StringBuilder("NetconfHelloMessageAdditionalHeader{");
         sb.append("userName='").append(userName).append('\'');
         sb.append(", hostAddress='").append(hostAddress).append('\'');
         sb.append(", port='").append(port).append('\'');

diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java
index 7f25c250314e6b3583341d826e17279d873b7f68..094b570700880263300ed45e69cf5f191713ebd9 100644 (file)
--- a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java
+++ b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java
@@ -87,7 +87,7 @@ public class TestingNetconfClient implements Closeable {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("TestingNetconfClient{");
+        final StringBuilder sb = new StringBuilder("TestingNetconfClient{");
         sb.append("label=").append(label);
         sb.append(", sessionId=").append(sessionId);
         sb.append('}');

diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java
index 29fe99fcb043dee6d76cf3073b1e7be60d6372c2..e74a9a10386c2c72be55737cff66d6c7f41647e6 100644 (file)
--- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java
+++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java
@@ -105,7 +105,7 @@ public abstract class AbstractNetconfSession<S extends NetconfSession,L extends
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer(getClass().getSimpleName() + "{");
+        final StringBuilder sb = new StringBuilder(getClass().getSimpleName() + "{");
         sb.append("sessionId=").append(sessionId);
         sb.append(", channel=").append(channel);
         sb.append('}');

diff --git a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java
index cc4c57c07b2bc1a81d2f727dfc6a8877a46df001..967bd08914e17734628387badc80fe921e770be9 100644 (file)
--- a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java
+++ b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java
@@ -47,7 +47,7 @@ public class Activator implements BundleActivator {
         final Dictionary<String, String> props = new Hashtable<>();
         props.put(NetconfConstants.SERVICE_NAME, NetconfConstants.NETCONF_NOTIFICATION);
         netconfNotificationCollectorServiceRegistration = context.registerService(NetconfNotificationCollector.class,
-                netconfNotificationManager, new Hashtable<String, Object>());
+                netconfNotificationManager, new Hashtable<>());
 
         final NetconfOperationServiceFactory netconfOperationServiceFactory = new NetconfOperationServiceFactory() {
 

diff --git a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java b/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java
index b465e381f2be3d862a59ba9dd1ce6353065205a0..9f471c4d562ccfc9488338cb6e7dd8de6cb83998 100644 (file)
--- a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java
+++ b/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java
@@ -69,12 +69,7 @@ public class ProxyServer implements Runnable {
     }
 
     public static void main(String[] args) {
-        ProxyHandlerFactory proxyHandlerFactory = new ProxyHandlerFactory() {
-            @Override
-            public ChannelHandler create(EventLoopGroup bossGroup, LocalAddress localAddress) {
-                return new ProxyServerHandler(bossGroup, localAddress);
-            }
-        };
+        ProxyHandlerFactory proxyHandlerFactory = ProxyServerHandler::new;
         start(proxyHandlerFactory);
     }
 

diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
index 301cd4c7b4fedd2311ee3981633a9f1357820631..94e8f4b2f70cecc9127c64c47b542c3adf14c3c3 100644 (file)
--- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
+++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
@@ -659,9 +659,8 @@ public class MountPointEndToEndTest {
     }
 
     private DOMMountPoint awaitMountPoint(final DOMMountPointService mountPointService) {
-        await().atMost(5, TimeUnit.SECONDS).until(() -> {
-            return mountPointService.getMountPoint(yangNodeInstanceId).isPresent();
-        });
+        await().atMost(5, TimeUnit.SECONDS).until(() ->
+                mountPointService.getMountPoint(yangNodeInstanceId).isPresent());
 
         return mountPointService.getMountPoint(yangNodeInstanceId).get();
     }

diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java
index fb6a8ed26e522a07e3993ac965d09e64e5305c94..a9ab6994d76b6e94e87b049beda395d8cfa7f769 100644 (file)
--- a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java
+++ b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java
@@ -129,7 +129,7 @@ public abstract class AbstractNetconfOperation implements NetconfOperation {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer(getClass().getName());
+        final StringBuilder sb = new StringBuilder(getClass().getName());
         try {
             sb.append("{name=").append(getOperationName());
         } catch (UnsupportedOperationException e) {

diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/CloseableUtilTest.java b/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/CloseableUtilTest.java
index 907b2b45058c8dd0352e22d5251ee265dda7e3e7..43754e9ec69653e6f4d37c5d4dd5587e0731af97 100644 (file)
--- a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/CloseableUtilTest.java
+++ b/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/CloseableUtilTest.java
@@ -21,11 +21,8 @@ public class CloseableUtilTest {
     @SuppressWarnings("checkstyle:IllegalCatch")
     @Test
     public void testCloseAllFail() throws Exception {
-        final AutoCloseable failingCloseable = new AutoCloseable() {
-            @Override
-            public void close() throws Exception {
-                throw new RuntimeException("testing failing close");
-            }
+        final AutoCloseable failingCloseable = () -> {
+            throw new RuntimeException("testing failing close");
         };
 
         try {

diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml
index 0d0c13d1acbeab46bc811a7e0c475ff80dd7ca3f..607be6814fc3f5ad7ab3d20d69c3753a9c601e96 100644 (file)
--- a/netconf/sal-netconf-connector/pom.xml
+++ b/netconf/sal-netconf-connector/pom.xml
@@ -154,9 +154,9 @@
   </dependencies>
 
   <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</developerConnection>
     <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+    <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=summary</url>
   </scm>
 </project>

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
index d5383afda7921ce54cc5ec6913f85570b5ba0531..dcff0f294b65791c5394fac8d13ead94913c8b02 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
@@ -20,7 +20,6 @@ import com.google.common.collect.Maps;
 import java.net.URI;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import org.opendaylight.netconf.client.NetconfClientSession;
@@ -86,9 +85,8 @@ public final class NetconfSessionPreferences {
 
     // allows partial matches - assuming parameters are in the same order
     public boolean containsPartialNonModuleCapability(final String capability) {
-        final Iterator<String> iterator = getNonModuleCaps().iterator();
-        while (iterator.hasNext()) {
-            if (iterator.next().startsWith(capability)) {
+        for (final String nonModuleCap : getNonModuleCaps()) {
+            if (nonModuleCap.startsWith(capability)) {
                 LOG.trace("capability {} partially matches {}", capability, nonModuleCaps);
                 return true;
             }

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java
index 627bf226fd30449b6fe504f4205ba21b39fc1a97..ad587eac879c621836d09ae74ad10e54a82f987d 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java
@@ -51,7 +51,7 @@ public class UserPreferences {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("UserPreferences{");
+        final StringBuilder sb = new StringBuilder("UserPreferences{");
         sb.append("sessionPreferences=").append(sessionPreferences);
         sb.append(", overrideModuleCapabilities=").append(overrideModuleCapabilities);
         sb.append(", overrideNonModuleCapabilities=").append(overrideNonModuleCapabilities);

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java
index 76fb631a0937e6db7ff1d35b5520d8d85136bc45..59ce05edca3198cfe39b067dbe202e36cc4ac796 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java
@@ -305,15 +305,13 @@ public final class KeepaliveSalFacade implements RemoteDeviceHandler<NetconfSess
         @Override
         public @NonNull FluentFuture<DOMRpcResult> invokeRpc(@Nonnull final SchemaPath type,
                                                                       final NormalizedNode<?, ?> input) {
-            final FluentFuture<DOMRpcResult> domRpcResultDOMRpcExceptionCheckedFuture =
-                    deviceRpc.invokeRpc(type, input);
-            Futures.addCallback(domRpcResultDOMRpcExceptionCheckedFuture, resetKeepaliveTask,
-                                MoreExecutors.directExecutor());
+            final FluentFuture<DOMRpcResult> rpcResultFuture = deviceRpc.invokeRpc(type, input);
+            Futures.addCallback(rpcResultFuture, resetKeepaliveTask, MoreExecutors.directExecutor());
 
-            final RequestTimeoutTask timeoutTask = new RequestTimeoutTask(domRpcResultDOMRpcExceptionCheckedFuture);
+            final RequestTimeoutTask timeoutTask = new RequestTimeoutTask(rpcResultFuture);
             executor.schedule(timeoutTask, defaultRequestTimeoutMillis, TimeUnit.MILLISECONDS);
 
-            return domRpcResultDOMRpcExceptionCheckedFuture;
+            return rpcResultFuture;
         }
 
         @Override

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
index 9e2d9c419325d0f123f7885cecae8a54551b7886..6d02ba259a94585aa3c4fdedcfc763ce522f8967 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
@@ -128,9 +128,9 @@ public final class StressClient {
         final List<List<NetconfMessage>> allPreparedMessages = new ArrayList<>(threadAmount);
         for (int i = 0; i < threadAmount; i++) {
             if (i != threadAmount - 1) {
-                allPreparedMessages.add(new ArrayList<NetconfMessage>(requestsPerThread));
+                allPreparedMessages.add(new ArrayList<>(requestsPerThread));
             } else {
-                allPreparedMessages.add(new ArrayList<NetconfMessage>(requestsPerThread + leftoverRequests));
+                allPreparedMessages.add(new ArrayList<>(requestsPerThread + leftoverRequests));
             }
         }
 

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
index fc7e99a31d3cf0b72cb56b05e872a3b20f79b882..8d62d3ada118fcc6e5ddfcc359911166fd7f1a68 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
@@ -138,7 +138,7 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im
 
         @Override
         public String toString() {
-            final StringBuffer sb = new StringBuffer("Notifications{");
+            final StringBuilder sb = new StringBuilder("Notifications{");
             sb.append("notificationList=").append(notificationList);
             sb.append('}');
             return sb.toString();
@@ -170,7 +170,7 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im
 
         @Override
         public String toString() {
-            final StringBuffer sb = new StringBuffer("Notification{");
+            final StringBuilder sb = new StringBuilder("Notification{");
             sb.append("delayInSeconds=").append(delayInSeconds);
             sb.append(", times=").append(times);
             sb.append(", content='").append(content).append('\'');

diff --git a/protocol-framework/pom.xml b/protocol-framework/pom.xml
index 891c42cfabd65853b78a44279ccfcf11945bebf6..7127bbe225f4fcf6bf02c8f8cee8a59971728add 100644 (file)
--- a/protocol-framework/pom.xml
+++ b/protocol-framework/pom.xml
@@ -84,9 +84,9 @@
   </build>
 
   <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</developerConnection>
     <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+    <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=summary</url>
   </scm>
 </project>

diff --git a/restconf/restconf-nb-bierman02/pom.xml b/restconf/restconf-nb-bierman02/pom.xml
index 99b7df558bd5058c4d3d0e83e9fb983ef1f17ef3..6e873be7ac5aa0dd5b99cf326f358cea712bad62 100644 (file)
--- a/restconf/restconf-nb-bierman02/pom.xml
+++ b/restconf/restconf-nb-bierman02/pom.xml
@@ -218,10 +218,11 @@
       </plugin>
     </plugins>
   </build>
+
   <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</developerConnection>
     <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+    <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=summary</url>
   </scm>
 </project>

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java
index 7db0081ca57c0e0b132b36559daf2e0408a5141a..df9b4f03b6bbea2de251268bd83293b72bb8018e 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java
@@ -92,9 +92,7 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter<Normalized
             if (context.getWriterParameters().isPrettyPrint()) {
                 xmlWriter = new IndentingXMLStreamWriter(xmlWriter);
             }
-        } catch (final XMLStreamException e) {
-            throw new IllegalStateException(e);
-        } catch (final FactoryConfigurationError e) {
+        } catch (final XMLStreamException | FactoryConfigurationError e) {
             throw new IllegalStateException(e);
         }
         final NormalizedNode<?, ?> data = context.getData();

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java
index 13ceb2e63ca2e95f2a4813dc00a7c52dbb567cce..a8ce65f18d74ef9f83b8a2dd4305ce6fbd4144a1 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java
@@ -62,9 +62,7 @@ public class PatchXmlBodyWriter implements MessageBodyWriter<PatchStatusContext>
             final XMLStreamWriter xmlWriter =
                     XML_FACTORY.createXMLStreamWriter(entityStream, StandardCharsets.UTF_8.name());
             writeDocument(xmlWriter, patchStatusContext);
-        } catch (final XMLStreamException e) {
-            throw new IllegalStateException(e);
-        } catch (final FactoryConfigurationError e) {
+        } catch (final XMLStreamException | FactoryConfigurationError e) {
             throw new IllegalStateException(e);
         }
     }

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java
index 62c656c56990316a553c28aada64351a7baab2df..6f9616163431b22deb947d80bfad6a6fa925e5c4 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java
@@ -19,7 +19,6 @@ import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
@@ -295,9 +294,7 @@ public class RestconfDocumentedExceptionMapper implements ExceptionMapper<Restco
         final XMLStreamWriter xmlWriter;
         try {
             xmlWriter = XML_FACTORY.createXMLStreamWriter(outStream, StandardCharsets.UTF_8.name());
-        } catch (final XMLStreamException e) {
-            throw new IllegalStateException(e);
-        } catch (final FactoryConfigurationError e) {
+        } catch (final XMLStreamException | FactoryConfigurationError e) {
             throw new IllegalStateException(e);
         }
         NormalizedNode<?, ?> data = errorsNode.getData();
@@ -386,9 +383,7 @@ public class RestconfDocumentedExceptionMapper implements ExceptionMapper<Restco
 
     private static void writeDataRoot(final OutputStreamWriter outputWriter, final NormalizedNodeWriter nnWriter,
                                       final ContainerNode data) throws IOException {
-        final Iterator<DataContainerChild<? extends PathArgument, ?>> iterator = data.getValue().iterator();
-        while (iterator.hasNext()) {
-            final DataContainerChild<? extends PathArgument, ?> child = iterator.next();
+        for (final DataContainerChild<? extends PathArgument, ?> child : data.getValue()) {
             nnWriter.write(child);
             nnWriter.flush();
         }

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java
index 57428b90b60f26eefb17a2ed4a973fa0e4bd55ca..c15363dcb601e933513d8dc51299a53ac7174992 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java
@@ -48,7 +48,7 @@ final class BatchedExistenceCheck {
             Futures.addCallback(f, new FutureCallback<Boolean>() {
                 @Override
                 public void onSuccess(@Nonnull final Boolean result) {
-                    ret.complete(path, result.booleanValue());
+                    ret.complete(path, result);
                 }
 
                 @Override

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java
index 95010cff19a18baef51440411ac18610a3dbc248..f1b88155b70650d7dc3b84e5bf521fe44388dc1e 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java
@@ -1465,7 +1465,7 @@ public final class RestconfImpl implements RestconfService {
         final DataSchemaNode replaySupportSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
         Preconditions.checkState(replaySupportSchemaNode instanceof LeafSchemaNode);
         streamNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) replaySupportSchemaNode)
-                .withValue(Boolean.valueOf(true)).build());
+                .withValue(Boolean.TRUE).build());
 
         instanceDataChildrenByName =
                 ControllerContext.findInstanceDataChildrenByName(listStreamSchemaNode, "replay-log-creation-time");

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java
index f82fc170fa661834d89c897ad72e43612b33b5a6..d81d11e985d1bc301e1f196d4b8b2cf3719016f6 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java
@@ -212,27 +212,27 @@ public class CnSnToJsonBasicDataTypesTest extends YangAndXmlAndDataSchemaLoader
         jsonReader.beginObject();
 
         final Map<String, LeafVerifier> expectedMap = Maps.newHashMap();
-        expectedMap.put("lfnint8Min", new NumberVerifier(Integer.valueOf(-128)));
-        expectedMap.put("lfnint8Max", new NumberVerifier(Integer.valueOf(127)));
-        expectedMap.put("lfnint16Min", new NumberVerifier(Integer.valueOf(-32768)));
-        expectedMap.put("lfnint16Max", new NumberVerifier(Integer.valueOf(32767)));
-        expectedMap.put("lfnint32Min", new NumberVerifier(Integer.valueOf(-2147483648)));
-        expectedMap.put("lfnint32Max", new NumberVerifier(Long.valueOf(2147483647)));
-        expectedMap.put("lfnint64Min", new NumberVerifier(Long.valueOf(-9223372036854775808L)));
-        expectedMap.put("lfnint64Max", new NumberVerifier(Long.valueOf(9223372036854775807L)));
-        expectedMap.put("lfnuint8Max", new NumberVerifier(Integer.valueOf(255)));
-        expectedMap.put("lfnuint16Max", new NumberVerifier(Integer.valueOf(65535)));
-        expectedMap.put("lfnuint32Max", new NumberVerifier(Long.valueOf(4294967295L)));
+        expectedMap.put("lfnint8Min", new NumberVerifier(-128));
+        expectedMap.put("lfnint8Max", new NumberVerifier(127));
+        expectedMap.put("lfnint16Min", new NumberVerifier(-32768));
+        expectedMap.put("lfnint16Max", new NumberVerifier(32767));
+        expectedMap.put("lfnint32Min", new NumberVerifier(-2147483648));
+        expectedMap.put("lfnint32Max", new NumberVerifier(2147483647L));
+        expectedMap.put("lfnint64Min", new NumberVerifier(-9223372036854775808L));
+        expectedMap.put("lfnint64Max", new NumberVerifier(9223372036854775807L));
+        expectedMap.put("lfnuint8Max", new NumberVerifier(255));
+        expectedMap.put("lfnuint16Max", new NumberVerifier(65535));
+        expectedMap.put("lfnuint32Max", new NumberVerifier(4294967295L));
         expectedMap.put("lfstr", new StringVerifier("lfstr"));
         expectedMap.put("lfstr1", new StringVerifier(""));
         expectedMap.put("lfbool1", new BooleanVerifier(true));
         expectedMap.put("lfbool2", new BooleanVerifier(false));
         expectedMap.put("lfbool3", new BooleanVerifier(false));
-        expectedMap.put("lfdecimal1", new NumberVerifier(new Double(43.32)));
-        expectedMap.put("lfdecimal2", new NumberVerifier(new Double(-0.43)));
-        expectedMap.put("lfdecimal3", new NumberVerifier(new Double(43)));
-        expectedMap.put("lfdecimal4", new NumberVerifier(new Double(43E3)));
-        expectedMap.put("lfdecimal6", new NumberVerifier(new Double(33.12345)));
+        expectedMap.put("lfdecimal1", new NumberVerifier(43.32));
+        expectedMap.put("lfdecimal2", new NumberVerifier(-0.43));
+        expectedMap.put("lfdecimal3", new NumberVerifier(43d));
+        expectedMap.put("lfdecimal4", new NumberVerifier(43E3));
+        expectedMap.put("lfdecimal6", new NumberVerifier(33.12345));
         expectedMap.put("lfenum", new StringVerifier("enum3"));
         expectedMap.put("lfbits", new StringVerifier("bit3 bit2"));
         expectedMap.put("lfbinary", new StringVerifier("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java
index ad9637ca1617b20399d780c45f897584bb032dc5..3c87380b116cb1265a455e1c22779bbe2070e7ed 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java
@@ -433,7 +433,7 @@ public class JSONRestconfServiceImplTest {
         assertTrue("Expected ContainerNode. Actual " + capturedNode.getValue().getClass(),
                 capturedNode.getValue() instanceof ContainerNode);
         final ContainerNode actualNode = (ContainerNode) capturedNode.getValue();
-        verifyLeafNode(actualNode, TOASTER_DONENESS_QNAME, Long.valueOf(10));
+        verifyLeafNode(actualNode, TOASTER_DONENESS_QNAME, 10L);
         verifyLeafNode(actualNode, TOASTER_TYPE_QNAME, WHEAT_BREAD_QNAME);
     }
 

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java
index 92a4361004a5298301ec100200d42ed94ba724ef..3af3bca77ad90a35b6afbbf04f5fa8b058fabff7 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java
@@ -89,7 +89,7 @@ public class RestconfImplTest {
     @Test
     public void binaryKeyTest() {
         final List<Byte> al = new ArrayList<>();
-        al.add(new Byte((byte) 1));
+        al.add((byte) 1);
         binaryKeyTest(al, al);
     }
 
@@ -113,7 +113,7 @@ public class RestconfImplTest {
     @Test
     public void binaryKeyFailTest() {
         final List<Byte> al = new ArrayList<>();
-        al.add(new Byte((byte) 1));
+        al.add((byte) 1);
         final List<Byte> al2 = new ArrayList<>();
         try {
             binaryKeyTest(al, al2);

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/PatchXmlBodyWriter.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/PatchXmlBodyWriter.java
index d7d264fdab92d6fd6cb789264f8f3bfb43b8d2e9..aa936e59193cea70020ef2b2a6905f1db67a346a 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/PatchXmlBodyWriter.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/PatchXmlBodyWriter.java
@@ -62,9 +62,7 @@ public class PatchXmlBodyWriter implements MessageBodyWriter<PatchStatusContext>
             final XMLStreamWriter xmlWriter =
                     XML_FACTORY.createXMLStreamWriter(entityStream, StandardCharsets.UTF_8.name());
             writeDocument(xmlWriter, patchStatusContext);
-        } catch (final XMLStreamException e) {
-            throw new IllegalStateException(e);
-        } catch (final FactoryConfigurationError e) {
+        } catch (final XMLStreamException | FactoryConfigurationError e) {
             throw new IllegalStateException(e);
         }
     }

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingStreamConstants.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingStreamConstants.java
index 2e7721c108ef7cc77ac9c508b9ee5f322998107a..530378ce5db2bd57f0c284b0d53fd5838e54f477 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingStreamConstants.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingStreamConstants.java
@@ -14,7 +14,7 @@ package org.opendaylight.restconf.nb.rfc8040.utils.mapping;
 public final class RestconfMappingStreamConstants {
 
     public static final String DESCRIPTION = "DESCRIPTION_PLACEHOLDER";
-    public static final Boolean REPLAY_SUPPORT = Boolean.valueOf(true);
+    public static final Boolean REPLAY_SUPPORT = Boolean.TRUE;
     public static final String REPLAY_LOG = "";
     public static final String EVENTS = "";
 

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java
index 78c1999f1bf094b34822c12731a12b3d349a036f..32523e815b6481f05f9885b742fbf1d87219539e 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java
+++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java
@@ -489,7 +489,7 @@ public class JSONRestconfServiceRfc8040ImplTest {
         assertTrue("Expected ContainerNode. Actual " + capturedNode.getValue().getClass(),
                 capturedNode.getValue() instanceof ContainerNode);
         final ContainerNode actualNode = (ContainerNode) capturedNode.getValue();
-        verifyLeafNode(actualNode, TOASTER_DONENESS_QNAME, Long.valueOf(10));
+        verifyLeafNode(actualNode, TOASTER_DONENESS_QNAME, 10L);
         verifyLeafNode(actualNode, TOASTER_TYPE_QNAME, WHEAT_BREAD_QNAME);
     }
 

diff --git a/restconf/sal-restconf-broker/pom.xml b/restconf/sal-restconf-broker/pom.xml
index 48a9dfc1f45278d640bc6659264229a813317743..767222ba95f3e7f5671c27afdb268ee075656c7f 100644 (file)
--- a/restconf/sal-restconf-broker/pom.xml
+++ b/restconf/sal-restconf-broker/pom.xml
@@ -46,9 +46,9 @@
   </dependencies>
 
   <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</developerConnection>
     <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+    <url>https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=summary</url>
   </scm>
 </project>