Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add support for configuration attributes based on yang leaves with custom types ...
[controller.git]
/
opendaylight
/
netconf
/
config-netconf-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
confignetconfconnector
/
mapping
/
attributes
/
fromxml
/
CompositeAttributeReadingStrategy.java
diff --git
a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/CompositeAttributeReadingStrategy.java
b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/CompositeAttributeReadingStrategy.java
index 1cfb74d652133eb2ad22db17f15ce2547a5a93c0..fdbfb98e1ca7e9f57c6421eda42f0c3bbd2d93c7 100644
(file)
--- a/
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/CompositeAttributeReadingStrategy.java
+++ b/
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/CompositeAttributeReadingStrategy.java
@@
-11,21
+11,19
@@
package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attri
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc;
-import org.opendaylight.controller.config.yangjmxgenerator.attribute.TOAttribute;
import org.opendaylight.controller.netconf.util.xml.XmlElement;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.opendaylight.controller.netconf.util.xml.XmlElement;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-public class CompositeAttributeReadingStrategy extends AbstractAttributeReadingStrategy
<TOAttribute>
{
+public class CompositeAttributeReadingStrategy extends AbstractAttributeReadingStrategy {
private final Map<String, AttributeReadingStrategy> innerStrategies;
private final Map<String, AttributeReadingStrategy> innerStrategies;
- public CompositeAttributeReadingStrategy(
TOAttribute attributeIfc
,
+ public CompositeAttributeReadingStrategy(
String nullableDefault
,
Map<String, AttributeReadingStrategy> innerStrategies) {
Map<String, AttributeReadingStrategy> innerStrategies) {
- super(
attributeIfc
);
+ super(
nullableDefault
);
this.innerStrategies = innerStrategies;
}
this.innerStrategies = innerStrategies;
}
@@
-38,21
+36,19
@@
public class CompositeAttributeReadingStrategy extends AbstractAttributeReadingS
Map<String, Object> innerMap = Maps.newHashMap();
Map<String, Object> innerMap = Maps.newHashMap();
- Map<String, AttributeIfc> inner = getAttributeIfc().getYangPropertiesToTypesMap();
-
List<XmlElement> recognisedChildren = Lists.newArrayList();
List<XmlElement> recognisedChildren = Lists.newArrayList();
- for (Entry<String, Attribute
Ifc> innerAttrEntry : inner
.entrySet()) {
+ for (Entry<String, Attribute
ReadingStrategy> innerAttrEntry : innerStrategies
.entrySet()) {
List<XmlElement> childItem = complexElement.getChildElementsWithSameNamespace(innerAttrEntry.getKey());
recognisedChildren.addAll(childItem);
List<XmlElement> childItem = complexElement.getChildElementsWithSameNamespace(innerAttrEntry.getKey());
recognisedChildren.addAll(childItem);
- AttributeConfigElement resolvedInner = inner
Strategies.get(innerAttrEntry.getKey()
).readElement(childItem);
+ AttributeConfigElement resolvedInner = inner
AttrEntry.getValue(
).readElement(childItem);
innerMap.put(innerAttrEntry.getKey(), resolvedInner.getValue());
}
complexElement.checkUnrecognisedElements(recognisedChildren);
innerMap.put(innerAttrEntry.getKey(), resolvedInner.getValue());
}
complexElement.checkUnrecognisedElements(recognisedChildren);
- return AttributeConfigElement.create(get
AttributeIfc
(), innerMap);
+ return AttributeConfigElement.create(get
NullableDefault
(), innerMap);
}
}
}
}