HoneyNode Java 11 support for 121 devices

[transportpce.git] / tests / honeynode / 1.2.1 / minimal-distribution-core / src / main / java / io / fd / honeycomb / infra / distro / data / PersistedConfigInitializerProvider.java

diff --git a/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java b/tests/honeynode/1.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java
similarity index 71%
rename from tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java
rename to tests/honeynode/1.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java
index caa5199192fbc95469b791b2e0774ba44a65ebe7..26b6b87f3fb22694fdde53ab36d2f4acb2cbb75a 100644 (file)
--- a/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java
+++ b/tests/honeynode/1.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java
@@ -16,6 +16,12 @@
 
 package io.fd.honeycomb.infra.distro.data;
 
+import java.nio.file.Paths;
+
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 
@@ -23,30 +29,20 @@ import io.fd.honeycomb.binding.init.ProviderTrait;
 import io.fd.honeycomb.data.init.RestoringInitializer;
 import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration;
 
-import java.nio.file.Paths;
-
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 final class PersistedConfigInitializerProvider extends ProviderTrait<RestoringInitializer> {
-    private static final Logger LOG = LoggerFactory.getLogger(PersistedConfigInitializerProvider.class);
 
     @Inject
-    private SchemaService schemaService;
+    private DOMSchemaService schemaService;
     @Inject
     protected HoneycombConfiguration cfgAttributes;
     @Inject
-//    @Named(ConfigAndOperationalPipelineModule.HONEYCOMB_CONFIG)
-    //mofified to be able to restore config to device config datastore
+    // @Named(HONEYCOMB_CONFIG)
+    // modified to be able to restore config to device config datastore
     @Named("device-databroker")
     private DOMDataBroker domDataBroker;
 
     @Override
     public RestoringInitializer create() {
-        LOG.info("RestoringInitializer ...");
         return new RestoringInitializer(schemaService, Paths.get(cfgAttributes.peristConfigPath), domDataBroker,
                 RestoringInitializer.RestorationType.valueOf(cfgAttributes.persistedConfigRestorationType),
                 LogicalDatastoreType.CONFIGURATION);