X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-persister-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fpersist%2Fimpl%2FPersisterAggregator.java;h=f168bb36348103525b6895582d73c5c833b3eaed;hb=31ea7166f7cf572b3d2c51e2749bb94e8f8af821;hp=7add448025b51794ef6ed0cc261e6dbd4cb50479;hpb=bab3649670c33b3b12a49c59fc1c5cabcbcb924e;p=controller.git diff --git a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregator.java b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregator.java index 7add448025..f168bb3634 100644 --- a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregator.java +++ b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregator.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.netconf.persist.impl; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder; import org.opendaylight.controller.config.persist.api.Persister; import org.opendaylight.controller.config.persist.api.StorageAdapter; @@ -20,6 +19,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.ListIterator; @@ -34,7 +34,7 @@ import java.util.ListIterator; * Example configuration:
netconf.config.persister.active=2,3 # read startup configuration - netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.DirectoryStorageAdapter + netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.xml.XmlDirectoryStorageAdapter netconf.config.persister.1.properties.fileStorage=configuration/initial/ netconf.config.persister.2.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.FileStorageAdapter @@ -48,7 +48,7 @@ import java.util.ListIterator;* During server startup {@link ConfigPersisterNotificationHandler} requests last snapshot from underlying storages. * Each storage can respond by giving snapshot or absent response. - * The {@link #loadLastConfig()} will search for first non-absent response from storages ordered backwards as user + * The {@link #loadLastConfigs()} will search for first non-absent response from storages ordered backwards as user * specified (first '3', then '2'). * * When a commit notification is received, '2' will be omitted because readonly flag is set to true, so @@ -61,7 +61,7 @@ public final class PersisterAggregator implements Persister { public static class PersisterWithConfiguration { - public final Persister storage; + private final Persister storage; private final boolean readOnly; public PersisterWithConfiguration(Persister storage, boolean readOnly) { @@ -69,6 +69,16 @@ public final class PersisterAggregator implements Persister { this.readOnly = readOnly; } + @VisibleForTesting + public Persister getStorage() { + return storage; + } + + @VisibleForTesting + public boolean isReadOnly() { + return readOnly; + } + @Override public String toString() { return "PersisterWithConfiguration{" + @@ -144,19 +154,29 @@ public final class PersisterAggregator implements Persister { } } + /** + * @return last non-empty result from input persisters + */ @Override - public Optional