Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 1616: Issues with using container and default values in config yang"
[controller.git]
/
opendaylight
/
netconf
/
config-netconf-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
confignetconfconnector
/
mapping
/
attributes
/
fromxml
/
AttributeConfigElement.java
diff --git
a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java
b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java
index dbc1b48d4f9abebe5fc89c306f65b68fcee924d2..2b081258c42014e880846330994ea2dbb84147b8 100644
(file)
--- a/
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java
+++ b/
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java
@@
-9,6
+9,7
@@
package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml;
import com.google.common.base.Optional;
package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml;
import com.google.common.base.Optional;
+import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.resolving.AttributeResolvingStrategy;
import javax.management.openmbean.OpenType;
import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.resolving.AttributeResolvingStrategy;
import javax.management.openmbean.OpenType;
@@
-18,15
+19,15
@@
import javax.management.openmbean.OpenType;
* of some module. Contains default value extracted from yang file.
*/
public class AttributeConfigElement {
* of some module. Contains default value extracted from yang file.
*/
public class AttributeConfigElement {
- private final Object d
a
faultValue;
+ private final Object d
e
faultValue;
private final Object value;
private Optional<?> resolvedValue;
private Object resolvedDefaultValue;
private String jmxName;
private final Object value;
private Optional<?> resolvedValue;
private Object resolvedDefaultValue;
private String jmxName;
- public AttributeConfigElement(Object d
a
faultValue, Object value) {
- this.d
afaultValue = da
faultValue;
+ public AttributeConfigElement(Object d
e
faultValue, Object value) {
+ this.d
efaultValue = de
faultValue;
this.value = value;
}
this.value = value;
}
@@
-39,9
+40,9
@@
public class AttributeConfigElement {
}
public void resolveValue(AttributeResolvingStrategy<?, ? extends OpenType<?>> attributeResolvingStrategy,
}
public void resolveValue(AttributeResolvingStrategy<?, ? extends OpenType<?>> attributeResolvingStrategy,
- String attrName) {
+ String attrName)
throws NetconfDocumentedException
{
resolvedValue = attributeResolvingStrategy.parseAttribute(attrName, value);
resolvedValue = attributeResolvingStrategy.parseAttribute(attrName, value);
- Optional<?> resolvedDefault = attributeResolvingStrategy.parseAttribute(attrName, d
a
faultValue);
+ Optional<?> resolvedDefault = attributeResolvingStrategy.parseAttribute(attrName, d
e
faultValue);
resolvedDefaultValue = resolvedDefault.isPresent() ? resolvedDefault.get() : null;
}
resolvedDefaultValue = resolvedDefault.isPresent() ? resolvedDefault.get() : null;
}
@@
-57,6
+58,10
@@
public class AttributeConfigElement {
return value;
}
return value;
}
+ public Object getDefaultValue() {
+ return defaultValue;
+ }
+
public Optional<?> getResolvedValue() {
return resolvedValue;
}
public Optional<?> getResolvedValue() {
return resolvedValue;
}
@@
-67,7
+72,7
@@
public class AttributeConfigElement {
@Override
public String toString() {
@Override
public String toString() {
- return "AttributeConfigElement [d
afaultValue=" + da
faultValue + ", value=" + value + "]";
+ return "AttributeConfigElement [d
efaultValue=" + de
faultValue + ", value=" + value + "]";
}
}
}
}