X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-jmx-generator%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2FRuntimeBeanEntry.java;h=34e3c2e07183e40b88d238a1a9feb2d1f009a95f;hp=b6ed8243217f1e70d350342ce746d7e0e79bbdac;hb=e003fee1268ac5cb49234d412eccd150558d85e8;hpb=9dbad6e87ea28714c4268605927ae64f04443bd3 diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntry.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntry.java index b6ed824321..34e3c2e071 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntry.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntry.java @@ -9,10 +9,15 @@ package org.opendaylight.controller.config.yangjmxgenerator; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; - import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Function; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.Collections2; +import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -20,6 +25,7 @@ import java.util.Comparator; import java.util.Deque; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -36,15 +42,16 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.UsesNode; +import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; /** * Holds information about runtime bean to be generated. There are two kinds of @@ -56,6 +63,21 @@ import org.opendaylight.yangtools.yang.model.api.UsesNode; * lined via children so that a tree with all beans can be created. */ public class RuntimeBeanEntry { + + private static final Function QNAME_FROM_NODE = new Function() { + @Override + public QName apply(final SchemaNode input) { + return input.getQName(); + } + }; + + private static final Function UNKNOWN_NODE_TO_STRING = new Function() { + @Override + public String apply(final UnknownSchemaNode input) { + return input.getQName().getLocalName() + input.getNodeParameter(); + } + }; + private final String packageName; private final String yangName, javaNamePrefix; private final boolean isRoot; @@ -72,7 +94,7 @@ public class RuntimeBeanEntry { final List children, final Set rpcs) { checkArgument(isRoot == false || keyYangName.isPresent() == false, - "Root RuntimeBeanEntry must not have key " + "set"); + "Root RuntimeBeanEntry must not have key set"); this.packageName = packageName; this.isRoot = isRoot; this.yangName = yangName; @@ -85,16 +107,14 @@ public class RuntimeBeanEntry { for (AttributeIfc a : attributes) { checkState(map.containsKey(a.getAttributeYangName()) == false, - "Attribute already defined: " + a.getAttributeYangName() - + " in " + nodeForReporting); + "Attribute already defined: %s in %s", a.getAttributeYangName(), nodeForReporting); map.put(a.getAttributeYangName(), a); } if (keyYangName.isPresent()) { AttributeIfc keyJavaName = map.get(keyYangName.get()); - checkArgument(keyJavaName != null, "Key " + keyYangName.get() - + " not found in attribute " + "list " + attributes - + " in " + nodeForReporting); + checkArgument(keyJavaName != null, "Key %s not found in attribute list %s in %s", keyYangName.get(), + attributes, nodeForReporting); this.keyJavaName = Optional .of(keyJavaName.getUpperCaseCammelCase()); } else { @@ -112,13 +132,12 @@ public class RuntimeBeanEntry { public static Map extractClassNameToRuntimeBeanMap( final String packageName, final DataNodeContainer container, final String moduleYangName, final TypeProviderWrapper typeProviderWrapper, - final String javaNamePrefix, final Module currentModule) { + final String javaNamePrefix, final Module currentModule, final SchemaContext schemaContext) { - Map> identitiesToRpcs = getIdentitiesToRpcs(currentModule); AttributesRpcsAndRuntimeBeans attributesRpcsAndRuntimeBeans = extractSubtree( packageName, container, typeProviderWrapper, currentModule, - identitiesToRpcs); + schemaContext); Map result = new HashMap<>(); List attributes; @@ -150,52 +169,41 @@ public class RuntimeBeanEntry { return result; } - private static Map> getIdentitiesToRpcs( - final Module currentModule) { - // currently only looks for local identities (found in currentModule) - Map> result = new HashMap<>(); - for (IdentitySchemaNode identity : currentModule.getIdentities()) { - // add all - result.put(identity.getQName(), new HashSet()); - } + private static Multimap getIdentitiesToRpcs( + final SchemaContext schemaCtx) { + Multimap result = HashMultimap.create(); + for (Module currentModule : schemaCtx.getModules()) { - for (RpcDefinition rpc : currentModule.getRpcs()) { - ContainerSchemaNode input = rpc.getInput(); - if (input != null) { - for (UsesNode uses : input.getUses()) { + // Find all identities in current module for later identity->rpc mapping + Set allIdentitiesInModule = Sets.newHashSet(Collections2.transform(currentModule.getIdentities(), QNAME_FROM_NODE)); - if (uses.getGroupingPath().getPath().size() != 1) { - continue; - } + for (RpcDefinition rpc : currentModule.getRpcs()) { + ContainerSchemaNode input = rpc.getInput(); + if (input != null) { + for (UsesNode uses : input.getUses()) { - // check grouping path - QName qname = uses.getGroupingPath().getPath().get(0); - if (false == qname - .equals(ConfigConstants.RPC_CONTEXT_REF_GROUPING_QNAME)) { - continue; - } + // Check if the rpc is config rpc by looking for input argument rpc-context-ref + Iterator pathFromRoot = uses.getGroupingPath().getPathFromRoot().iterator(); + if (!pathFromRoot.hasNext() || + !pathFromRoot.next().equals(ConfigConstants.RPC_CONTEXT_REF_GROUPING_QNAME)) { + continue; + } - for (SchemaNode refinedNode : uses.getRefines().values()) { - - for (UnknownSchemaNode unknownSchemaNode : refinedNode - .getUnknownSchemaNodes()) { - if (ConfigConstants.RPC_CONTEXT_INSTANCE_EXTENSION_QNAME - .equals(unknownSchemaNode.getNodeType())) { - String localIdentityName = unknownSchemaNode - .getNodeParameter(); - QName identityQName = QName.create( - currentModule.getNamespace(), - currentModule.getRevision(), - localIdentityName); - Set rpcDefinitions = result - .get(identityQName); - if (rpcDefinitions == null) { - throw new IllegalArgumentException( - "Identity referenced by rpc not found. Identity:" - + localIdentityName + " , rpc " - + rpc); + for (SchemaNode refinedNode : uses.getRefines().values()) { + for (UnknownSchemaNode unknownSchemaNode : refinedNode + .getUnknownSchemaNodes()) { + if (ConfigConstants.RPC_CONTEXT_INSTANCE_EXTENSION_QNAME + .equals(unknownSchemaNode.getNodeType())) { + String localIdentityName = unknownSchemaNode + .getNodeParameter(); + QName identityQName = QName.create( + currentModule.getNamespace(), + currentModule.getRevision(), + localIdentityName); + Preconditions.checkArgument(allIdentitiesInModule.contains(identityQName), + "Identity referenced by rpc not found. Identity: %s, rpc: %s", localIdentityName, rpc); + result.put(identityQName, rpc); } - rpcDefinitions.add(rpc); } } } @@ -212,7 +220,9 @@ public class RuntimeBeanEntry { private static AttributesRpcsAndRuntimeBeans extractSubtree( final String packageName, final DataNodeContainer subtree, final TypeProviderWrapper typeProviderWrapper, final Module currentModule, - final Map> identitiesToRpcs) { + final SchemaContext ctx) { + + Multimap identitiesToRpcs = getIdentitiesToRpcs(ctx); List attributes = Lists.newArrayList(); List runtimeBeanEntries = new ArrayList<>(); @@ -234,7 +244,7 @@ public class RuntimeBeanEntry { ListSchemaNode listSchemaNode = (ListSchemaNode) child; RuntimeBeanEntry hierarchicalChild = createHierarchical( packageName, listSchemaNode, typeProviderWrapper, - currentModule, identitiesToRpcs); + currentModule, ctx); runtimeBeanEntries.add(hierarchicalChild); } else /* ordinary list attribute */{ ListAttribute listAttribute = ListAttribute.create( @@ -258,18 +268,11 @@ public class RuntimeBeanEntry { if (ConfigConstants.RPC_CONTEXT_INSTANCE_EXTENSION_QNAME .equals(unknownSchemaNode.getNodeType())) { String localIdentityName = unknownSchemaNode.getNodeParameter(); - QName identityQName = QName.create(currentModule.getNamespace(), - currentModule.getRevision(), localIdentityName); - Set rpcDefinitions = identitiesToRpcs - .get(identityQName); - if (rpcDefinitions == null) { - throw new IllegalArgumentException("Cannot find identity " - + localIdentityName + " to be used as " - + "context reference when resolving " - + unknownSchemaNode); - } + QName identityQName = unknownSchemaNode.isAddedByUses() ? + findQNameFromGrouping(subtree, ctx, unknownSchemaNode, localIdentityName) : + QName.create(currentModule.getNamespace(), currentModule.getRevision(), localIdentityName); // convert RpcDefinition to Rpc - for (RpcDefinition rpcDefinition : rpcDefinitions) { + for (RpcDefinition rpcDefinition : identitiesToRpcs.get(identityQName)) { String name = TypeProviderWrapper .findJavaParameter(rpcDefinition); AttributeIfc returnType; @@ -310,6 +313,22 @@ public class RuntimeBeanEntry { attributes, rpcs); } + /** + * Find "proper" qname of unknown node in case it comes from a grouping + */ + private static QName findQNameFromGrouping(final DataNodeContainer subtree, final SchemaContext ctx, final UnknownSchemaNode unknownSchemaNode, final String localIdentityName) { + QName identityQName = null; + for (UsesNode usesNode : subtree.getUses()) { + SchemaNode dataChildByName = SchemaContextUtil.findDataSchemaNode(ctx, usesNode.getGroupingPath()); + Module m = SchemaContextUtil.findParentModule(ctx, dataChildByName); + List unknownSchemaNodes = dataChildByName.getUnknownSchemaNodes(); + if(Collections2.transform(unknownSchemaNodes, UNKNOWN_NODE_TO_STRING).contains(UNKNOWN_NODE_TO_STRING.apply(unknownSchemaNode))) { + identityQName = QName.create(dataChildByName.getQName(), localIdentityName); + } + } + return identityQName; + } + private static AttributeIfc getReturnTypeAttribute(final DataSchemaNode child, final TypeProviderWrapper typeProviderWrapper, final String packageName) { if (child instanceof LeafSchemaNode) { @@ -353,13 +372,13 @@ public class RuntimeBeanEntry { private static RuntimeBeanEntry createHierarchical(final String packageName, final ListSchemaNode listSchemaNode, final TypeProviderWrapper typeProviderWrapper, final Module currentModule, - final Map> identitiesToRpcs) { + final SchemaContext ctx) { // supported are numeric types, strings, enums // get all attributes AttributesRpcsAndRuntimeBeans attributesRpcsAndRuntimeBeans = extractSubtree( packageName, listSchemaNode, typeProviderWrapper, - currentModule, identitiesToRpcs); + currentModule, ctx); Optional keyYangName; if (listSchemaNode.getKeyDefinition().isEmpty()) {