X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-generator%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fgenerator%2FBindingGeneratorUtil.java;h=669c69bd2bc2660f7af226b6109b6a5bbdd3abff;hb=refs%2Fchanges%2F11%2F99811%2F1;hp=1b4c31739d3a921541cf9c22100fc8b683aa31f8;hpb=88326da6bebb71cd62f351b3cccecdc3b4bd3cff;p=mdsal.git

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) {