Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade enunciate version to 1.28
[controller.git]
/
opendaylight
/
northbound
/
controllermanager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
controllermanager
/
northbound
/
ControllerProperties.java
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 3d45257ce21a77e99b6939c6b729cc862b8ab881..cec5a93a9e04ac79f527f2b22299e75cfd21f60b 100644
(file)
--- 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 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.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement
Ref
;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
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 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
/**
* 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 {
@XmlAccessorType(XmlAccessType.NONE)
public class ControllerProperties {
- @XmlElementRef
- @XmlElementWrapper
- @JsonIgnore
/**
* Set to store the controller properties
*/
/**
* Set to store the controller properties
*/
+ @XmlElement(name="property")
+ @XmlElementWrapper
+ @JsonIgnore
private Set<Property> properties;
// JAXB required constructor
private Set<Property> properties;
// JAXB required constructor