X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2FJsonMapper.java;h=85b4b2dee071aff3be08fb82b11690a8793d7014;hb=0e7b83c0739ac579ca6dbf6a3f7992f70eb3000f;hp=696bf715355e402a0932532a36cde8e795a08236;hpb=43b9f7880866caef7d5ea58dbad2bba318a1f3e8;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonMapper.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonMapper.java index 696bf71535..85b4b2dee0 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonMapper.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonMapper.java @@ -11,13 +11,16 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Preconditions; import com.google.gson.stream.JsonWriter; + import java.io.IOException; import java.net.URI; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; + import javax.activation.UnsupportedDataTypeException; + import org.opendaylight.controller.sal.core.api.mount.MountInstance; import org.opendaylight.controller.sal.restconf.impl.ControllerContext; import org.opendaylight.controller.sal.restconf.impl.IdentityValuesDTO; @@ -50,16 +53,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; class JsonMapper { + private static final Logger LOG = LoggerFactory.getLogger(JsonMapper.class); + private final MountInstance mountPoint; - private MountInstance mountPoint; - private final Logger logger = LoggerFactory.getLogger(JsonMapper.class); + public JsonMapper(final MountInstance mountPoint) { + this.mountPoint = mountPoint; + } - public void write(final JsonWriter writer, final CompositeNode data, final DataNodeContainer schema, final MountInstance mountPoint) + public void write(final JsonWriter writer, final CompositeNode data, final DataNodeContainer schema) throws IOException { Preconditions.checkNotNull(writer); Preconditions.checkNotNull(data); Preconditions.checkNotNull(schema); - this.mountPoint = mountPoint; writer.beginObject(); @@ -82,73 +87,68 @@ class JsonMapper { final Set foundLists = new HashSet<>(); Set parentSchemaChildNodes = parentSchema == null ? - Collections.emptySet() : parentSchema.getChildNodes(); + Collections.emptySet() : parentSchema.getChildNodes(); - for (Node child : parent.getValue()) { - DataSchemaNode childSchema = findFirstSchemaForNode(child, parentSchemaChildNodes); + for (Node child : parent.getValue()) { + DataSchemaNode childSchema = findFirstSchemaForNode(child, parentSchemaChildNodes); - if (childSchema == null) { - // Node may not conform to schema or allows "anyxml" - we'll process it. + if (childSchema == null) { + // Node may not conform to schema or allows "anyxml" - we'll process it. - logger.debug( "No schema found for data node \"" + child.getNodeType() ); + LOG.debug("No schema found for data node \"{}\"", child.getNodeType()); - if( !foundLists.contains( child.getNodeType() ) ) { - handleNoSchemaFound( writer, child, parent ); + if( !foundLists.contains( child.getNodeType() ) ) { + handleNoSchemaFound( writer, child, parent ); - // Since we don't have a schema, we don't know which nodes are supposed to be - // lists so treat every one as a potential list to avoid outputting duplicates. + // Since we don't have a schema, we don't know which nodes are supposed to be + // lists so treat every one as a potential list to avoid outputting duplicates. - foundLists.add( child.getNodeType() ); - } - } - else if (childSchema instanceof ContainerSchemaNode) { - Preconditions.checkState(child instanceof CompositeNode, - "Data representation of Container should be CompositeNode - " + child.getNodeType()); - writeContainer(writer, (CompositeNode) child, (ContainerSchemaNode) childSchema); - } else if (childSchema instanceof ListSchemaNode) { - if (!foundLists.contains( child.getNodeType() ) ) { - Preconditions.checkState(child instanceof CompositeNode, - "Data representation of List should be CompositeNode - " + child.getNodeType()); - foundLists.add( child.getNodeType() ); - writeList(writer, parent, (CompositeNode) child, (ListSchemaNode) childSchema); - } - } else if (childSchema instanceof LeafListSchemaNode) { - if (!foundLists.contains( child.getNodeType() ) ) { - Preconditions.checkState(child instanceof SimpleNode, - "Data representation of LeafList should be SimpleNode - " + child.getNodeType()); - foundLists.add( child.getNodeType() ); - writeLeafList(writer, parent, (SimpleNode) child, (LeafListSchemaNode) childSchema); - } - } else if (childSchema instanceof LeafSchemaNode) { - Preconditions.checkState(child instanceof SimpleNode, - "Data representation of LeafList should be SimpleNode - " + child.getNodeType()); - writeLeaf(writer, (SimpleNode) child, (LeafSchemaNode) childSchema); - } else if (childSchema instanceof AnyXmlSchemaNode) { - if( child instanceof CompositeNode ) { - writeContainer(writer, (CompositeNode) child, null); - } - else { - handleNoSchemaFound( writer, child, parent ); + foundLists.add( child.getNodeType() ); + } + } + else if (childSchema instanceof ContainerSchemaNode) { + Preconditions.checkState(child instanceof CompositeNode, + "Data representation of Container should be CompositeNode - %s", child.getNodeType()); + writeContainer(writer, (CompositeNode) child, (ContainerSchemaNode) childSchema); + } else if (childSchema instanceof ListSchemaNode) { + if (!foundLists.contains( child.getNodeType() ) ) { + Preconditions.checkState(child instanceof CompositeNode, + "Data representation of List should be CompositeNode - %s", child.getNodeType()); + foundLists.add( child.getNodeType() ); + writeList(writer, parent, (CompositeNode) child, (ListSchemaNode) childSchema); + } + } else if (childSchema instanceof LeafListSchemaNode) { + if (!foundLists.contains( child.getNodeType() ) ) { + Preconditions.checkState(child instanceof SimpleNode, + "Data representation of LeafList should be SimpleNode - %s", child.getNodeType()); + foundLists.add( child.getNodeType() ); + writeLeafList(writer, parent, (SimpleNode) child, (LeafListSchemaNode) childSchema); + } + } else if (childSchema instanceof LeafSchemaNode) { + Preconditions.checkState(child instanceof SimpleNode, + "Data representation of LeafList should be SimpleNode - %s", child.getNodeType()); + writeLeaf(writer, (SimpleNode) child, (LeafSchemaNode) childSchema); + } else if (childSchema instanceof AnyXmlSchemaNode) { + if( child instanceof CompositeNode ) { + writeContainer(writer, (CompositeNode) child, null); + } + else { + handleNoSchemaFound( writer, child, parent ); + } + } else { + throw new UnsupportedDataTypeException("Schema can be ContainerSchemaNode, ListSchemaNode, " + + "LeafListSchemaNode, or LeafSchemaNode. Other types are not supported yet."); + } } - } else { - throw new UnsupportedDataTypeException("Schema can be ContainerSchemaNode, ListSchemaNode, " - + "LeafListSchemaNode, or LeafSchemaNode. Other types are not supported yet."); - } - } } - private void writeValue( final JsonWriter writer, Object value ) throws IOException { - if( value != null ) { - writer.value( String.valueOf( value ) ); - } - else { - writer.value( "" ); - } + private static void writeValue(final JsonWriter writer, final Object value) throws IOException { + writer.value(value == null ? "" : String.valueOf(value)); } private void handleNoSchemaFound( final JsonWriter writer, final Node node, - final CompositeNode parent ) throws IOException { + final CompositeNode parent ) throws IOException { if( node instanceof SimpleNode ) { List> nodeLeafList = parent.getSimpleNodesByName( node.getNodeType() ); if( nodeLeafList.size() == 1 ) { @@ -166,7 +166,7 @@ class JsonMapper { } } else { // CompositeNode Preconditions.checkState( node instanceof CompositeNode, - "Data representation of Container should be CompositeNode - " + node.getNodeType() ); + "Data representation of Container should be CompositeNode - %s", node.getNodeType()); List nodeList = parent.getCompositesByName( node.getNodeType() ); if( nodeList.size() == 1 ) { @@ -178,11 +178,12 @@ class JsonMapper { } } - private DataSchemaNode findFirstSchemaForNode(final Node node, final Set dataSchemaNode) { + private static DataSchemaNode findFirstSchemaForNode(final Node node, final Set dataSchemaNode) { for (DataSchemaNode dsn : dataSchemaNode) { if (node.getNodeType().equals(dsn.getQName())) { return dsn; - } else if (dsn instanceof ChoiceNode) { + } + if (dsn instanceof ChoiceNode) { for (ChoiceCaseNode choiceCase : ((ChoiceNode) dsn).getCases()) { DataSchemaNode foundDsn = findFirstSchemaForNode(node, choiceCase.getChildNodes()); if (foundDsn != null) { @@ -245,8 +246,8 @@ class JsonMapper { TypeDefinition baseType = RestUtil.resolveBaseTypeFrom(type); if (node.getValue() == null && !(baseType instanceof EmptyTypeDefinition)) { - logger.debug("While generationg JSON output null value was found for type " - + baseType.getClass().getSimpleName() + "."); + LOG.debug("While generationg JSON output null value was found for type {}.", + baseType.getClass().getSimpleName()); } if (baseType instanceof IdentityrefTypeDefinition) { @@ -291,25 +292,24 @@ class JsonMapper { } } - private void writeIdentityValuesDTOToJson(final JsonWriter writer, final IdentityValuesDTO valueDTO) throws IOException { + private static void writeIdentityValuesDTOToJson(final JsonWriter writer, final IdentityValuesDTO valueDTO) throws IOException { StringBuilder result = new StringBuilder(); for (IdentityValue identityValue : valueDTO.getValuesWithNamespaces()) { - result.append("/"); + result.append('/'); writeModuleNameAndIdentifier(result, identityValue); if (identityValue.getPredicates() != null && !identityValue.getPredicates().isEmpty()) { for (Predicate predicate : identityValue.getPredicates()) { IdentityValue identityValuePredicate = predicate.getName(); - result.append("["); + result.append('['); if (identityValuePredicate == null) { - result.append("."); + result.append('.'); } else { writeModuleNameAndIdentifier(result, identityValuePredicate); } result.append("='"); result.append(predicate.getValue()); - result.append("'"); - result.append("]"); + result.append("']"); } } } @@ -317,21 +317,22 @@ class JsonMapper { writer.value(result.toString()); } - private void writeModuleNameAndIdentifier(final StringBuilder result, final IdentityValue identityValue) { + private static void writeModuleNameAndIdentifier(final StringBuilder result, final IdentityValue identityValue) { String moduleName = ControllerContext.getInstance().findModuleNameByNamespace( URI.create(identityValue.getNamespace())); if (moduleName != null && !moduleName.isEmpty()) { result.append(moduleName); - result.append(":"); + result.append(':'); } result.append(identityValue.getValue()); } - private void writeStringRepresentation(final JsonWriter writer, final SimpleNode node, final TypeDefinition baseType, + private static void writeStringRepresentation(final JsonWriter writer, final SimpleNode node, final TypeDefinition baseType, final Class requiredType) throws IOException { Object value = node.getValue(); - logger.debug("Value of " + baseType.getQName().getNamespace() + ":" + baseType.getQName().getLocalName() - + " is not instance of " + requiredType.getClass() + " but is " + node.getValue().getClass()); + LOG.debug("Value of {}:{} is not instance of {} but is {}", + baseType.getQName().getNamespace(), baseType.getQName().getLocalName(), + requiredType.getClass(), node.getValue().getClass()); if (value == null) { writer.value(""); } else { @@ -358,7 +359,7 @@ class JsonMapper { if (moduleName != null) { nameForOutput = moduleName.toString(); } else { - logger.info("Module '{}' was not found in schema from mount point", schema.getQName()); + LOG.info("Module '{}' was not found in schema from mount point", schema.getQName()); } } writer.name(nameForOutput);