Specialize ModuleInfoBackedContext for no fallback

We expect BindingRuntimeContext to accurately access classes in
most scenarios. Make sure we ditch TCCL in those scenarios.

JIRA: MDSAL-392
Change-Id: I4a712a65732b98678f555e31dc9400a588a70d1c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/BindingRuntimeHelpers.java b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/BindingRuntimeHelpers.java
index d2a0f0bf7043da61421eade402efac2eb7663bbd..154c7d53852ef431032fa47794ffe652760d56d6 100644 (file)
--- a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/BindingRuntimeHelpers.java
+++ b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/BindingRuntimeHelpers.java
@@ -64,9 +64,7 @@ public final class BindingRuntimeHelpers {
     }
 
     private static ModuleInfoBackedContext prepareContext(final Iterable<? extends YangModuleInfo> moduleInfos) {
     }
 
     private static ModuleInfoBackedContext prepareContext(final Iterable<? extends YangModuleInfo> moduleInfos) {

-        final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create(
-            // FIXME: This is the fallback strategy, it should not be needed
-            GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy());
+        final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create();

         ctx.addModuleInfos(moduleInfos);
         return ctx;
     }
         ctx.addModuleInfos(moduleInfos);
         return ctx;
     }

diff --git a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/ModuleInfoBackedContext.java b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/ModuleInfoBackedContext.java
index b1d3e0ae30c135603d52273c566ee634809beb5d..efe11652ae99f84dbf11010247883c7041a4b9cc 100644 (file)
--- a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/ModuleInfoBackedContext.java
+++ b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/ModuleInfoBackedContext.java
@@ -55,8 +55,24 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Beta
 import org.slf4j.LoggerFactory;
 
 @Beta

-public final class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy
+public class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy

         implements ModuleInfoRegistry, EffectiveModelContextProvider, SchemaSourceProvider<YangTextSchemaSource> {
         implements ModuleInfoRegistry, EffectiveModelContextProvider, SchemaSourceProvider<YangTextSchemaSource> {

+    private static final class WithFallback extends ModuleInfoBackedContext {
+        private final @NonNull ClassLoadingStrategy fallback;
+
+        WithFallback(final ClassLoadingStrategy fallback) {
+            this.fallback = requireNonNull(fallback);
+        }
+
+        @Override
+        Class<?> loadUnknownClass(final String fullyQualifiedName) throws ClassNotFoundException {
+            // We have not found a matching registration, consult the backing strategy
+            final Class<?> cls = fallback.loadClass(fullyQualifiedName);
+            registerImplicitModuleInfo(BindingRuntimeHelpers.extractYangModuleInfo(cls));
+            return cls;
+        }
+    }
+

     private abstract static class AbstractRegisteredModuleInfo {
         final YangTextSchemaSourceRegistration reg;
         final YangModuleInfo info;
     private abstract static class AbstractRegisteredModuleInfo {
         final YangTextSchemaSourceRegistration reg;
         final YangModuleInfo info;


@@ -138,10 +154,8 @@ public final class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy
     private final ListMultimap<SourceIdentifier, AbstractRegisteredModuleInfo> sourceToInfoReg =
             MultimapBuilder.hashKeys().arrayListValues().build();
 
     private final ListMultimap<SourceIdentifier, AbstractRegisteredModuleInfo> sourceToInfoReg =
             MultimapBuilder.hashKeys().arrayListValues().build();
 

-    private final ClassLoadingStrategy backingLoadingStrategy;
-
-    private ModuleInfoBackedContext(final ClassLoadingStrategy loadingStrategy) {
-        this.backingLoadingStrategy = loadingStrategy;
+    ModuleInfoBackedContext() {
+        // Hidden on purpose

     }
 
     @Beta
     }
 
     @Beta


@@ -150,12 +164,16 @@ public final class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy
         return CONTEXT_CACHES.getUnchecked(loadingStrategy).getUnchecked(infos);
     }
 
         return CONTEXT_CACHES.getUnchecked(loadingStrategy).getUnchecked(infos);
     }
 

+    public static ModuleInfoBackedContext create() {
+        return new ModuleInfoBackedContext();
+    }
+

     public static ModuleInfoBackedContext create(final ClassLoadingStrategy loadingStrategy) {
     public static ModuleInfoBackedContext create(final ClassLoadingStrategy loadingStrategy) {

-        return new ModuleInfoBackedContext(loadingStrategy);
+        return new WithFallback(loadingStrategy);

     }
 
     @Override
     }
 
     @Override

-    public EffectiveModelContext getEffectiveModelContext() {
+    public final EffectiveModelContext getEffectiveModelContext() {

         final Optional<? extends EffectiveModelContext> contextOptional = tryToCreateModelContext();
         checkState(contextOptional.isPresent(), "Unable to recreate SchemaContext, error while parsing");
         return contextOptional.get();
         final Optional<? extends EffectiveModelContext> contextOptional = tryToCreateModelContext();
         checkState(contextOptional.isPresent(), "Unable to recreate SchemaContext, error while parsing");
         return contextOptional.get();


@@ -163,7 +181,7 @@ public final class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy
 
     @Override
     @SuppressWarnings("checkstyle:illegalCatch")
 
     @Override
     @SuppressWarnings("checkstyle:illegalCatch")

-    public Class<?> loadClass(final String fullyQualifiedName) throws ClassNotFoundException {
+    public final Class<?> loadClass(final String fullyQualifiedName) throws ClassNotFoundException {

         // This performs an explicit check for binding classes
         final String modulePackageName = BindingReflections.getModelRootPackageName(fullyQualifiedName);
 
         // This performs an explicit check for binding classes
         final String modulePackageName = BindingReflections.getModelRootPackageName(fullyQualifiedName);
 


@@ -174,35 +192,34 @@ public final class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy
                 return ClassLoaderUtils.loadClass(reg.loader, fullyQualifiedName);
             }
 
                 return ClassLoaderUtils.loadClass(reg.loader, fullyQualifiedName);
             }
 

-            // We have not found a matching registration, consult the backing strategy
-            if (backingLoadingStrategy == null) {
-                throw new ClassNotFoundException(fullyQualifiedName);
-            }
-
-            final Class<?> cls = backingLoadingStrategy.loadClass(fullyQualifiedName);
-            registerImplicitModuleInfo(BindingRuntimeHelpers.extractYangModuleInfo(cls));
-            return cls;
+            return loadUnknownClass(fullyQualifiedName);

         }
     }
 
         }
     }
 

+    @Holding("this")
+    Class<?> loadUnknownClass(final String fullyQualifiedName) throws ClassNotFoundException {
+        throw new ClassNotFoundException(fullyQualifiedName);
+    }
+

     @Override
     @Override

-    public synchronized ObjectRegistration<YangModuleInfo> registerModuleInfo(final YangModuleInfo yangModuleInfo) {
+    public final synchronized ObjectRegistration<YangModuleInfo> registerModuleInfo(
+            final YangModuleInfo yangModuleInfo) {

         return register(requireNonNull(yangModuleInfo));
     }
 
     @Override
         return register(requireNonNull(yangModuleInfo));
     }
 
     @Override

-    public ListenableFuture<? extends YangTextSchemaSource> getSource(final SourceIdentifier sourceIdentifier) {
+    public final ListenableFuture<? extends YangTextSchemaSource> getSource(final SourceIdentifier sourceIdentifier) {

         return ctxResolver.getSource(sourceIdentifier);
     }
 
         return ctxResolver.getSource(sourceIdentifier);
     }
 

-    public synchronized void addModuleInfos(final Iterable<? extends YangModuleInfo> moduleInfos) {
+    final synchronized void addModuleInfos(final Iterable<? extends YangModuleInfo> moduleInfos) {

         for (YangModuleInfo yangModuleInfo : moduleInfos) {
             register(requireNonNull(yangModuleInfo));
         }
     }
 
     @Beta
         for (YangModuleInfo yangModuleInfo : moduleInfos) {
             register(requireNonNull(yangModuleInfo));
         }
     }
 
     @Beta

-    public @NonNull BindingRuntimeContext createRuntimeContext(final BindingRuntimeGenerator generator) {
+    public final @NonNull BindingRuntimeContext createRuntimeContext(final BindingRuntimeGenerator generator) {

         return BindingRuntimeContext.create(generator.generateTypeMapping(tryToCreateModelContext().orElseThrow()),
             this);
     }
         return BindingRuntimeContext.create(generator.generateTypeMapping(tryToCreateModelContext().orElseThrow()),
             this);
     }


@@ -210,7 +227,7 @@ public final class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy
     // TODO finish schema parsing and expose as SchemaService
     // Unite with current SchemaService
 
     // TODO finish schema parsing and expose as SchemaService
     // Unite with current SchemaService
 

-    public Optional<? extends EffectiveModelContext> tryToCreateModelContext() {
+    public final Optional<? extends EffectiveModelContext> tryToCreateModelContext() {

         return ctxResolver.getEffectiveModelContext();
     }
 
         return ctxResolver.getEffectiveModelContext();
     }
 


@@ -235,7 +252,7 @@ public final class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy
      * a particular source, we do not create a duplicate registration.
      */
     @Holding("this")
      * a particular source, we do not create a duplicate registration.
      */
     @Holding("this")

-    private void registerImplicitModuleInfo(final @NonNull YangModuleInfo moduleInfo) {
+    final void registerImplicitModuleInfo(final @NonNull YangModuleInfo moduleInfo) {

         for (YangModuleInfo info : flatDependencies(moduleInfo)) {
             final Class<?> infoClass = info.getClass();
             final SourceIdentifier sourceId = sourceIdentifierFrom(info);
         for (YangModuleInfo info : flatDependencies(moduleInfo)) {
             final Class<?> infoClass = info.getClass();
             final SourceIdentifier sourceId = sourceIdentifierFrom(info);


@@ -298,7 +315,7 @@ public final class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy
         return regInfo;
     }
 
         return regInfo;
     }
 

-    synchronized void unregister(final ImmutableList<ExplicitRegisteredModuleInfo> regInfos) {
+    final synchronized void unregister(final ImmutableList<ExplicitRegisteredModuleInfo> regInfos) {

         for (ExplicitRegisteredModuleInfo regInfo : regInfos) {
             if (!regInfo.decRef()) {
                 LOG.debug("Registration {} has references, not removing it", regInfo);
         for (ExplicitRegisteredModuleInfo regInfo : regInfos) {
             if (!regInfo.decRef()) {
                 LOG.debug("Registration {} has references, not removing it", regInfo);