From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 3 Feb 2022 15:09:32 +0000 (+0100)
Subject: Fix an eclipse warning
X-Git-Tag: v9.0.0~32
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=commitdiff_plain;h=3cae231b09cdd529113ef0ae00e74bb109e3e830

Fix an eclipse warning

<T extends Optional<?>> is not liked because of Optional being final.
Fix the warning by changing the prototype a bit.

Change-Id: I8864b695e4affa01913df83721c63ff4fe6d5015
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit dedcf36a1d42359adc3ed2fe731ae36024cf18cf)
---

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtil.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtil.java
index 1b4c31739d..669c69bd2b 100644
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtil.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtil.java
@@ -211,8 +211,8 @@ public final class BindingGeneratorUtil {
         return def.getRangeConstraint();
     }
 
-    private static <T extends Optional<?>> T currentOrEmpty(final T current, final T base) {
-        return current.equals(base) ? (T)Optional.empty() : current;
+    private static <T> Optional<T> currentOrEmpty(final Optional<T> current, final Optional<?> base) {
+        return current.equals(base) ? Optional.empty() : current;
     }
 
     private static boolean containsConstraint(final StringTypeDefinition type, final PatternConstraint constraint) {