From aa6b061f9c4191acb509a4d9250110973c7dc6d0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 19 Jul 2020 17:23:37 +0200 Subject: [PATCH] Deprecate binding.runtime.spi constructs GeneratedClassLoadingStrategy is a relic, superseded by ClassLoadingStrategy interface. Deprecate it for removal. ModuleInfoBackedContext is an internal implementation detail, which should not be used outside fo runtime-spi. Deprecate it for removal. Change-Id: I520b7aa2bd60080e03c41f55087a5a9eca65ea8f Signed-off-by: Robert Varga --- .../binding/dom/adapter/test/AbstractSchemaAwareTest.java | 8 ++------ .../binding/runtime/spi/DefaultModuleInfoSnapshot.java | 2 +- .../runtime/spi/GeneratedClassLoadingStrategy.java | 1 + .../binding/runtime/spi/ModuleInfoBackedContext.java | 1 + 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractSchemaAwareTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractSchemaAwareTest.java index 05a3c46922..2b4c51a58e 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractSchemaAwareTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractSchemaAwareTest.java @@ -10,11 +10,9 @@ package org.opendaylight.mdsal.binding.dom.adapter.test; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.google.common.collect.ImmutableSet; import java.util.Set; import org.junit.Before; -import org.opendaylight.binding.runtime.spi.GeneratedClassLoadingStrategy; -import org.opendaylight.binding.runtime.spi.ModuleInfoBackedContext; +import org.opendaylight.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; @@ -25,9 +23,7 @@ public abstract class AbstractSchemaAwareTest { new CacheLoader, EffectiveModelContext>() { @Override public EffectiveModelContext load(final Set key) { - return ModuleInfoBackedContext.cacheContext( - GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), ImmutableSet.copyOf(key)) - .tryToCreateModelContext().get(); + return BindingRuntimeHelpers.createEffectiveModel(key); } }); diff --git a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/DefaultModuleInfoSnapshot.java b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/DefaultModuleInfoSnapshot.java index 87c2e4308a..2750b67ebe 100644 --- a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/DefaultModuleInfoSnapshot.java +++ b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/DefaultModuleInfoSnapshot.java @@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.model.repo.api.MissingSchemaSourceExcepti import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; -final class DefaultModuleInfoSnapshot extends GeneratedClassLoadingStrategy implements ModuleInfoSnapshot { +final class DefaultModuleInfoSnapshot implements ModuleInfoSnapshot { private final ImmutableMap moduleInfos; private final ImmutableMap classLoaders; private final @NonNull EffectiveModelContext effectiveModel; diff --git a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/GeneratedClassLoadingStrategy.java b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/GeneratedClassLoadingStrategy.java index 44ba6cd39a..22226781d3 100644 --- a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/GeneratedClassLoadingStrategy.java +++ b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/binding/runtime/spi/GeneratedClassLoadingStrategy.java @@ -13,6 +13,7 @@ import org.opendaylight.binding.runtime.api.ClassLoadingStrategy; import org.opendaylight.yangtools.util.ClassLoaderUtils; @Beta +@Deprecated(forRemoval = true) public abstract class GeneratedClassLoadingStrategy implements ClassLoadingStrategy { private static final class AlwaysFailClassLoadingStrategy extends GeneratedClassLoadingStrategy { static final @NonNull AlwaysFailClassLoadingStrategy INSTANCE = new AlwaysFailClassLoadingStrategy(); 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 31de1aac18..0516532b7d 100644 --- 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 @@ -35,6 +35,7 @@ import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceProvider; import org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver; @Beta +@Deprecated(forRemoval = true) public class ModuleInfoBackedContext extends AbstractModuleInfoTracker implements ClassLoadingStrategy, EffectiveModelContextProvider, SchemaSourceProvider { private static final class WithFallback extends ModuleInfoBackedContext { -- 2.36.6