Explicit unchecked conversions in networkmodel

to avoid compilation warnings.

JIRA: TRNSPRTPCE-430
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id8f08201c484aef895291aba517080a54866b391

diff --git a/lighty/README.md b/lighty/README.md
index 661b732414d6b6604a97122f18c6dded4e5ce269..059c841a284ceb581b56e1d9be25590d9e21d0a9 100644 (file)
--- a/lighty/README.md
+++ b/lighty/README.md
@@ -11,7 +11,7 @@ This project starts [TransportPCE](https://git.opendaylight.org/gerrit/#/admin/p
 1. Make sure upstream projects are compiled locally and stored in local ``~/.m2/repository``:
 2. compile __transportpce/master__
 ```
-git clone https://git.opendaylight.org/gerrit/transportpce && (cd transportpce && curl -kLo `git rev-parse --git-dir`/hooks/commit-msg https://git.opendaylight.org/gerrit/tools/hooks/commit-msg; chmod +x `git rev-parse --git-dir`/hooks/commit-msg)
+git clone -b stable/silicon https://git.opendaylight.org/gerrit/transportpce && (cd transportpce && curl -kLo `git rev-parse --git-dir`/hooks/commit-msg https://git.opendaylight.org/gerrit/tools/hooks/commit-msg; chmod +x `git rev-parse --git-dir`/hooks/commit-msg)
 cd transportpce
 ```
 mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true -Dodlparent.spotbugs.skip -Dodlparent.checkstyle.skip

diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java b/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java
index 2e81abe171020bf67e513d77f810ae1028d13b9f..baefe4db5deb9428cb091dff55ae58e8ce424570 100644 (file)
--- a/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java
+++ b/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java
@@ -228,8 +228,6 @@ public final class TPCEUtils {
                     .$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.$YangModuleInfoImpl
                     .getInstance(),
-            org.opendaylight.yang.gen.v1.http.org.transportpce.d._interface.ord.topology.types.rev201116
-                    .$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.$YangModuleInfoImpl.getInstance(),
 
             org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.$YangModuleInfoImpl

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java
index 4e8a5e908b6270d91c5df7b6d2d8ad65bbb20c56..8e57c872044184748c69360e4aeabb6d6fcfcfe1 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java
@@ -67,9 +67,9 @@ public class NetConfTopologyListenerTest {
 
     @Test
     public void testOnDataTreeChangedWhenDeleteNode() {
-        final DataObjectModification<Node> node = mock(DataObjectModification.class);
+        @SuppressWarnings("unchecked") final DataObjectModification<Node> node = mock(DataObjectModification.class);
         final Collection<DataTreeModification<Node>> changes = new HashSet<>();
-        final DataTreeModification<Node> ch = mock(DataTreeModification.class);
+        @SuppressWarnings("unchecked") final DataTreeModification<Node> ch = mock(DataTreeModification.class);
         final NodeRegistration nodeRegistration = mock(NodeRegistration.class);
         changes.add(ch);
         when(ch.getRootNode()).thenReturn(node);
@@ -92,7 +92,7 @@ public class NetConfTopologyListenerTest {
 
     @Test
     public void testOnDataTreeChangedWhenAddNode() {
-        final DataObjectModification<Node> node = mock(DataObjectModification.class);
+        @SuppressWarnings("unchecked") final DataObjectModification<Node> node = mock(DataObjectModification.class);
         final Collection<DataTreeModification<Node>> changes = new HashSet<>();
         @SuppressWarnings("unchecked") final DataTreeModification<Node> ch = mock(DataTreeModification.class);
         changes.add(ch);
@@ -118,9 +118,9 @@ public class NetConfTopologyListenerTest {
 
     @Test
     public void testOnDataTreeChangedWhenDisconnectingNode() {
-        final DataObjectModification<Node> node = mock(DataObjectModification.class);
+        @SuppressWarnings("unchecked") final DataObjectModification<Node> node = mock(DataObjectModification.class);
         final Collection<DataTreeModification<Node>> changes = new HashSet<>();
-        final DataTreeModification<Node> ch = mock(DataTreeModification.class);
+        @SuppressWarnings("unchecked") final DataTreeModification<Node> ch = mock(DataTreeModification.class);
         changes.add(ch);
         when(ch.getRootNode()).thenReturn(node);
 
@@ -145,9 +145,9 @@ public class NetConfTopologyListenerTest {
 
     @Test
     public void testOnDataTreeChangedWhenShouldNeverHappen() {
-        final DataObjectModification<Node> node = mock(DataObjectModification.class);
+        @SuppressWarnings("unchecked") final DataObjectModification<Node> node = mock(DataObjectModification.class);
         final Collection<DataTreeModification<Node>> changes = new HashSet<>();
-        final DataTreeModification<Node> ch = mock(DataTreeModification.class);
+        @SuppressWarnings("unchecked") final DataTreeModification<Node> ch = mock(DataTreeModification.class);
         changes.add(ch);
         when(ch.getRootNode()).thenReturn(node);