rename cfg-ldr classes before OSGi DS conversion

this will ease the review of the OSGi DS conversion to come
https://wiki.openstack.org/wiki/GitCommitMessages#Structural_split_of_changes

Change-Id: I8a4419d45831f11082623ca696c8b92374643e12
Co-authored-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

diff --git a/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AbstractStatementRegistryTest.java b/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AbstractStatementRegistryTest.java
index f8eb64997c23bdd12b0346aada4232b0ad823f1b..704e644099390fc11680662504b9c70eea2f5e4e 100644 (file)
--- a/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AbstractStatementRegistryTest.java
+++ b/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AbstractStatementRegistryTest.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.protocol.bgp.openconfig.routing.policy.spi;
 
-import static org.opendaylight.bgpcep.config.loader.routing.policy.OpenconfigRoutingPolicyLoader.ROUTING_POLICY_IID;
+import static org.opendaylight.bgpcep.config.loader.routing.policy.OpenconfigRoutingConfigFileProcessor.ROUTING_POLICY_IID;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

diff --git a/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractStatementRegistryConsumerTest.java b/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractStatementRegistryConsumerTest.java
index cc2791073da1da719ac155d119e81fd3a46704e7..453fe004e94f4162ecd23bfe12c1400a3169a495 100644 (file)
--- a/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractStatementRegistryConsumerTest.java
+++ b/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractStatementRegistryConsumerTest.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.protocol.bgp.openconfig.routing.policy.statement;
 
-import static org.opendaylight.bgpcep.config.loader.routing.policy.OpenconfigRoutingPolicyLoader.ROUTING_POLICY_IID;
+import static org.opendaylight.bgpcep.config.loader.routing.policy.OpenconfigRoutingConfigFileProcessor.ROUTING_POLICY_IID;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

diff --git a/config-loader/bmp-monitors-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/bmp/BmpMonitorConfigFileProcessorTest.java b/config-loader/bmp-monitors-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/bmp/BmpMonitorConfigFileProcessorTest.java
index 0ccc4dbd5dc1e299081cf797a4718ac399473be5..9c8013c843a1f4007191fa53d842c4fa2fedaed4 100644 (file)
--- a/config-loader/bmp-monitors-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/bmp/BmpMonitorConfigFileProcessorTest.java
+++ b/config-loader/bmp-monitors-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/bmp/BmpMonitorConfigFileProcessorTest.java
@@ -16,11 +16,11 @@ import static org.opendaylight.protocol.util.CheckUtil.checkPresentConfiguration
 
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoader;
+import org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoaderTest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.monitor.config.rev200120.OdlBmpMonitors;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
-public class BmpMonitorConfigFileProcessorTest extends AbstractConfigLoader {
+public class BmpMonitorConfigFileProcessorTest extends AbstractConfigLoaderTest {
 
     @Override
     @Before

diff --git a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImpl.java b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java
similarity index 94%
rename from config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImpl.java
rename to config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java
index 516ce6c24de4958806141a54f9038d265dc8bf8c..feb0a1c4d839594d3f011e8f64b06e42c980aeb1 100644 (file)
--- a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImpl.java
+++ b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java
@@ -48,8 +48,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
-public final class ConfigLoaderImpl implements ConfigLoader, AutoCloseable {
-    private static final Logger LOG = LoggerFactory.getLogger(ConfigLoaderImpl.class);
+public final class AbstractConfigLoader implements ConfigLoader, AutoCloseable {
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractConfigLoader.class);
     private static final String INTERRUPTED = "InterruptedException";
     private static final String EXTENSION = "-.*\\.xml";
     private static final String INITIAL = "^";
@@ -65,7 +65,7 @@ public final class ConfigLoaderImpl implements ConfigLoader, AutoCloseable {
     @GuardedBy("this")
     private boolean closed = false;
 
-    public ConfigLoaderImpl(final EffectiveModelContext schemaContext,
+    public AbstractConfigLoader(final EffectiveModelContext schemaContext,
             final BindingNormalizedNodeSerializer bindingSerializer, final FileWatcher fileWatcher) {
         this.schemaContext = requireNonNull(schemaContext);
         this.bindingSerializer = requireNonNull(bindingSerializer);
@@ -158,8 +158,8 @@ public final class ConfigLoaderImpl implements ConfigLoader, AutoCloseable {
         return new AbstractRegistration() {
             @Override
             protected void removeRegistration() {
-                synchronized (ConfigLoaderImpl.this) {
-                    ConfigLoaderImpl.this.configServices.remove(pattern);
+                synchronized (AbstractConfigLoader.this) {
+                    AbstractConfigLoader.this.configServices.remove(pattern);
                 }
             }
         };
@@ -198,7 +198,7 @@ public final class ConfigLoaderImpl implements ConfigLoader, AutoCloseable {
             try {
                 key = this.watchService.take();
             } catch (final InterruptedException | ClosedWatchServiceException e) {
-                if (!ConfigLoaderImpl.this.closed) {
+                if (!AbstractConfigLoader.this.closed) {
                     LOG.warn(INTERRUPTED, e);
                     Thread.currentThread().interrupt();
                 }
@@ -219,7 +219,7 @@ public final class ConfigLoaderImpl implements ConfigLoader, AutoCloseable {
         }
 
         private synchronized void handleEvent(final String filename) {
-            ConfigLoaderImpl.this.configServices.entrySet().stream()
+            AbstractConfigLoader.this.configServices.entrySet().stream()
                     .filter(entry -> Pattern.matches(entry.getKey(), filename))
                     .forEach(entry -> handleConfigFile(entry.getValue(), filename));
         }

diff --git a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherImpl.java b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/DefaultFileWatcher.java
similarity index 87%
rename from config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherImpl.java
rename to config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/DefaultFileWatcher.java
index 3839579c2f62068e4aa8a49d80f7ae1521fefcfb..f88b37493bc864d31eadc50d8f7f05ad5b988b97 100644 (file)
--- a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherImpl.java
+++ b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/DefaultFileWatcher.java
@@ -19,14 +19,14 @@ import java.nio.file.WatchService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public final class FileWatcherImpl implements FileWatcher, AutoCloseable {
-    private static final Logger LOG = LoggerFactory.getLogger(FileWatcherImpl.class);
+public final class DefaultFileWatcher implements FileWatcher, AutoCloseable {
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultFileWatcher.class);
     private static final String INTERRUPTED = "InterruptedException";
     //BGPCEP config folder OS agnostic path
     private static final Path PATH = Paths.get("etc","opendaylight","bgpcep");
     private final WatchService watchService;
 
-    public FileWatcherImpl() throws IOException {
+    public DefaultFileWatcher() throws IOException {
         this.watchService = FileSystems.getDefault().newWatchService();
         final File file = new File(PATH.toString());
         if (!file.exists()) {
@@ -38,7 +38,7 @@ public final class FileWatcherImpl implements FileWatcher, AutoCloseable {
 
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             try {
-                FileWatcherImpl.this.watchService.close();
+                DefaultFileWatcher.this.watchService.close();
             } catch (final IOException e) {
                 LOG.warn(INTERRUPTED, e);
             }

diff --git a/config-loader/config-loader-impl/src/main/resources/OSGI-INF/blueprint/config-loader-impl.xml b/config-loader/config-loader-impl/src/main/resources/OSGI-INF/blueprint/config-loader-impl.xml
index 3e27fb7f14ab5bc4c5c337486ad73512477f3f2e..337f4e7c7d4dcfbe89fda5e2115e9a73c3d3bfe3 100644 (file)
--- a/config-loader/config-loader-impl/src/main/resources/OSGI-INF/blueprint/config-loader-impl.xml
+++ b/config-loader/config-loader-impl/src/main/resources/OSGI-INF/blueprint/config-loader-impl.xml
@@ -12,10 +12,10 @@
     <odl:static-reference id="mappingCodec"
                           interface="org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer"/>
 
-    <bean id="filewatcher" class="org.opendaylight.bgpcep.config.loader.impl.FileWatcherImpl"
+    <bean id="filewatcher" class="org.opendaylight.bgpcep.config.loader.impl.DefaultFileWatcher"
           destroy-method="close"/>
 
-    <bean id="configLoader" class="org.opendaylight.bgpcep.config.loader.impl.ConfigLoaderImpl"
+    <bean id="configLoader" class="org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoader"
           init-method="init"
           destroy-method="close">
         <argument>
@@ -26,4 +26,4 @@
     </bean>
 
     <service ref="configLoader" interface="org.opendaylight.bgpcep.config.loader.spi.ConfigLoader"/>
-</blueprint>
\ No newline at end of file
+</blueprint>

diff --git a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoaderTest.java
similarity index 92%
rename from config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java
rename to config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoaderTest.java
index 002ecf5a93d9b7fbe7022154ba489ba671299bbb..e7e683836c844e1f7beb07eb4c38285931757534 100644 (file)
--- a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoader.java
+++ b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/AbstractConfigLoaderTest.java
@@ -27,10 +27,10 @@ import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBro
 import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 
-public abstract class AbstractConfigLoader extends AbstractConcurrentDataBrokerTest {
+public abstract class AbstractConfigLoaderTest extends AbstractConcurrentDataBrokerTest {
     @GuardedBy("this")
     private final List<WatchEvent<?>> eventList = new CopyOnWriteArrayList<>();
-    protected ConfigLoaderImpl configLoader;
+    protected AbstractConfigLoader configLoader;
     @Mock
     private WatchService watchService;
     @Mock
@@ -44,7 +44,7 @@ public abstract class AbstractConfigLoader extends AbstractConcurrentDataBrokerT
     protected AdapterContext mappingService;
     protected DOMSchemaService schemaService;
 
-    public AbstractConfigLoader() {
+    public AbstractConfigLoaderTest() {
         super(true);
     }
 
@@ -63,7 +63,7 @@ public abstract class AbstractConfigLoader extends AbstractConcurrentDataBrokerT
             clearEvent();
             return null;
         }).when(this.processor).loadConfiguration(any());
-        this.configLoader = new ConfigLoaderImpl(getSchemaContext(), this.mappingService.currentSerializer(),
+        this.configLoader = new AbstractConfigLoader(getSchemaContext(), this.mappingService.currentSerializer(),
             this.fileWatcher);
         this.configLoader.init();
     }

diff --git a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java
index 79c02bd0896c3fa767be431eae7e04a301aa764d..4ccee171c1620f108745f767b6845f5035d7733a 100644 (file)
--- a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java
+++ b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.re
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
-public class ConfigLoaderImplTest extends AbstractConfigLoader {
+public class ConfigLoaderImplTest extends AbstractConfigLoaderTest {
     @Override
     @Before
     public void setUp() throws Exception {
@@ -51,4 +51,4 @@ public class ConfigLoaderImplTest extends AbstractConfigLoader {
         triggerEvent("protocols-config.xml");
         verify(this.processor, timeout(20000).times(2)).loadConfiguration(any());
     }
-}
\ No newline at end of file
+}

diff --git a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherTest.java b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/DefaultWatcherTest.java
similarity index 88%
rename from config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherTest.java
rename to config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/DefaultWatcherTest.java
index 942ecaee6793bbe4bde4c74d3afce53cc03bd5e7..5475761b15b131f0ced0ae5a5044066beb0877ba 100644 (file)
--- a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherTest.java
+++ b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/DefaultWatcherTest.java
@@ -13,12 +13,12 @@ import static org.junit.Assert.assertNotNull;
 import java.io.File;
 import org.junit.Test;
 
-public class FileWatcherTest {
+public class DefaultWatcherTest {
     private static final String PATH = String.join(File.separator, "etc", "opendaylight", "bgpcep");
 
     @Test
     public void bgpFileWatcherTest() throws Exception {
-        final FileWatcherImpl bgpFileWatcher = new FileWatcherImpl();
+        final DefaultFileWatcher bgpFileWatcher = new DefaultFileWatcher();
         assertEquals(PATH, bgpFileWatcher.getPathFile());
         assertNotNull(bgpFileWatcher.getWatchService());
         bgpFileWatcher.close();

diff --git a/config-loader/protocols-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/protocols/ProtocolsConfigFileProcessorTest.java b/config-loader/protocols-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/protocols/ProtocolsConfigFileProcessorTest.java
index 4f8b3164be635fd8fa9faed75ef225069393aa17..f970410ca1fe4220bea256ab5362c9de4d9c3bb0 100644 (file)
--- a/config-loader/protocols-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/protocols/ProtocolsConfigFileProcessorTest.java
+++ b/config-loader/protocols-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/protocols/ProtocolsConfigFileProcessorTest.java
@@ -14,13 +14,13 @@ import static org.opendaylight.protocol.util.CheckUtil.checkNotPresentConfigurat
 import static org.opendaylight.protocol.util.CheckUtil.checkPresentConfiguration;
 
 import org.junit.Test;
-import org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoader;
+import org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoaderTest;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.NetworkInstances;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.NetworkInstance;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.Protocols;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
-public class ProtocolsConfigFileProcessorTest extends AbstractConfigLoader {
+public class ProtocolsConfigFileProcessorTest extends AbstractConfigLoaderTest {
     @Test
     public void configFileTest() throws Exception {
         checkNotPresentConfiguration(getDataBroker(), BGP_PROTOCOLS_IID);
@@ -35,4 +35,4 @@ public class ProtocolsConfigFileProcessorTest extends AbstractConfigLoader {
                 processor.getSchemaPath());
         processor.close();
     }
-}
\ No newline at end of file
+}

diff --git a/config-loader/routing-policy-config-loader/src/main/java/org/opendaylight/bgpcep/config/loader/routing/policy/OpenconfigRoutingPolicyLoader.java b/config-loader/routing-policy-config-loader/src/main/java/org/opendaylight/bgpcep/config/loader/routing/policy/OpenconfigRoutingConfigFileProcessor.java
similarity index 93%
rename from config-loader/routing-policy-config-loader/src/main/java/org/opendaylight/bgpcep/config/loader/routing/policy/OpenconfigRoutingPolicyLoader.java
rename to config-loader/routing-policy-config-loader/src/main/java/org/opendaylight/bgpcep/config/loader/routing/policy/OpenconfigRoutingConfigFileProcessor.java
index b698d4734beee35cab0bb960090407783299e914..d045aec9dc8dd885ab6a76fde4ed7f1a9034aae8 100644 (file)
--- a/config-loader/routing-policy-config-loader/src/main/java/org/opendaylight/bgpcep/config/loader/routing/policy/OpenconfigRoutingPolicyLoader.java
+++ b/config-loader/routing-policy-config-loader/src/main/java/org/opendaylight/bgpcep/config/loader/routing/policy/OpenconfigRoutingConfigFileProcessor.java
@@ -26,10 +26,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public final class OpenconfigRoutingPolicyLoader implements ConfigFileProcessor, AutoCloseable {
+public final class OpenconfigRoutingConfigFileProcessor implements ConfigFileProcessor, AutoCloseable {
     public static final InstanceIdentifier<RoutingPolicy> ROUTING_POLICY_IID
             = InstanceIdentifier.create(RoutingPolicy.class);
-    private static final Logger LOG = LoggerFactory.getLogger(OpenconfigRoutingPolicyLoader.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OpenconfigRoutingConfigFileProcessor.class);
     private static final SchemaPath POLICY_SCHEMA_PATH = SchemaPath.create(true, RoutingPolicy.QNAME);
     private final BindingNormalizedNodeSerializer bindingSerializer;
     private final ConfigLoader configLoader;
@@ -38,7 +38,7 @@ public final class OpenconfigRoutingPolicyLoader implements ConfigFileProcessor,
     @GuardedBy("this")
     private AbstractRegistration registration;
 
-    public OpenconfigRoutingPolicyLoader(final ConfigLoader configLoader, final DataBroker dataBroker) {
+    public OpenconfigRoutingConfigFileProcessor(final ConfigLoader configLoader, final DataBroker dataBroker) {
         requireNonNull(configLoader);
         this.configLoader = requireNonNull(configLoader);
         this.dataBroker = requireNonNull(dataBroker);

diff --git a/config-loader/routing-policy-config-loader/src/main/resources/OSGI-INF/blueprint/routing-policy-config-loader.xml b/config-loader/routing-policy-config-loader/src/main/resources/OSGI-INF/blueprint/routing-policy-config-loader.xml
index d1b26bac1e0360c22810e9e1295e35748835f629..6ce139dba4c05d3f158f0fa846d0863e452bae91 100644 (file)
--- a/config-loader/routing-policy-config-loader/src/main/resources/OSGI-INF/blueprint/routing-policy-config-loader.xml
+++ b/config-loader/routing-policy-config-loader/src/main/resources/OSGI-INF/blueprint/routing-policy-config-loader.xml
@@ -13,7 +13,7 @@
     <reference id="configLoader" interface="org.opendaylight.bgpcep.config.loader.spi.ConfigLoader"/>
 
     <bean id="rpConfigFileProcessor"
-          class="org.opendaylight.bgpcep.config.loader.routing.policy.OpenconfigRoutingPolicyLoader"
+          class="org.opendaylight.bgpcep.config.loader.routing.policy.OpenconfigRoutingConfigFileProcessor"
           init-method="init"
           destroy-method="close">
         <argument ref="configLoader"/>

diff --git a/config-loader/routing-policy-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/routing/policy/AbstractOpenconfigRoutingPolicyLoaderTest.java b/config-loader/routing-policy-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/routing/policy/AbstractOpenconfigRoutingPolicyLoaderTest.java
index 48283f88c1fe204cdb7f5006c3a8a2b888263dea..441921693c326d06fc4cfb8e3d9c6ef1144e1077 100644 (file)
--- a/config-loader/routing-policy-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/routing/policy/AbstractOpenconfigRoutingPolicyLoaderTest.java
+++ b/config-loader/routing-policy-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/routing/policy/AbstractOpenconfigRoutingPolicyLoaderTest.java
@@ -8,16 +8,16 @@
 package org.opendaylight.bgpcep.config.loader.routing.policy;
 
 import static org.junit.Assert.assertNotNull;
-import static org.opendaylight.bgpcep.config.loader.routing.policy.OpenconfigRoutingPolicyLoader.ROUTING_POLICY_IID;
+import static org.opendaylight.bgpcep.config.loader.routing.policy.OpenconfigRoutingConfigFileProcessor.ROUTING_POLICY_IID;
 import static org.opendaylight.protocol.util.CheckUtil.checkNotPresentConfiguration;
 import static org.opendaylight.protocol.util.CheckUtil.checkPresentConfiguration;
 
 import org.junit.After;
 import org.junit.Before;
-import org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoader;
+import org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoaderTest;
 
-public class AbstractOpenconfigRoutingPolicyLoaderTest extends AbstractConfigLoader {
-    OpenconfigRoutingPolicyLoader policyLoader;
+public class AbstractOpenconfigRoutingPolicyLoaderTest extends AbstractConfigLoaderTest {
+    OpenconfigRoutingConfigFileProcessor policyLoader;
 
     @Override
     @Before
@@ -25,7 +25,7 @@ public class AbstractOpenconfigRoutingPolicyLoaderTest extends AbstractConfigLoa
         super.setUp();
         checkNotPresentConfiguration(getDataBroker(), ROUTING_POLICY_IID);
         assertNotNull(ClassLoader.getSystemClassLoader().getResource("initial/routing-policy-config.xml"));
-        this.policyLoader = new OpenconfigRoutingPolicyLoader(this.configLoader, getDataBroker());
+        this.policyLoader = new OpenconfigRoutingConfigFileProcessor(this.configLoader, getDataBroker());
         this.policyLoader.init();
         checkPresentConfiguration(getDataBroker(), ROUTING_POLICY_IID);
         this.policyLoader.close();

diff --git a/config-loader/topology-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/topology/NetworkTopologyConfigFileProcessorTest.java b/config-loader/topology-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/topology/NetworkTopologyConfigFileProcessorTest.java
index c69ea3e2e47eb36f7979877ce8319894330c6556..7c1099396f22fa8452051ff8430e61a5063004ea 100644 (file)
--- a/config-loader/topology-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/topology/NetworkTopologyConfigFileProcessorTest.java
+++ b/config-loader/topology-config-loader/src/test/java/org/opendaylight/bgpcep/config/loader/topology/NetworkTopologyConfigFileProcessorTest.java
@@ -14,7 +14,7 @@ import static org.opendaylight.protocol.util.CheckUtil.checkPresentConfiguration
 
 import java.util.concurrent.ExecutionException;
 import org.junit.Test;
-import org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoader;
+import org.opendaylight.bgpcep.config.loader.impl.AbstractConfigLoaderTest;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
-public class NetworkTopologyConfigFileProcessorTest extends AbstractConfigLoader {
+public class NetworkTopologyConfigFileProcessorTest extends AbstractConfigLoaderTest {
     @Test
     public void configFileTest() throws InterruptedException, ExecutionException {
         final KeyedInstanceIdentifier<Topology, TopologyKey> topologyIIdKeyed =
@@ -40,4 +40,4 @@ public class NetworkTopologyConfigFileProcessorTest extends AbstractConfigLoader
         assertEquals(SchemaPath.create(true, NetworkTopology.QNAME), processor.getSchemaPath());
         processor.close();
     }
-}
\ No newline at end of file
+}