From b98646e80e22b98f24d6c4ebdb25c72633af39e2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 18 Dec 2019 11:25:02 +0100 Subject: [PATCH] Remove deprecated Types methods Types methods dealing with binding concepts have been migrated to BindingTypes, remove their residence. Change-Id: Idb1710ba888dd40f630389028702c209904d443a Signed-off-by: Robert Varga --- .../mdsal/binding/model/util/Types.java | 34 ------------------- .../mdsal/binding/model/util/TypesTest.java | 26 -------------- .../generator/test/GeneratorJavaFileTest.java | 3 +- 3 files changed, 1 insertion(+), 62 deletions(-) diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java index eefeaa26b0..8b0b2c8927 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java @@ -233,40 +233,6 @@ public final class Types { return new WildcardTypeImpl(identifier); } - /** - * Creates instance of - * {@link org.opendaylight.mdsal.binding.model.api.ParameterizedType - * ParameterizedType} where raw type is - * {@link org.opendaylight.yangtools.yang.binding.Augmentable} and actual - * parameter is valueType. - * - * @param valueType JAVA Type with actual parameter - * @return ParametrizedType representation of raw type - * Augmentable with actual parameter - * valueType - * @deprecated Use {@link BindingTypes#augmentable(Type)} instead. - */ - @Deprecated(forRemoval = true) - public static @NonNull ParameterizedType augmentableTypeFor(final Type valueType) { - return BindingTypes.augmentable(valueType); - } - - /** - * Creates instance of {@link org.opendaylight.mdsal.binding.model.api.ParameterizedType ParameterizedType} where - * raw type is {@link org.opendaylight.yangtools.yang.binding.Augmentation} and actual parameter - * is valueType. - * - * @param valueType JAVA Type with actual parameter - * @return ParametrizedType representation of raw type - * Augmentation with actual parameter - * valueType - * @deprecated Use {@link BindingTypes#augmentation(Type)} instead. - */ - @Deprecated(forRemoval = true) - public static @NonNull ParameterizedType augmentationTypeFor(final Type valueType) { - return BindingTypes.augmentation(valueType); - } - public static @Nullable String getOuterClassName(final Type valueType) { return valueType.getIdentifier().immediatelyEnclosingClass().map(Object::toString).orElse(null); } diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/TypesTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/TypesTest.java index 0ff2d4077a..895f02501f 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/TypesTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/TypesTest.java @@ -71,30 +71,4 @@ public class TypesTest { "WildcardTypeTest")); assertEquals("WildcardTypeTest", wildcardType.getName()); } - - @Deprecated - @Test(expected = NullPointerException.class) - public void testAugmentableTypeForNull() { - Types.augmentableTypeFor(null); - } - - @Deprecated - @Test(expected = NullPointerException.class) - public void augmentationTypeForNull() { - Types.augmentationTypeFor(null); - } - - @Deprecated - @Test - public void testAugmentableTypeFor() { - ParameterizedType augmentableType = Types.augmentableTypeFor(Types.objectType()); - assertEquals("Augmentable", augmentableType.getName()); - } - - @Deprecated - @Test - public void augmentationTypeFor() { - ParameterizedType augmentationType = Types.augmentationTypeFor(Types.objectType()); - assertEquals("Augmentation", augmentationType.getName()); - } } diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java index a7db194e49..2091a06a46 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java @@ -19,7 +19,6 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.util.BindingTypes; -import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.util.generated.type.builder.CodegenGeneratedTypeBuilder; public class GeneratorJavaFileTest extends BaseCompilationTest { @@ -30,7 +29,7 @@ public class GeneratorJavaFileTest extends BaseCompilationTest { public void test() throws IOException { final GeneratedTypeBuilder gtb = new CodegenGeneratedTypeBuilder(JavaTypeName.create( "org.opendaylight.controller.gen", "Type4")); - gtb.addImplementsType(Types.augmentableTypeFor(gtb)); + gtb.addImplementsType(BindingTypes.augmentable(gtb)); generateTestSources(Arrays.asList( createGeneratedType("org.opendaylight.controller.gen", "Type1"), -- 2.36.6