Adapt TransportPCE code to Chlorine

[transportpce.git] / common / src / main / java / org / opendaylight / transportpce / common / crossconnect / CrossConnectImpl.java

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java
index 71af9a89c168655c74b50e1c48d5902d9b321186..108905983d54842b9adf17dc381f67b557c1139d 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java
@@ -108,16 +108,16 @@ public class CrossConnectImpl implements CrossConnect {
     @Override
     public boolean setPowerLevel(String nodeId, String mode, Decimal64 powerValue, String connectionNumber) {
         String openRoadmVersion = mappingUtils.getOpenRoadmVersion(nodeId);
-        if (OPENROADM_DEVICE_VERSION_1_2_1.equals(openRoadmVersion) && OpticalControlMode.forName(mode).isPresent()) {
-            return crossConnectImpl121.setPowerLevel(nodeId,OpticalControlMode.forName(mode).get(), powerValue,
+        if (OPENROADM_DEVICE_VERSION_1_2_1.equals(openRoadmVersion) && OpticalControlMode.forName(mode) != null) {
+            return crossConnectImpl121.setPowerLevel(nodeId,OpticalControlMode.forName(mode), powerValue,
                 connectionNumber);
         }
         else if (OPENROADM_DEVICE_VERSION_2_2_1.equals(openRoadmVersion)
-            && org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.OpticalControlMode.forName(mode)
-            .isPresent()) {
+                && org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.OpticalControlMode
+                    .forName(mode) != null) {
             return crossConnectImpl221.setPowerLevel(nodeId,
-                org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.OpticalControlMode.forName(mode)
-                .get(), powerValue, connectionNumber);
+                org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.OpticalControlMode.forName(mode),
+                powerValue, connectionNumber);
         }
         return false;
     }