From 75181ffcf7c147a22330a8817af89aecdaf8149c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 22 Dec 2018 02:19:15 +0100 Subject: [PATCH] Simplify ClassLoadingStrategy implementations loadClass(Type) has only one implementation, which defers to loadClass(String). Promote that impleentation to default, simplifying other potential implementations. Change-Id: Idef5da25e10490fce2174dee7a6c031f71cc741c Signed-off-by: Robert Varga --- .../mdsal/binding/generator/api/ClassLoadingStrategy.java | 7 ++++--- .../generator/impl/GeneratedClassLoadingStrategy.java | 6 ------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/ClassLoadingStrategy.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/ClassLoadingStrategy.java index 92b9970d08..f30e38a7f8 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/ClassLoadingStrategy.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/ClassLoadingStrategy.java @@ -10,8 +10,9 @@ package org.opendaylight.mdsal.binding.generator.api; import org.opendaylight.mdsal.binding.model.api.Type; public interface ClassLoadingStrategy { - - Class loadClass(Type type) throws ClassNotFoundException; - Class loadClass(String fullyQualifiedName) throws ClassNotFoundException; + + default Class loadClass(final Type type) throws ClassNotFoundException { + return loadClass(type.getFullyQualifiedName()); + } } diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedClassLoadingStrategy.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedClassLoadingStrategy.java index 66d90ed273..9e803fad0e 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedClassLoadingStrategy.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedClassLoadingStrategy.java @@ -8,7 +8,6 @@ package org.opendaylight.mdsal.binding.generator.impl; import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.util.ClassLoaderUtils; public abstract class GeneratedClassLoadingStrategy implements ClassLoadingStrategy { @@ -22,11 +21,6 @@ public abstract class GeneratedClassLoadingStrategy implements ClassLoadingStrat } }; - @Override - public Class loadClass(final Type type) throws ClassNotFoundException { - return loadClass(type.getFullyQualifiedName()); - } - @Override public abstract Class loadClass(String fullyQualifiedName) throws ClassNotFoundException; -- 2.36.6