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 changes Ia268965a,Iefa79f99
[controller.git]
/
opendaylight
/
config
/
yang-jmx-generator
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
yangjmxgenerator
/
TypeProviderWrapper.java
diff --git
a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/TypeProviderWrapper.java
b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/TypeProviderWrapper.java
index 7490ad60847aaa45728d0b627a3091ff2d7a3fb7..a2238d1a13da854c07df8278c697e8fddd15bdd2 100644
(file)
--- a/
opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/TypeProviderWrapper.java
+++ b/
opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/TypeProviderWrapper.java
@@
-11,6
+11,8
@@
import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider;
import org.opendaylight.yangtools.sal.binding.model.api.Type;
import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
import org.opendaylight.yangtools.sal.binding.model.api.Type;
import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
public class TypeProviderWrapper {
private final TypeProvider typeProvider;
public class TypeProviderWrapper {
private final TypeProvider typeProvider;
@@
-20,10
+22,15
@@
public class TypeProviderWrapper {
}
public Type getType(LeafSchemaNode leaf) {
}
public Type getType(LeafSchemaNode leaf) {
+ TypeDefinition<?> type = leaf.getType();
+ return getType(leaf, type);
+ }
+
+ public Type getType(SchemaNode leaf, TypeDefinition<?> type) {
Type javaType;
try {
javaType = typeProvider.javaTypeForSchemaDefinitionType(
Type javaType;
try {
javaType = typeProvider.javaTypeForSchemaDefinitionType(
-
leaf.getType()
, leaf);
+
type
, leaf);
if (javaType == null)
throw new IllegalArgumentException("Unknown type received for "
+ leaf.toString());
if (javaType == null)
throw new IllegalArgumentException("Unknown type received for "
+ leaf.toString());
@@
-50,4
+57,7
@@
public class TypeProviderWrapper {
return javaType;
}
return javaType;
}
+ public String getJMXParamForBaseType(TypeDefinition<?> baseType) {
+ return typeProvider.getConstructorPropertyName(baseType);
+ }
}
}