Remove BaseYangTypes.UnionType

This class seems to be completely unused, let's remove it.

Change-Id: Iebfd0b9396b3189ccafee59cc1b4ea2a3850fb89
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypes.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypes.java
index 3698e674f2213408ac1d3ee6a758a640cb50f948..fd9e5c92d071afcbe54a0ff4be861a35368488a0 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypes.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypes.java
@@ -8,10 +8,8 @@
 package org.opendaylight.mdsal.binding.yang.types;
 
 import com.google.common.collect.ImmutableMap;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.math.BigDecimal;
 import org.opendaylight.mdsal.binding.generator.spi.TypeProvider;
-import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.Restrictions;
 import org.opendaylight.mdsal.binding.model.api.Type;
 import org.opendaylight.mdsal.binding.model.util.Types;
@@ -89,8 +87,6 @@ public final class BaseYangTypes {
      */
     public static final Type UINT64_TYPE = Types.typeForClass(Uint64.class);
 
-    public static final Type UNION_TYPE = new UnionType();
-
     /**
      * <code>Type</code> representation of <code>binary</code> YANG type.
      */
@@ -117,7 +113,6 @@ public final class BaseYangTypes {
             .put("uint16", UINT16_TYPE)
             .put("uint32", UINT32_TYPE)
             .put("uint64", UINT64_TYPE)
-            .put("union", UNION_TYPE)
             .put("binary", BINARY_TYPE)
             .put("instance-identifier", INSTANCE_IDENTIFIER)
             .build();
@@ -191,8 +186,6 @@ public final class BaseYangTypes {
                     return Types.typeForClass(Uint32.class, restrictions);
                 case "uint64":
                     return Types.typeForClass(Uint64.class, restrictions);
-                case "union" :
-                    return UNION_TYPE;
                 default:
                     return javaTypeForSchemaDefinitionType(type, parentNode, lenientRelativeLeafrefs);
             }
@@ -213,29 +206,4 @@ public final class BaseYangTypes {
             return "_" + BindingMapping.getPropertyName(type.getQName().getLocalName());
         }
     };
-
-    // FIXME: 5.0.0: remove this class
-    @Deprecated
-    public static final class UnionType implements Type {
-        @Override
-        public String getPackageName() {
-            return null;
-        }
-
-        @Override
-        public String getName() {
-            return "Union";
-        }
-
-        @Override
-        public String getFullyQualifiedName() {
-            return "Union";
-        }
-
-        @Override
-        @SuppressFBWarnings("NP_NONNULL_RETURN_VIOLATION")
-        public JavaTypeName getIdentifier() {
-            return null;
-        }
-    }
 }

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java
index 9f79e4a34b4afddd073754ec8e5acb899e7f03af..0c3dbcfc7332d1048df76d4a3a5abcf623892f87 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java
@@ -183,10 +183,6 @@ public class BaseYangTypesTest {
         assertNotNull(javaType);
         assertEquals(Uint64.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(union, union);
-        assertNotNull(javaType);
-        assertEquals("Union", javaType.getFullyQualifiedName());
-
         javaType = typeProvider.javaTypeForSchemaDefinitionType(empty, empty);
         assertNotNull(javaType);
         assertEquals(Empty.class.getCanonicalName(), javaType.getFullyQualifiedName());
@@ -259,11 +255,6 @@ public class BaseYangTypesTest {
         assertNotNull(javaType);
         assertEquals(Uint64.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(union, union,
-            BindingGeneratorUtil.getRestrictions(union));
-        assertNotNull(javaType);
-        assertEquals("Union", javaType.getFullyQualifiedName());
-
         javaType = typeProvider.javaTypeForSchemaDefinitionType(empty, empty,
             BindingGeneratorUtil.getRestrictions(empty));
         assertNotNull(javaType);