From fd81c72934314a2aeef4113a53faeeef2b4dae94 Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Mon, 16 Dec 2019 16:27:31 +0100
Subject: [PATCH] fix CrossConnect methods implementation warnings

at build time

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I924ed7db04802bb0affda561f0baaf7fa6bf6874
---
 .../common/crossconnect/CrossConnect.java         | 15 ++++++---------
 .../olm/power/PowerMgmtVersion121.java            |  3 ++-
 .../olm/power/PowerMgmtVersion221.java            |  3 ++-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java
index 473958d5c..faf887f64 100644
--- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java
@@ -23,12 +23,10 @@ public interface CrossConnect {
      *            Device id.
      * @param connectionNumber
      *            Name of the cross connect.
-     * @param <T>
-     *            generic.
      *
-     * @return Roadm connection subtree from the device.
+     * @return optional of Roadm connection subtree from the device.
      */
-    <T> Optional<T> getCrossConnect(String deviceId, String connectionNumber);
+    Optional<?> getCrossConnect(String deviceId, String connectionNumber);
 
     /**
      * This method does a post(edit-config) on roadm connection subtree for a
@@ -73,14 +71,13 @@ public interface CrossConnect {
      *            Source logical connection point.
      * @param destTp
      *            Destination logical connection point.
-     * @param <T>
-     *            generic.
-     * @throws OpenRoadmInterfaceException
-     *            an exception at OpenRoadm interface.
      *
      * @return list of Ports object type.
+     *
+     * @throws OpenRoadmInterfaceException
+     *            an exception at OpenRoadm interface.
      */
-    <T> List<T> getConnectionPortTrail(String nodeId, Long waveNumber, String srcTp, String destTp)
+    List<?> getConnectionPortTrail(String nodeId, Long waveNumber, String srcTp, String destTp)
             throws OpenRoadmInterfaceException;
 
     /**
diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java
index dfcde2ae4..0cf590e43 100644
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java
@@ -217,7 +217,8 @@ public final class PowerMgmtVersion121 {
     public static boolean setPowerLevel(String deviceId, OpticalControlMode mode, BigDecimal powerValue,
             String connectionNumber, CrossConnect crossConnect,
             DeviceTransactionManager deviceTransactionManager) {
-        Optional<RoadmConnections> rdmConnOpt = crossConnect.getCrossConnect(deviceId, connectionNumber);
+        @SuppressWarnings("unchecked") Optional<RoadmConnections> rdmConnOpt =
+            (Optional<RoadmConnections>) crossConnect.getCrossConnect(deviceId, connectionNumber);
         if (rdmConnOpt.isPresent()) {
             RoadmConnectionsBuilder rdmConnBldr = new RoadmConnectionsBuilder(rdmConnOpt.get());
             rdmConnBldr.setOpticalControlMode(mode);
diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java
index 26042e7d8..f7e530bb0 100644
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java
@@ -217,7 +217,8 @@ public final class PowerMgmtVersion221 {
     public static boolean setPowerLevel(String deviceId, OpticalControlMode mode, BigDecimal powerValue,
             String connectionNumber, CrossConnect crossConnect,
             DeviceTransactionManager deviceTransactionManager) {
-        Optional<RoadmConnections> rdmConnOpt =  crossConnect.getCrossConnect(deviceId, connectionNumber);
+        @SuppressWarnings("unchecked") Optional<RoadmConnections> rdmConnOpt =
+            (Optional<RoadmConnections>) crossConnect.getCrossConnect(deviceId, connectionNumber);
         if (rdmConnOpt.isPresent()) {
             RoadmConnectionsBuilder rdmConnBldr = new RoadmConnectionsBuilder(rdmConnOpt.get());
             rdmConnBldr.setOpticalControlMode(mode);
-- 
2.36.6