X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-persister-file-xml-adapter%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fpersist%2Fstorage%2Ffile%2Fxml%2Fmodel%2FConfigSnapshot.java;h=7c069dab6b0fb04bbd511fefffbfc5ebf3be6879;hp=41976000ba43d9e0e16ab26f4c2ab0f64020d265;hb=c222e37f2a0f0f3f6266242fbea2d3b018f4e6e3;hpb=d1ab4c3ea79bcd74e02aa9334bc660cb7fc6d037 diff --git a/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/ConfigSnapshot.java b/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/ConfigSnapshot.java index 41976000ba..7c069dab6b 100644 --- a/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/ConfigSnapshot.java +++ b/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/ConfigSnapshot.java @@ -7,19 +7,23 @@ */ package org.opendaylight.controller.config.persist.storage.file.xml.model; +import java.util.TreeSet; import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder; import javax.xml.bind.annotation.XmlAnyElement; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.SortedSet; -@XmlRootElement(name = "snapshot") +@XmlRootElement(name = ConfigSnapshot.SNAPSHOT_ROOT_ELEMENT_NAME) public class ConfigSnapshot { + public static final String SNAPSHOT_ROOT_ELEMENT_NAME = "snapshot"; + private String configSnapshot; - private SortedSet capabilities; + private SortedSet capabilities = new TreeSet<>(); ConfigSnapshot(String configXml, SortedSet capabilities) { this.configSnapshot = configXml; @@ -44,6 +48,7 @@ public class ConfigSnapshot { @XmlElement(name = "capability") @XmlElementWrapper(name = "required-capabilities") + @XmlJavaTypeAdapter(value=StringTrimAdapter.class) public SortedSet getCapabilities() { return capabilities; } @@ -60,4 +65,6 @@ public class ConfigSnapshot { sb.append('}'); return sb.toString(); } + } +