Bump upstream dependencies to Argon

[transportpce.git] / tapi / src / main / java / org / opendaylight / transportpce / tapi / listeners / TapiNetworkModelListenerImpl.java

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiNetworkModelListenerImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiNetworkModelListenerImpl.java
index 2d92919b9f6d884d8f024e4e50eceab0be71194e..9464a5ed7dcb0f9250d5c6d5dde005d95d2756cb 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiNetworkModelListenerImpl.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiNetworkModelListenerImpl.java
@@ -66,7 +66,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.to
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.context.Topology;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.context.TopologyKey;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
+import org.opendaylight.yangtools.yang.binding.EnumTypeObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -181,7 +181,7 @@ public class TapiNetworkModelListenerImpl implements TapiNotificationListener {
                 return;
             }
             ConnectivityContext connContext = optConnContext.get();
-            Map<Uuid, Enumeration[]> states = new HashMap<>();
+            Map<Uuid, EnumTypeObject[]> states = new HashMap<>();
             if (connContext.getConnectivityService() == null) {
                 return;
             }
@@ -226,12 +226,13 @@ public class TapiNetworkModelListenerImpl implements TapiNotificationListener {
         }
     }
 
-    private Enumeration[] getStates(ConnectivityService connService) throws InterruptedException, ExecutionException {
+    private EnumTypeObject[] getStates(ConnectivityService connService)
+            throws InterruptedException, ExecutionException {
         OperationalState operState = OperationalState.ENABLED;
         AdministrativeState adminState = AdministrativeState.UNLOCKED;
         if (connService.getConnection() == null) {
             LOG.info("No connections on service = {}", connService);
-            return new Enumeration[]{null, null};
+            return new EnumTypeObject[]{null, null};
         }
         for (org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210
                 .connectivity.service.Connection connection : connService.getConnection().values()) {
@@ -254,7 +255,7 @@ public class TapiNetworkModelListenerImpl implements TapiNotificationListener {
                 operState = OperationalState.DISABLED;
             }
         }
-        return new Enumeration[]{adminState, operState};
+        return new EnumTypeObject[]{adminState, operState};
     }
 
     private void updateConnections(List<Uuid> changedOneps, List<String> onepStates) {