Migrate setters

This migrate Binding DTO setter usage to use Uint types, fixing
deprecation warnings.

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

diff --git a/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java b/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java
index d87a22121f837b9c66704875be00e3c3237cc140..3db27dc553eeb2d0b9de0ea906c81ee3ab5271cc 100644 (file)
--- a/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java
+++ b/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java
@@ -35,6 +35,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.SessionBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class MonitoringToMdsalWriterTest {
 
@@ -102,7 +103,7 @@ public class MonitoringToMdsalWriterTest {
     @Test
     public void testOnSessionStart() throws Exception {
         Session session = new SessionBuilder()
-                .setSessionId(1L)
+                .setSessionId(Uint32.ONE)
                 .build();
         final InstanceIdentifier<Session> id =
                 InstanceIdentifier.create(NetconfState.class)
@@ -118,7 +119,7 @@ public class MonitoringToMdsalWriterTest {
     @Test
     public void testOnSessionEnd() throws Exception {
         Session session = new SessionBuilder()
-                .setSessionId(1L)
+                .setSessionId(Uint32.ONE)
                 .build();
         final InstanceIdentifier<Session> id =
                 InstanceIdentifier.create(NetconfState.class)
@@ -134,10 +135,10 @@ public class MonitoringToMdsalWriterTest {
     @Test
     public void testOnSessionsUpdated() throws Exception {
         Session session1 = new SessionBuilder()
-                .setSessionId(1L)
+                .setSessionId(Uint32.ONE)
                 .build();
         Session session2 = new SessionBuilder()
-                .setSessionId(2L)
+                .setSessionId(Uint32.valueOf(2))
                 .build();
         List<Session> sessions = new ArrayList<>();
         sessions.add(session1);

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/SessionNotificationProducerTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/SessionNotificationProducerTest.java
index 759aceca3435d5e9c33b0954322e5bbfcd910f0c..9aad096b6c578a88313db1bf082901a95b7ee340 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/SessionNotificationProducerTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/SessionNotificationProducerTest.java
@@ -75,7 +75,7 @@ public class SessionNotificationProducerTest {
 
     @Test
     public void testOnDataChangedSessionCreated() throws Exception {
-        final Session session = createSession(1);
+        final Session session = createSession(Uint32.ONE);
         final DataTreeModification<Session> treeChange = getTreeModification(session, ModificationType.WRITE);
         publisher.onDataTreeChanged(Collections.singleton(treeChange));
         ArgumentCaptor<NetconfSessionStart> captor = ArgumentCaptor.forClass(NetconfSessionStart.class);
@@ -90,8 +90,8 @@ public class SessionNotificationProducerTest {
     public void testOnDataChangedSessionUpdated() throws Exception {
         final DataTreeModification<Session> treeChange = mock(DataTreeModification.class);
         final DataObjectModification<Session> changeObject = mock(DataObjectModification.class);
-        final Session sessionBefore = createSessionWithInRpcCount(1, 0);
-        final Session sessionAfter = createSessionWithInRpcCount(1, 1);
+        final Session sessionBefore = createSessionWithInRpcCount(Uint32.ONE, Uint32.ZERO);
+        final Session sessionAfter = createSessionWithInRpcCount(Uint32.ONE, Uint32.ONE);
         doReturn(sessionBefore).when(changeObject).getDataBefore();
         doReturn(sessionAfter).when(changeObject).getDataAfter();
         doReturn(ModificationType.WRITE).when(changeObject).getModificationType();
@@ -104,7 +104,7 @@ public class SessionNotificationProducerTest {
 
     @Test
     public void testOnDataChangedSessionDeleted() throws Exception {
-        final Session session = createSession(1);
+        final Session session = createSession(Uint32.ONE);
         final DataTreeModification<Session> data = getTreeModification(session, ModificationType.DELETE);
         publisher.onDataTreeChanged(Collections.singleton(data));
         ArgumentCaptor<NetconfSessionEnd> captor = ArgumentCaptor.forClass(NetconfSessionEnd.class);
@@ -115,16 +115,16 @@ public class SessionNotificationProducerTest {
         Assert.assertEquals(session.getUsername(), value.getUsername());
     }
 
-    private static Session createSession(final long id) {
-        return createSessionWithInRpcCount(id, 0);
+    private static Session createSession(final Uint32 id) {
+        return createSessionWithInRpcCount(id, Uint32.ZERO);
     }
 
-    private static Session createSessionWithInRpcCount(final long id, final long inRpc) {
+    private static Session createSessionWithInRpcCount(final Uint32 id, final Uint32 inRpc) {
         return new SessionBuilder()
                 .setSessionId(id)
                 .setSourceHost(HostBuilder.getDefaultInstance("0.0.0.0"))
                 .setUsername("user")
-                .setInRpcs(new ZeroBasedCounter32(Uint32.valueOf(inRpc)))
+                .setInRpcs(new ZeroBasedCounter32(inRpc))
                 .build();
     }
 

diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java
index 97729f99ad8fe7c4177bad17d7628527bf24d049..4c263402c3f73342b41e1ec515839b694e9d55c4 100644 (file)
--- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java
+++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.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.netconf.impl;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkState;
+
 import com.google.common.net.InetAddresses;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -75,7 +75,7 @@ public final class NetconfServerSession extends AbstractNetconfSession<NetconfSe
 
     @Override
     protected void sessionUp() {
-        Preconditions.checkState(loginTime == null, "Session is already up");
+        checkState(loginTime == null, "Session is already up");
         this.loginTime = Instant.now().atZone(ZoneId.systemDefault());
         super.sessionUp();
     }
@@ -118,7 +118,7 @@ public final class NetconfServerSession extends AbstractNetconfSession<NetconfSe
     public Session toManagementSession() {
         SessionBuilder builder = new SessionBuilder();
 
-        builder.setSessionId(getSessionId());
+        builder.setSessionId(Uint32.valueOf(getSessionId()));
         IpAddress address;
         InetAddress address1 = InetAddresses.forString(header.getAddress());
         if (address1 instanceof Inet4Address) {
@@ -128,17 +128,17 @@ public final class NetconfServerSession extends AbstractNetconfSession<NetconfSe
         }
         builder.setSourceHost(new Host(address));
 
-        Preconditions.checkState(DateAndTime.PATTERN_CONSTANTS.size() == 1);
+        checkState(DateAndTime.PATTERN_CONSTANTS.size() == 1);
         String formattedDateTime = DATE_FORMATTER.format(loginTime);
 
         Matcher matcher = DATE_TIME_PATTERN.matcher(formattedDateTime);
-        Preconditions.checkState(matcher.matches(), "Formatted datetime %s does not match pattern %s",
+        checkState(matcher.matches(), "Formatted datetime %s does not match pattern %s",
                 formattedDateTime, DATE_TIME_PATTERN);
         builder.setLoginTime(new DateAndTime(formattedDateTime));
 
-        builder.setInBadRpcs(new ZeroBasedCounter32(inRpcFail));
-        builder.setInRpcs(new ZeroBasedCounter32(inRpcSuccess));
-        builder.setOutRpcErrors(new ZeroBasedCounter32(outRpcError));
+        builder.setInBadRpcs(new ZeroBasedCounter32(Uint32.valueOf(inRpcFail)));
+        builder.setInRpcs(new ZeroBasedCounter32(Uint32.valueOf(inRpcSuccess)));
+        builder.setOutRpcErrors(new ZeroBasedCounter32(Uint32.valueOf(outRpcError)));
 
         builder.setUsername(header.getUserName());
         builder.setTransport(getTransportForString(header.getTransport()));

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 f626164bf423baa3cb1e3cd9caef4319e4392fee..d0fbfc280fedcbb7918d008e31e53eae2f305c1e 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
@@ -133,6 +133,7 @@ import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
@@ -592,13 +593,13 @@ public class MountPointEndToEndTest {
         final NetconfNode netconfNode = new NetconfNodeBuilder()
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(Uint16.valueOf(1234)))
-                .setActorResponseWaitTime(10)
+                .setActorResponseWaitTime(Uint16.valueOf(10))
                 .setTcpOnly(Boolean.TRUE)
                 .setSchemaless(Boolean.FALSE)
-                .setKeepaliveDelay(0L)
-                .setConnectionTimeoutMillis(5000L)
-                .setDefaultRequestTimeoutMillis(5000L)
-                .setMaxConnectionAttempts(1L)
+                .setKeepaliveDelay(Uint32.ZERO)
+                .setConnectionTimeoutMillis(Uint32.valueOf(5000))
+                .setDefaultRequestTimeoutMillis(Uint32.valueOf(5000))
+                .setMaxConnectionAttempts(Uint32.ONE)
                 .setCredentials(new LoginPwUnencryptedBuilder().setLoginPasswordUnencrypted(
                         new LoginPasswordUnencryptedBuilder().setUsername("user").setPassword("pass").build()).build())
                 .setSchemaCacheDirectory(cacheDir)

diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java
index e58cbc7276891fb5ea9fe13e0455eb29fde96b31..3f2921f7c02d2398cdd3b72e6beadb2b6f572838 100644 (file)
--- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java
+++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java
@@ -82,7 +82,7 @@ import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
 import org.opendaylight.yangtools.yang.common.Uint16;
 
 public class NetconfTopologyManagerTest {
-    private static final int ACTOR_RESPONSE_WAIT_TIME = 10;
+    private static final Uint16 ACTOR_RESPONSE_WAIT_TIME = Uint16.valueOf(10);
     private static final String TOPOLOGY_ID = "topologyID";
 
     private NetconfTopologyManager netconfTopologyManager;
@@ -135,7 +135,7 @@ public class NetconfTopologyManagerTest {
             protected NetconfTopologyContext newNetconfTopologyContext(final NetconfTopologySetup setup,
                 final ServiceGroupIdentifier serviceGroupIdent, final Timeout actorResponseWaitTime,
                 final DeviceActionFactory deviceActionFactory) {
-                assertEquals(ACTOR_RESPONSE_WAIT_TIME, actorResponseWaitTime.duration().toSeconds());
+                assertEquals(ACTOR_RESPONSE_WAIT_TIME.toJava(), actorResponseWaitTime.duration().toSeconds());
                 return Objects.requireNonNull(mockContextMap.get(setup.getInstanceIdentifier()),
                         "No mock context for " + setup.getInstanceIdentifier()).apply(setup);
             }

diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java
index 6054a9b19df76e0934c95722053c7f861df7d7af..8fa8ee6357b426a603bdb81fcc8e69a856dce29f 100644 (file)
--- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java
+++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java
@@ -63,6 +63,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
 import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import scala.concurrent.duration.Duration;
 
 public class RemoteDeviceConnectorImplTest {
@@ -143,8 +144,8 @@ public class RemoteDeviceConnectorImplTest {
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(Uint16.valueOf(9999)))
                 .setReconnectOnChangedSchema(true)
-                .setDefaultRequestTimeoutMillis(1000L)
-                .setBetweenAttemptsTimeoutMillis(100)
+                .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+                .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
                 .setSchemaless(false)
                 .setTcpOnly(false)
                 .setCredentials(credentials)
@@ -178,12 +179,12 @@ public class RemoteDeviceConnectorImplTest {
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(Uint16.valueOf(9999)))
                 .setReconnectOnChangedSchema(true)
-                .setDefaultRequestTimeoutMillis(1000L)
-                .setBetweenAttemptsTimeoutMillis(100)
+                .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+                .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
                 .setSchemaless(false)
                 .setTcpOnly(false)
                 .setCredentials(credentials)
-                .setKeepaliveDelay(1L)
+                .setKeepaliveDelay(Uint32.ONE)
                 .build();
 
         final Node node = new NodeBuilder().setNodeId(NODE_ID).addAugmentation(NetconfNode.class, netconfNode).build();
@@ -206,8 +207,8 @@ public class RemoteDeviceConnectorImplTest {
         final Host host = new Host(new IpAddress(new Ipv4Address("127.0.0.1")));
         final PortNumber portNumber = new PortNumber(Uint16.valueOf(9999));
         final NetconfNode testingNode = new NetconfNodeBuilder()
-                .setConnectionTimeoutMillis(1000L)
-                .setDefaultRequestTimeoutMillis(2000L)
+                .setConnectionTimeoutMillis(Uint32.valueOf(1000))
+                .setDefaultRequestTimeoutMillis(Uint32.valueOf(2000))
                 .setHost(host)
                 .setPort(portNumber)
                 .setCredentials(new LoginPasswordBuilder()

diff --git a/netconf/netconf-topology/src/test/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImplTest.java b/netconf/netconf-topology/src/test/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImplTest.java
index 55acaa519a45ae55f7a21ac33e97ef3362ece25b..8062edee4597f88a212a42a52643d5efa7072e09 100644 (file)
--- a/netconf/netconf-topology/src/test/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImplTest.java
+++ b/netconf/netconf-topology/src/test/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImplTest.java
@@ -69,6 +69,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.parser.repo.SharedSchemaRepository;
 
 public class NetconfTopologyImplTest {
@@ -164,9 +165,9 @@ public class NetconfTopologyImplTest {
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(Uint16.valueOf(9999)))
                 .setReconnectOnChangedSchema(true)
-                .setDefaultRequestTimeoutMillis(1000L)
-                .setBetweenAttemptsTimeoutMillis(100)
-                .setKeepaliveDelay(1000L)
+                .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+                .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+                .setKeepaliveDelay(Uint32.valueOf(1000))
                 .setTcpOnly(true)
                 .setCredentials(new LoginPasswordBuilder()
                         .setUsername("testuser").setPassword("testpassword").build())
@@ -206,9 +207,9 @@ public class NetconfTopologyImplTest {
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(Uint16.valueOf(9999)))
                 .setReconnectOnChangedSchema(true)
-                .setDefaultRequestTimeoutMillis(1000L)
-                .setBetweenAttemptsTimeoutMillis(100)
-                .setKeepaliveDelay(1000L)
+                .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+                .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+                .setKeepaliveDelay(Uint32.valueOf(1000))
                 .setTcpOnly(true)
                 .setCredentials(new LoginPasswordBuilder()
                         .setUsername("testuser").setPassword("testpassword").build())
@@ -224,9 +225,9 @@ public class NetconfTopologyImplTest {
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(Uint16.valueOf(9999)))
                 .setReconnectOnChangedSchema(true)
-                .setDefaultRequestTimeoutMillis(1000L)
-                .setBetweenAttemptsTimeoutMillis(100)
-                .setKeepaliveDelay(1000L)
+                .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+                .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+                .setKeepaliveDelay(Uint32.valueOf(1000))
                 .setTcpOnly(false)
                 .setCredentials(new LoginPasswordBuilder()
                         .setUsername("testuser").setPassword("testpassword").build())
@@ -242,9 +243,9 @@ public class NetconfTopologyImplTest {
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(Uint16.valueOf(9999)))
                 .setReconnectOnChangedSchema(true)
-                .setDefaultRequestTimeoutMillis(1000L)
-                .setBetweenAttemptsTimeoutMillis(100)
-                .setKeepaliveDelay(1000L)
+                .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+                .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+                .setKeepaliveDelay(Uint32.valueOf(1000))
                 .setTcpOnly(false)
                 .setProtocol(new ProtocolBuilder().setName(Name.SSH).build())
                 .setCredentials(new LoginPasswordBuilder()
@@ -261,9 +262,9 @@ public class NetconfTopologyImplTest {
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(Uint16.valueOf(9999)))
                 .setReconnectOnChangedSchema(true)
-                .setDefaultRequestTimeoutMillis(1000L)
-                .setBetweenAttemptsTimeoutMillis(100)
-                .setKeepaliveDelay(1000L)
+                .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+                .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+                .setKeepaliveDelay(Uint32.valueOf(1000))
                 .setTcpOnly(false)
                 .setProtocol(new ProtocolBuilder().setName(Name.TLS).build())
                 .setCredentials(new LoginPasswordBuilder()
@@ -309,9 +310,9 @@ public class NetconfTopologyImplTest {
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(Uint16.valueOf(9999)))
                 .setReconnectOnChangedSchema(true)
-                .setDefaultRequestTimeoutMillis(1000L)
-                .setBetweenAttemptsTimeoutMillis(100)
-                .setKeepaliveDelay(1000L)
+                .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+                .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+                .setKeepaliveDelay(Uint32.valueOf(1000))
                 .setTcpOnly(false)
                 .setProtocol(new ProtocolBuilder().setName(Name.TLS).build())
                 .setCredentials(new LoginPasswordBuilder()

diff --git a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java
index 97536d29f5b8d34fb66e332d83174ebf3b8eb334..ea7b97ccfab2d5722d531fd0337fec29e990b1fe 100644 (file)
--- a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java
+++ b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java
@@ -47,6 +47,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.yanglib.impl.rev141210.YanglibConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.yanglib.impl.rev141210.YanglibConfigBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang.model.repo.api.YinSchemaSourceRepresentation;
@@ -90,7 +91,7 @@ public class YangLibProviderTest {
         }
 
         final YanglibConfig yanglibConfig = new YanglibConfigBuilder().setBindingAddr("www.fake.com")
-                .setBindingPort(300L).setCacheFolder(CACHE_DIR.getAbsolutePath()).build();
+                .setBindingPort(Uint32.valueOf(300)).setCacheFolder(CACHE_DIR.getAbsolutePath()).build();
         yangLibProvider = new YangLibProvider(yanglibConfig, dataBroker, new SharedSchemaRepository("yang-library"));
     }