From 8728fdcb1311898be533e4ec5e82602630138843 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Wed, 9 Jul 2014 12:47:28 +0200 Subject: [PATCH] Bug 1223: Cleaned up BindingTestContext from unsupported components. Change-Id: I26123a2a9d56c85dcc329fda0727e7e3e664c829 Signed-off-by: Tony Tkacik --- .../md-sal/sal-binding-broker/pom.xml | 5 - .../binding/test/AbstractDataServiceTest.java | 17 +-- .../test/util/BindingBrokerTestFactory.java | 2 + .../binding/test/util/BindingTestContext.java | 119 +++--------------- .../test/bugfix/DOMCodecBug02Test.java | 1 - 5 files changed, 22 insertions(+), 122 deletions(-) diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index 8e286391de..f7256c62f6 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -79,11 +79,6 @@ org.opendaylight.yangtools.model ietf-inet-types - - org.reflections - reflections - compile - org.slf4j slf4j-api diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java index 6c80f4d739..591e07d004 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java @@ -7,28 +7,21 @@ */ package org.opendaylight.controller.sal.binding.test; -import org.junit.After; import org.junit.Before; import org.opendaylight.controller.sal.binding.api.data.DataProviderService; import org.opendaylight.controller.sal.binding.test.util.BindingBrokerTestFactory; import org.opendaylight.controller.sal.binding.test.util.BindingTestContext; -import org.opendaylight.controller.sal.core.api.data.DataStore; -import org.opendaylight.controller.sal.dom.broker.impl.DataStoreStatsWrapper; import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +@SuppressWarnings("deprecation") public abstract class AbstractDataServiceTest { - private static Logger log = LoggerFactory.getLogger(AbstractDataServiceTest.class); protected org.opendaylight.controller.sal.core.api.data.DataProviderService biDataService; protected DataProviderService baDataService; protected BindingIndependentMappingService mappingService; - private DataStoreStatsWrapper dataStoreStats; - protected DataStore dataStore; protected BindingTestContext testContext; @Before @@ -42,18 +35,10 @@ public abstract class AbstractDataServiceTest { baDataService = testContext.getBindingDataBroker(); biDataService = testContext.getDomDataBroker(); - dataStore = testContext.getDomDataStore(); mappingService = testContext.getBindingToDomMappingService(); } protected boolean getStartWithSchema() { return true; } - - @After - public void afterTest() { - - testContext.logDataStoreStatistics(); - - } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java index 08c5d061dc..c58e258e8b 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java @@ -11,10 +11,12 @@ import java.util.concurrent.ExecutorService; import javassist.ClassPool; +import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +@Beta public class BindingBrokerTestFactory { private static final ClassPool CLASS_POOL = ClassPool.getDefault(); diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java index 8ba709ad30..f5e902c775 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java @@ -9,9 +9,6 @@ package org.opendaylight.controller.sal.binding.test.util; import static com.google.common.base.Preconditions.checkState; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; import java.util.Set; import java.util.concurrent.Future; @@ -41,36 +38,33 @@ import org.opendaylight.controller.sal.core.api.BrokerService; import org.opendaylight.controller.sal.core.api.RpcImplementation; import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry; import org.opendaylight.controller.sal.core.api.RpcRegistrationListener; -import org.opendaylight.controller.sal.core.api.data.DataStore; import org.opendaylight.controller.sal.core.api.mount.MountProvisionService; import org.opendaylight.controller.sal.core.spi.data.DOMStore; import org.opendaylight.controller.sal.dom.broker.BrokerImpl; import org.opendaylight.controller.sal.dom.broker.MountPointManagerImpl; -import org.opendaylight.controller.sal.dom.broker.impl.DataStoreStatsWrapper; -import org.opendaylight.controller.sal.dom.broker.impl.HashMapDataStore; -import org.opendaylight.controller.sal.dom.broker.impl.SchemaAwareDataStoreAdapter; import org.opendaylight.controller.sal.dom.broker.impl.SchemaAwareRpcBroker; import org.opendaylight.yangtools.concepts.ListenerRegistration; +import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; import org.opendaylight.yangtools.sal.binding.generator.impl.RuntimeGeneratedMappingServiceImpl; +import org.opendaylight.yangtools.yang.binding.YangModuleInfo; +import org.opendaylight.yangtools.yang.binding.util.BindingReflections; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; -import org.reflections.Reflections; -import org.reflections.scanners.ResourcesScanner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Predicate; +import com.google.common.annotations.Beta; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.MutableClassToInstanceMap; import com.google.common.util.concurrent.ListeningExecutorService; +@Beta public class BindingTestContext implements AutoCloseable { public static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier TREE_ROOT = org.opendaylight.yangtools.yang.data.api.InstanceIdentifier @@ -86,14 +80,9 @@ public class BindingTestContext implements AutoCloseable { private BindingIndependentConnector baConnectImpl; private org.opendaylight.controller.sal.dom.broker.DataBrokerImpl biDataImpl; + @SuppressWarnings("deprecation") private org.opendaylight.controller.sal.core.api.data.DataProviderService biDataLegacyBroker; private BrokerImpl biBrokerImpl; - private HashMapDataStore rawDataStore; - private SchemaAwareDataStoreAdapter schemaAwareDataStore; - private DataStoreStatsWrapper dataStoreStats; - private DataStore dataStore; - - private final boolean dataStoreStatisticsEnabled = false; private final ListeningExecutorService executor; private final ClassPool classPool; @@ -108,6 +97,7 @@ public class BindingTestContext implements AutoCloseable { private BackwardsCompatibleDataBroker biCompatibleBroker; + @SuppressWarnings("deprecation") private DataProviderService baData; private DOMDataBroker newDOMDataBroker; @@ -128,25 +118,6 @@ public class BindingTestContext implements AutoCloseable { this.startWithSchema = startWithSchema; } - @Deprecated - public void startDomDataStore() { - checkState(dataStore == null, "DataStore already started."); - checkState(biDataImpl != null, "Dom Data Broker not present"); - rawDataStore = new HashMapDataStore(); - schemaAwareDataStore = new SchemaAwareDataStoreAdapter(); - schemaAwareDataStore.changeDelegate(rawDataStore); - if (dataStoreStatisticsEnabled) { - dataStoreStats = new DataStoreStatsWrapper(schemaAwareDataStore); - dataStore = dataStoreStats; - } else { - dataStore = schemaAwareDataStore; - } - mockSchemaService.registerSchemaServiceListener(schemaAwareDataStore); - biDataImpl.registerConfigurationReader(TREE_ROOT, dataStore); - biDataImpl.registerOperationalReader(TREE_ROOT, dataStore); - biDataImpl.registerCommitHandler(TREE_ROOT, dataStore); - } - public void startDomDataBroker() { checkState(executor != null, "Executor needs to be set"); biDataImpl = new org.opendaylight.controller.sal.dom.broker.DataBrokerImpl(); @@ -213,6 +184,7 @@ public class BindingTestContext implements AutoCloseable { private ProviderSession createMockContext() { + @SuppressWarnings("deprecation") final ClassToInstanceMap domBrokerServices = ImmutableClassToInstanceMap . builder() // @@ -277,47 +249,14 @@ public class BindingTestContext implements AutoCloseable { mockSchemaService.registerSchemaServiceListener(mappingServiceImpl); } - public void updateYangSchema(final String[] files) { - mockSchemaService.changeSchema(getContext(files)); + private void updateYangSchema(final ImmutableSet moduleInfos) { + mockSchemaService.changeSchema(getContext(moduleInfos)); } - public static String[] getAllYangFilesOnClasspath() { - Predicate predicate = new Predicate() { - @Override - public boolean apply(final String input) { - return input.endsWith(".yang"); - } - }; - Reflections reflection = new Reflections("META-INF.yang", new ResourcesScanner()); - Set result = reflection.getResources(predicate); - return result.toArray(new String[result.size()]); - } - - private static SchemaContext getContext(final String[] yangFiles) { - ClassLoader loader = BindingTestContext.class.getClassLoader(); - List streams = new ArrayList<>(); - for (String string : yangFiles) { - InputStream stream = loader.getResourceAsStream(string); - streams.add(stream); - } - YangParserImpl parser = new YangParserImpl(); - Set modules = parser.parseYangModelsFromStreams(streams); - return parser.resolveSchemaContext(modules); - } - - public void startLegacy() { - startBindingDataBroker(); - startBindingNotificationBroker(); - startBindingBroker(); - startDomDataBroker(); - startDomDataStore(); - startDomBroker(); - startDomMountPoint(); - startBindingToDomMappingService(); - startForwarding(); - if (startWithSchema) { - loadYangSchemaFromClasspath(); - } + private SchemaContext getContext(final ImmutableSet moduleInfos) { + ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create(); + ctx.addModuleInfos(moduleInfos); + return ctx.tryToCreateSchemaContext().get(); } public void start() { @@ -363,44 +302,24 @@ public class BindingTestContext implements AutoCloseable { } public void loadYangSchemaFromClasspath() { - String[] files = getAllYangFilesOnClasspath(); - updateYangSchema(files); + ImmutableSet moduleInfos = BindingReflections.loadModuleInfos(); + updateYangSchema(moduleInfos); } + @SuppressWarnings("deprecation") public DataProviderService getBindingDataBroker() { return baData; } + @SuppressWarnings("deprecation") public org.opendaylight.controller.sal.core.api.data.DataProviderService getDomDataBroker() { return biDataLegacyBroker; } - public DataStore getDomDataStore() { - return dataStore; - } - public BindingIndependentMappingService getBindingToDomMappingService() { return mappingServiceImpl; } - public void logDataStoreStatistics() { - if (dataStoreStats == null) { - return; - } - - LOG.info("BIDataStore Statistics: Configuration Read Count: {} TotalTime: {} ms AverageTime (ns): {} ms", - dataStoreStats.getConfigurationReadCount(), dataStoreStats.getConfigurationReadTotalTime(), - dataStoreStats.getConfigurationReadAverageTime()); - - LOG.info("BIDataStore Statistics: Operational Read Count: {} TotalTime: {} ms AverageTime (ns): {} ms", - dataStoreStats.getOperationalReadCount(), dataStoreStats.getOperationalReadTotalTime(), - dataStoreStats.getOperationalReadAverageTime()); - - LOG.info("BIDataStore Statistics: Request Commit Count: {} TotalTime: {} ms AverageTime (ns): {} ms", - dataStoreStats.getRequestCommitCount(), dataStoreStats.getRequestCommitTotalTime(), - dataStoreStats.getRequestCommitAverageTime()); - } - public RpcProviderRegistry getBindingRpcRegistry() { return baBrokerImpl.getRoot(); } diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug02Test.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug02Test.java index 75d48612b8..bddbc4e954 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug02Test.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug02Test.java @@ -54,7 +54,6 @@ public class DOMCodecBug02Test extends AbstractDataServiceTest { baDataService = testContext.getBindingDataBroker(); biDataService = testContext.getDomDataBroker(); - dataStore = testContext.getDomDataStore(); mappingService = testContext.getBindingToDomMappingService(); }; -- 2.36.6