X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnorthbound%2Fcontrollermanager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcontrollermanager%2Fnorthbound%2FControllerProperties.java;fp=opendaylight%2Fnorthbound%2Fcontrollermanager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcontrollermanager%2Fnorthbound%2FControllerProperties.java;h=cec5a93a9e04ac79f527f2b22299e75cfd21f60b;hp=3d45257ce21a77e99b6939c6b729cc862b8ab881;hb=b99cd6b7820481c843d74e221253284a1db830be;hpb=d42fd9e9ced129aef69d4df9b685ce6e5ca4ff8f diff --git a/opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java b/opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java index 3d45257ce2..cec5a93a9e 100644 --- a/opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java +++ b/opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java @@ -11,15 +11,17 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; +import org.opendaylight.controller.sal.core.Property; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.opendaylight.controller.sal.core.Property; /** * The class describes set of properties attached to a controller @@ -29,12 +31,12 @@ import org.opendaylight.controller.sal.core.Property; @XmlAccessorType(XmlAccessType.NONE) public class ControllerProperties { - @XmlElementRef - @XmlElementWrapper - @JsonIgnore /** * Set to store the controller properties */ + @XmlElement(name="property") + @XmlElementWrapper + @JsonIgnore private Set properties; // JAXB required constructor