From: Stephen Kitt Date: Tue, 8 Mar 2016 10:09:29 +0000 (+0100) Subject: Use String concatenation instead of StringBuffer/Builder X-Git-Tag: release/boron~185 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9c6cbdaf5bb5e1ea8066558927e9ea674c0b9d51;hp=362b50c1dd4bea09b7caec3ff6b40a0c07e9e662;p=yangtools.git Use String concatenation instead of StringBuffer/Builder ... and avoid mixing append() and concatenation. Change-Id: I1860cb191804413c00fa560abdccaa6f2979c70e Signed-off-by: Stephen Kitt --- diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/UnmodifiableCollection.java b/common/util/src/main/java/org/opendaylight/yangtools/util/UnmodifiableCollection.java index 9d5cfe1a72..e99659d286 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/UnmodifiableCollection.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/UnmodifiableCollection.java @@ -136,8 +136,6 @@ public final class UnmodifiableCollection implements Collection, Serializa @Override public String toString() { - final StringBuilder sb = new StringBuilder("UnmodifiableCollection{"); - sb.append(delegate); - return sb.toString(); + return "UnmodifiableCollection{" + delegate + "}"; } } diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java index f94e95c87c..c1bd85d235 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java @@ -308,10 +308,10 @@ public final class QName implements Immutable, Serializable, Comparable { public String toString() { final StringBuilder sb = new StringBuilder(); if (getNamespace() != null) { - sb.append(QNAME_LEFT_PARENTHESIS + getNamespace()); + sb.append(QNAME_LEFT_PARENTHESIS).append(getNamespace()); if (getFormattedRevision() != null) { - sb.append(QNAME_REVISION_DELIMITER + getFormattedRevision()); + sb.append(QNAME_REVISION_DELIMITER).append(getFormattedRevision()); } sb.append(QNAME_RIGHT_PARENTHESIS); } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java index 06760528ea..08d51f4b18 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java @@ -664,9 +664,7 @@ public abstract class YangInstanceIdentifier implements Path> { @Override public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("ExtendedType [typeName="); - builder.append(typeName); - builder.append(", baseType="); - builder.append(baseType); - builder.append(", path="); - builder.append(path); - builder.append(", description="); - builder.append(description); - builder.append(", reference="); - builder.append(reference); - builder.append(", unknownSchemaNodes="); - builder.append(unknownSchemaNodes); - builder.append(", status="); - builder.append(status); - builder.append(", units="); - builder.append(units); - builder.append(", defaultValue="); - builder.append(defaultValue); - builder.append("]"); - return builder.toString(); + return "ExtendedType [typeName=" + + typeName + + ", baseType=" + + baseType + + ", path=" + + path + + ", description=" + + description + + ", reference=" + + reference + + ", unknownSchemaNodes=" + + unknownSchemaNodes + + ", status=" + + status + + ", units=" + + units + + ", defaultValue=" + + defaultValue + + "]"; } public List getRangeConstraints() { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java index e2688665bf..a411f9e34a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java @@ -124,12 +124,10 @@ public final class Leafref implements LeafrefTypeDefinition { @Override public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("type "); - builder.append(NAME); - builder.append(" [xpath="); - builder.append(xpath); - builder.append("]"); - return builder.toString(); + return "type " + + NAME + + " [xpath=" + + xpath + + "]"; } } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LengthConstraintImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LengthConstraintImpl.java index ca75b0c615..3af2d9d96d 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LengthConstraintImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LengthConstraintImpl.java @@ -126,20 +126,18 @@ final class LengthConstraintImpl implements LengthConstraint, Immutable { @Override public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("LengthConstraintImpl [min="); - builder.append(min); - builder.append(", max="); - builder.append(max); - builder.append(", description="); - builder.append(description); - builder.append(", errorAppTag="); - builder.append(errorAppTag); - builder.append(", reference="); - builder.append(reference); - builder.append(", errorMessage="); - builder.append(errorMessage); - builder.append("]"); - return builder.toString(); + return "LengthConstraintImpl [min=" + + min + + ", max=" + + max + + ", description=" + + description + + ", errorAppTag=" + + errorAppTag + + ", reference=" + + reference + + ", errorMessage=" + + errorMessage + + "]"; } } \ No newline at end of file diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java index 4b33f20772..edd9d5838c 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java @@ -100,18 +100,16 @@ final class PatternConstraintImpl implements PatternConstraint, Immutable { @Override public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("PatternConstraintImpl [regex="); - builder.append(regex); - builder.append(", description="); - builder.append(description); - builder.append(", reference="); - builder.append(reference); - builder.append(", errorAppTag="); - builder.append(errorAppTag); - builder.append(", errorMessage="); - builder.append(errorMessage); - builder.append("]"); - return builder.toString(); + return "PatternConstraintImpl [regex=" + + regex + + ", description=" + + description + + ", reference=" + + reference + + ", errorAppTag=" + + errorAppTag + + ", errorMessage=" + + errorMessage + + "]"; } } \ No newline at end of file diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RangeConstraintImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RangeConstraintImpl.java index 2bf3b32ddb..885400b2db 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RangeConstraintImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RangeConstraintImpl.java @@ -106,20 +106,18 @@ final class RangeConstraintImpl implements RangeConstraint, Immutable { @Override public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("RangeConstraintImpl [min="); - builder.append(min); - builder.append(", max="); - builder.append(max); - builder.append(", description="); - builder.append(description); - builder.append(", reference="); - builder.append(reference); - builder.append(", errorAppTag="); - builder.append(errorAppTag); - builder.append(", errorMessage="); - builder.append(errorMessage); - builder.append("]"); - return builder.toString(); + return "RangeConstraintImpl [min=" + + min + + ", max=" + + max + + ", description=" + + description + + ", reference=" + + reference + + ", errorAppTag=" + + errorAppTag + + ", errorMessage=" + + errorMessage + + "]"; } } \ No newline at end of file diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java index 911ed2c37a..226d802bc5 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java @@ -191,24 +191,22 @@ public final class StringType implements StringTypeDefinition, Immutable { @Override public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("StringType [name="); - builder.append(NAME); - builder.append(", path="); - builder.append(PATH); - builder.append(", defaultValue="); - builder.append(DEFAULT_VALUE); - builder.append(", description="); - builder.append(DESCRIPTION); - builder.append(", reference="); - builder.append(REFERENCE); - builder.append(", lengthStatements="); - builder.append(lengthStatements); - builder.append(", patterns="); - builder.append(patterns); - builder.append(", units="); - builder.append(UNITS); - builder.append("]"); - return builder.toString(); + return "StringType [name=" + + NAME + + ", path=" + + PATH + + ", defaultValue=" + + DEFAULT_VALUE + + ", description=" + + DESCRIPTION + + ", reference=" + + REFERENCE + + ", lengthStatements=" + + lengthStatements + + ", patterns=" + + patterns + + ", units=" + + UNITS + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java index fe0e4b1f0c..97edd77e28 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java @@ -137,12 +137,10 @@ final class AnyXmlSchemaNodeImpl implements AnyXmlSchemaNode, DerivableSchemaNod @Override public String toString() { - StringBuilder sb = new StringBuilder(AnyXmlSchemaNodeImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname=").append(qname); - sb.append(", path=").append(path); - sb.append("]"); - return sb.toString(); + return AnyXmlSchemaNodeImpl.class.getSimpleName() + "[" + + "qname=" + qname + + ", path=" + path + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java index bada88e786..3da2ca6d4a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java @@ -121,12 +121,10 @@ final class AugmentationSchemaImpl extends AbstractDocumentedDataNodeContainer i @Override public String toString() { - StringBuilder sb = new StringBuilder(AugmentationSchemaImpl.class.getSimpleName()); - sb.append("["); - sb.append("targetPath=").append(targetPath); - sb.append(", when=").append(whenCondition); - sb.append("]"); - return sb.toString(); + return AugmentationSchemaImpl.class.getSimpleName() + "[" + + "targetPath=" + targetPath + + ", when=" + whenCondition + + "]"; } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java index c1b06bf467..ef7c4c04fb 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java @@ -128,12 +128,10 @@ final class ChoiceCaseNodeImpl extends AbstractDocumentedDataNodeContainer imple @Override public String toString() { - StringBuilder sb = new StringBuilder(ChoiceCaseNodeImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname="); - sb.append(qname); - sb.append("]"); - return sb.toString(); + return ChoiceCaseNodeImpl.class.getSimpleName() + "[" + + "qname=" + + qname + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java index 7e15bf81de..7d0844f8cf 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java @@ -186,11 +186,9 @@ final class ChoiceSchemaNodeImpl implements ChoiceSchemaNode, DerivableSchemaNod @Override public String toString() { - StringBuilder sb = new StringBuilder(ChoiceSchemaNodeImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname=").append(qname); - sb.append("]"); - return sb.toString(); + return ChoiceSchemaNodeImpl.class.getSimpleName() + "[" + + "qname=" + qname + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java index 0ae87ee010..35b360e8cb 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java @@ -318,15 +318,13 @@ public final class ConstraintsBuilderImpl implements ConstraintsBuilder { @Override public String toString() { - StringBuilder sb = new StringBuilder(ConstraintDefinitionImpl.class.getSimpleName()); - sb.append("["); - sb.append("whenCondition=").append(whenCondition); - sb.append(", mustConstraints=").append(mustConstraints); - sb.append(", mandatory=").append(mandatory); - sb.append(", minElements=").append(minElements); - sb.append(", maxElements=").append(maxElements); - sb.append("]"); - return sb.toString(); + return ConstraintDefinitionImpl.class.getSimpleName() + "[" + + "whenCondition=" + whenCondition + + ", mustConstraints=" + mustConstraints + + ", mandatory=" + mandatory + + ", minElements=" + minElements + + ", maxElements=" + maxElements + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java index 4a89a959a7..2aa509e08a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java @@ -160,13 +160,11 @@ public final class DeviationBuilder extends AbstractBuilder { @Override public String toString() { - StringBuilder sb = new StringBuilder(DeviationImpl.class.getSimpleName()); - sb.append("["); - sb.append("targetPath=").append(targetPath); - sb.append(", deviate=").append(deviate); - sb.append(", reference=").append(reference); - sb.append("]"); - return sb.toString(); + return DeviationImpl.class.getSimpleName() + "[" + + "targetPath=" + targetPath + + ", deviate=" + deviate + + ", reference=" + reference + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java index a86306611e..c82c15f66b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java @@ -115,14 +115,12 @@ final class ExtensionDefinitionImpl implements ExtensionDefinition { @Override public String toString() { - StringBuilder sb = new StringBuilder(ExtensionDefinitionImpl.class.getSimpleName()); - sb.append("["); - sb.append("argument=").append(argument); - sb.append(", qname=").append(qname); - sb.append(", schemaPath=").append(schemaPath); - sb.append(", extensionSchemaNodes=").append(unknownNodes); - sb.append(", yin=").append(yin); - sb.append("]"); - return sb.toString(); + return ExtensionDefinitionImpl.class.getSimpleName() + "[" + + "argument=" + argument + + ", qname=" + qname + + ", schemaPath=" + schemaPath + + ", extensionSchemaNodes=" + unknownNodes + + ", yin=" + yin + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java index 00a8f36810..b2ee2a0431 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java @@ -136,9 +136,7 @@ public final class FeatureBuilder extends AbstractSchemaNodeBuilder { @Override public String toString() { - StringBuilder sb = new StringBuilder(FeatureDefinitionImpl.class.getSimpleName()); - sb.append("[name=").append(qname).append("]"); - return sb.toString(); + return FeatureDefinitionImpl.class.getSimpleName() + "[name=" + qname + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java index 8e07148c6e..62c989324b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java @@ -94,10 +94,8 @@ final class GroupingDefinitionImpl extends AbstractDocumentedDataNodeContainer i @Override public String toString() { - StringBuilder sb = new StringBuilder(GroupingDefinitionImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname=").append(qname); - sb.append("]"); - return sb.toString(); + return GroupingDefinitionImpl.class.getSimpleName() + "[" + + "qname=" + qname + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java index 67a5b784e6..c26b924e30 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java @@ -120,11 +120,9 @@ final class IdentitySchemaNodeImpl implements IdentitySchemaNode { @Override public String toString() { - StringBuilder sb = new StringBuilder(IdentitySchemaNodeImpl.class.getSimpleName()); - sb.append("["); - sb.append("base=").append(baseIdentity); - sb.append(", qname=").append(qname); - sb.append("]"); - return sb.toString(); + return IdentitySchemaNodeImpl.class.getSimpleName() + "[" + + "base=" + baseIdentity + + ", qname=" + qname + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java index 464e57abf9..957d163c04 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java @@ -209,14 +209,12 @@ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder imple @Override public String toString() { - final StringBuilder result = new StringBuilder(IdentityrefTypeBuilder.class.getSimpleName()); - result.append("[qName="); - result.append(qname); - result.append("["); - result.append(", base="); - result.append(baseIdentity); - result.append("]"); - return result.toString(); + return IdentityrefTypeBuilder.class.getSimpleName() + "[qName=" + + qname + + "[" + + ", base=" + + baseIdentity + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java index 925ead2201..f8234f7528 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java @@ -149,10 +149,8 @@ final class LeafListSchemaNodeImpl implements LeafListSchemaNode, DerivableSchem @Override public String toString() { - StringBuilder sb = new StringBuilder(LeafListSchemaNodeImpl.class.getSimpleName()); - sb.append("["); - sb.append(qname); - sb.append("]"); - return sb.toString(); + return LeafListSchemaNodeImpl.class.getSimpleName() + "[" + + qname + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java index 8dbff13942..ac6ea0913f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java @@ -155,11 +155,9 @@ final class LeafSchemaNodeImpl implements LeafSchemaNode, DerivableSchemaNode { @Override public String toString() { - StringBuilder sb = new StringBuilder(LeafSchemaNodeImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname=").append(qname); - sb.append(", path=").append(path); - sb.append("]"); - return sb.toString(); + return LeafSchemaNodeImpl.class.getSimpleName() + "[" + + "qname=" + qname + + ", path=" + path + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java index fa4a8ae25a..a17dc56f1f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java @@ -240,15 +240,13 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem @Override public String toString() { - StringBuilder sb = new StringBuilder(ModuleImpl.class.getSimpleName()); - sb.append("["); - sb.append("name=").append(name); - sb.append(", namespace=").append(getNamespace()); - sb.append(", revision=").append(getRevision()); - sb.append(", prefix=").append(prefix); - sb.append(", yangVersion=").append(yangVersion); - sb.append("]"); - return sb.toString(); + return ModuleImpl.class.getSimpleName() + "[" + + "name=" + name + + ", namespace=" + getNamespace() + + ", revision=" + getRevision() + + ", prefix=" + prefix + + ", yangVersion=" + yangVersion + + "]"; } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java index a12786f203..92bcfce286 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java @@ -97,8 +97,6 @@ final class NotificationDefinitionImpl extends AbstractDocumentedDataNodeContain @Override public String toString() { - StringBuilder sb = new StringBuilder(NotificationDefinitionImpl.class.getSimpleName()); - sb.append("[qname=").append(qname).append(", path=").append(path).append("]"); - return sb.toString(); + return NotificationDefinitionImpl.class.getSimpleName() + "[qname=" + qname + ", path=" + path + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java index fa056f1985..aa052c2aa9 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java @@ -140,17 +140,15 @@ final class RpcDefinitionImpl implements RpcDefinition { @Override public String toString() { - StringBuilder sb = new StringBuilder(RpcDefinitionImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname="); - sb.append(qname); - sb.append(", path="); - sb.append(path); - sb.append(", input="); - sb.append(input); - sb.append(", output="); - sb.append(output); - sb.append("]"); - return sb.toString(); + return RpcDefinitionImpl.class.getSimpleName() + "[" + + "qname=" + + qname + + ", path=" + + path + + ", input=" + + input + + ", output=" + + output + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java index cfb8cc9ede..023b24bc69 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java @@ -226,14 +226,12 @@ public final class UnionTypeBuilder extends AbstractTypeAwareBuilder implements @Override public String toString() { - final StringBuilder result = new StringBuilder(UnionTypeBuilder.class.getSimpleName()); - result.append("["); - result.append("types="); - result.append(types); - result.append(", typedefs="); - result.append(typedefs); - result.append("]"); - return result.toString(); + return UnionTypeBuilder.class.getSimpleName() + "[" + + "types=" + + types + + ", typedefs=" + + typedefs + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java index 847a41548d..fe93bfe54a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java @@ -248,13 +248,11 @@ public final class UnknownSchemaNodeBuilderImpl extends AbstractBuilder implemen @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(nodeType.getNamespace()); - sb.append(":"); - sb.append(nodeType.getLocalName()); - sb.append(" "); - sb.append(nodeParameter); - return sb.toString(); + return String.valueOf(nodeType.getNamespace()) + + ":" + + nodeType.getLocalName() + + " " + + nodeParameter; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java index 8e75abf703..02ba73e369 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java @@ -107,13 +107,11 @@ final class UnknownSchemaNodeImpl implements UnknownSchemaNode { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(nodeType.getNamespace()); - sb.append(":"); - sb.append(nodeType.getLocalName()); - sb.append(" "); - sb.append(nodeParameter); - return sb.toString(); + return String.valueOf(nodeType.getNamespace()) + + ":" + + nodeType.getLocalName() + + " " + + nodeParameter; } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java index 874b0d7add..889f2df3e4 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java @@ -108,10 +108,8 @@ final class UsesNodeImpl implements UsesNode { @Override public String toString() { - StringBuilder sb = new StringBuilder(UsesNodeImpl.class.getSimpleName()); - sb.append("[groupingPath="); - sb.append(groupingPath); - sb.append("]"); - return sb.toString(); + return UsesNodeImpl.class.getSimpleName() + "[groupingPath=" + + groupingPath + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java index fadb1a2353..44b83477f6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java @@ -1018,11 +1018,7 @@ public final class ParserListenerUtils { } private static String wrapPattern(final String rawPattern) { - final StringBuilder wrapPatternBuilder = new StringBuilder(rawPattern.length() + 2); - wrapPatternBuilder.append('^'); - wrapPatternBuilder.append(rawPattern); - wrapPatternBuilder.append('$'); - return wrapPatternBuilder.toString(); + return "^" + rawPattern + '$'; } private static boolean isValidPattern(final String pattern, final Pattern_stmtContext ctx, final String moduleName) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveModule.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveModule.java index 883b54cd5c..f73b455b4d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveModule.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveModule.java @@ -383,15 +383,13 @@ abstract class AbstractEffectiveModule> exte @Override public String toString() { - StringBuilder sb = new StringBuilder(this.getClass().getSimpleName()); - sb.append("["); - sb.append("name=").append(name); - sb.append(", namespace=").append(getNamespace()); - sb.append(", revision=").append(getRevision()); - sb.append(", prefix=").append(prefix); - sb.append(", yangVersion=").append(yangVersion); - sb.append("]"); - return sb.toString(); + return this.getClass().getSimpleName() + "[" + + "name=" + name + + ", namespace=" + getNamespace() + + ", revision=" + getRevision() + + ", prefix=" + prefix + + ", yangVersion=" + yangVersion + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AnyXmlEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AnyXmlEffectiveStatementImpl.java index b0b21af625..a8da00c16a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AnyXmlEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AnyXmlEffectiveStatementImpl.java @@ -59,11 +59,9 @@ public class AnyXmlEffectiveStatementImpl extends AbstractEffectiveDataSchemaNod @Override public String toString() { - StringBuilder sb = new StringBuilder(AnyXmlEffectiveStatementImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname=").append(getQName()); - sb.append(", path=").append(getPath()); - sb.append("]"); - return sb.toString(); + return AnyXmlEffectiveStatementImpl.class.getSimpleName() + "[" + + "qname=" + getQName() + + ", path=" + getPath() + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AugmentEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AugmentEffectiveStatementImpl.java index 837f179180..99f03c1955 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AugmentEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AugmentEffectiveStatementImpl.java @@ -134,12 +134,10 @@ public final class AugmentEffectiveStatementImpl extends @Override public String toString() { - StringBuilder sb = new StringBuilder(AugmentEffectiveStatementImpl.class.getSimpleName()); - sb.append("["); - sb.append("targetPath=").append(targetPath); - sb.append(", when=").append(whenCondition); - sb.append("]"); - return sb.toString(); + return AugmentEffectiveStatementImpl.class.getSimpleName() + "[" + + "targetPath=" + targetPath + + ", when=" + whenCondition + + "]"; } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseEffectiveStatementImpl.java index 20b06b6b7a..02caa69577 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseEffectiveStatementImpl.java @@ -82,11 +82,9 @@ public final class CaseEffectiveStatementImpl extends AbstractEffectiveSimpleDat @Override public String toString() { - StringBuilder sb = new StringBuilder(CaseEffectiveStatementImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname="); - sb.append(getQName()); - sb.append("]"); - return sb.toString(); + return CaseEffectiveStatementImpl.class.getSimpleName() + "[" + + "qname=" + + getQName() + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java index 6f19976571..7e7380f5c5 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java @@ -169,12 +169,10 @@ final class CaseShorthandImpl implements ChoiceCaseNode, DerivableSchemaNode { @Override public String toString() { - StringBuilder sb = new StringBuilder(CaseShorthandImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname="); - sb.append(getQName()); - sb.append("]"); - return sb.toString(); + return CaseShorthandImpl.class.getSimpleName() + "[" + + "qname=" + + getQName() + + "]"; } private static ChoiceCaseNode getOriginalIfPresent(final SchemaNode caseShorthandNode) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java index f7e9966cec..fc5c51bb5f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java @@ -170,10 +170,8 @@ public final class ChoiceEffectiveStatementImpl extends AbstractEffectiveDataSch @Override public String toString() { - StringBuilder sb = new StringBuilder(ChoiceEffectiveStatementImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname=").append(getQName()); - sb.append("]"); - return sb.toString(); + return ChoiceEffectiveStatementImpl.class.getSimpleName() + "[" + + "qname=" + getQName() + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeviationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeviationEffectiveStatementImpl.java index 11183196fd..b66abf8c67 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeviationEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeviationEffectiveStatementImpl.java @@ -102,12 +102,10 @@ public class DeviationEffectiveStatementImpl extends DeclaredEffectiveStatementB @Override public String toString() { - StringBuilder sb = new StringBuilder(DeviationEffectiveStatementImpl.class.getSimpleName()); - sb.append("["); - sb.append("targetPath=").append(targetPath); - sb.append(", deviate=").append(deviate); - sb.append(", reference=").append(reference); - sb.append("]"); - return sb.toString(); + return DeviationEffectiveStatementImpl.class.getSimpleName() + "[" + + "targetPath=" + targetPath + + ", deviate=" + deviate + + ", reference=" + reference + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java index be76294246..00bf6c10ca 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java @@ -122,14 +122,12 @@ public class ExtensionEffectiveStatementImpl extends AbstractEffectiveDocumented @Override public String toString() { - StringBuilder sb = new StringBuilder(ExtensionEffectiveStatementImpl.class.getSimpleName()); - sb.append("["); - sb.append("argument=").append(argument); - sb.append(", qname=").append(qname); - sb.append(", schemaPath=").append(schemaPath); - sb.append(", extensionSchemaNodes=").append(unknownNodes); - sb.append(", yin=").append(yin); - sb.append("]"); - return sb.toString(); + return ExtensionEffectiveStatementImpl.class.getSimpleName() + "[" + + "argument=" + argument + + ", qname=" + qname + + ", schemaPath=" + schemaPath + + ", extensionSchemaNodes=" + unknownNodes + + ", yin=" + yin + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/FeatureEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/FeatureEffectiveStatementImpl.java index 9c99f8cbcf..24547eed2c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/FeatureEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/FeatureEffectiveStatementImpl.java @@ -46,8 +46,6 @@ public final class FeatureEffectiveStatementImpl extends AbstractEffectiveSchema @Override public String toString() { - StringBuilder sb = new StringBuilder(FeatureEffectiveStatementImpl.class.getSimpleName()); - sb.append("[name=").append(getQName()).append("]"); - return sb.toString(); + return FeatureEffectiveStatementImpl.class.getSimpleName() + "[name=" + getQName() + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/GroupingEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/GroupingEffectiveStatementImpl.java index 7f0275d600..228e3dd308 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/GroupingEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/GroupingEffectiveStatementImpl.java @@ -100,10 +100,8 @@ public class GroupingEffectiveStatementImpl extends @Override public String toString() { - StringBuilder sb = new StringBuilder(GroupingEffectiveStatementImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname=").append(qname); - sb.append("]"); - return sb.toString(); + return GroupingEffectiveStatementImpl.class.getSimpleName() + "[" + + "qname=" + qname + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityEffectiveStatementImpl.java index 1a175e9162..d6ae604622 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityEffectiveStatementImpl.java @@ -86,12 +86,9 @@ public final class IdentityEffectiveStatementImpl extends AbstractEffectiveSchem @Override public String toString() { - StringBuilder sb = new StringBuilder( - IdentityEffectiveStatementImpl.class.getSimpleName()); - sb.append("["); - sb.append("base=").append(baseIdentity); - sb.append(", qname=").append(getQName()); - sb.append("]"); - return sb.toString(); + return IdentityEffectiveStatementImpl.class.getSimpleName() + "[" + + "base=" + baseIdentity + + ", qname=" + getQName() + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafEffectiveStatementImpl.java index 113a5d49e9..269fa81dac 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafEffectiveStatementImpl.java @@ -104,11 +104,9 @@ public final class LeafEffectiveStatementImpl extends AbstractEffectiveDataSchem @Override public String toString() { - StringBuilder sb = new StringBuilder(LeafEffectiveStatementImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname=").append(getQName()); - sb.append(", path=").append(getPath()); - sb.append("]"); - return sb.toString(); + return LeafEffectiveStatementImpl.class.getSimpleName() + "[" + + "qname=" + getQName() + + ", path=" + getPath() + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafListEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafListEffectiveStatementImpl.java index 7f391833ba..de1322110d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafListEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafListEffectiveStatementImpl.java @@ -105,10 +105,8 @@ public final class LeafListEffectiveStatementImpl extends AbstractEffectiveDataS @Override public String toString() { - StringBuilder sb = new StringBuilder(LeafListEffectiveStatementImpl.class.getSimpleName()); - sb.append("["); - sb.append(getQName()); - sb.append("]"); - return sb.toString(); + return LeafListEffectiveStatementImpl.class.getSimpleName() + "[" + + getQName() + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java index 67e46139c8..1daac3a16e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java @@ -101,8 +101,6 @@ public class NotificationEffectiveStatementImpl extends @Override public String toString() { - StringBuilder sb = new StringBuilder(NotificationEffectiveStatementImpl.class.getSimpleName()); - sb.append("[qname=").append(qname).append(", path=").append(path).append("]"); - return sb.toString(); + return NotificationEffectiveStatementImpl.class.getSimpleName() + "[qname=" + qname + ", path=" + path + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RpcEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RpcEffectiveStatementImpl.java index 187c593838..0e64057120 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RpcEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RpcEffectiveStatementImpl.java @@ -96,17 +96,15 @@ public class RpcEffectiveStatementImpl extends AbstractEffectiveSchemaNode extends AbstractEffective @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(nodeType.getNamespace()); - sb.append(":"); - sb.append(nodeType.getLocalName()); - sb.append(" "); - sb.append(nodeParameter); - return sb.toString(); + return String.valueOf(nodeType.getNamespace()) + + ":" + + nodeType.getLocalName() + + " " + + nodeParameter; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UsesEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UsesEffectiveStatementImpl.java index 8de17085f2..aec4f83b7b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UsesEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UsesEffectiveStatementImpl.java @@ -136,10 +136,8 @@ public final class UsesEffectiveStatementImpl extends DeclaredEffectiveStatement @Override public String toString() { - StringBuilder sb = new StringBuilder(UsesEffectiveStatementImpl.class.getSimpleName()); - sb.append("[groupingPath="); - sb.append(groupingPath); - sb.append("]"); - return sb.toString(); + return UsesEffectiveStatementImpl.class.getSimpleName() + "[groupingPath=" + + groupingPath + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/YangModeledAnyXmlEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/YangModeledAnyXmlEffectiveStatementImpl.java index d0b7f00dea..da45bf0335 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/YangModeledAnyXmlEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/YangModeledAnyXmlEffectiveStatementImpl.java @@ -59,11 +59,9 @@ public final class YangModeledAnyXmlEffectiveStatementImpl extends AnyXmlEffecti @Override public String toString() { - StringBuilder sb = new StringBuilder(YangModeledAnyXmlEffectiveStatementImpl.class.getSimpleName()); - sb.append("["); - sb.append("qname=").append(getQName()); - sb.append(", path=").append(getPath()); - sb.append("]"); - return sb.toString(); + return YangModeledAnyXmlEffectiveStatementImpl.class.getSimpleName() + "[" + + "qname=" + getQName() + + ", path=" + getPath() + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LengthConstraintEffectiveImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LengthConstraintEffectiveImpl.java index 32ca55e446..1fcfc04e8c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LengthConstraintEffectiveImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LengthConstraintEffectiveImpl.java @@ -115,21 +115,19 @@ public class LengthConstraintEffectiveImpl implements LengthConstraint { @Override public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append(LengthConstraintEffectiveImpl.class.getSimpleName()); - builder.append(" [min="); - builder.append(min); - builder.append(", max="); - builder.append(max); - builder.append(", description="); - builder.append(description); - builder.append(", errorAppTag="); - builder.append(errorAppTag); - builder.append(", reference="); - builder.append(reference); - builder.append(", errorMessage="); - builder.append(errorMessage); - builder.append("]"); - return builder.toString(); + return LengthConstraintEffectiveImpl.class.getSimpleName() + + " [min=" + + min + + ", max=" + + max + + ", description=" + + description + + ", errorAppTag=" + + errorAppTag + + ", reference=" + + reference + + ", errorMessage=" + + errorMessage + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/PatternConstraintEffectiveImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/PatternConstraintEffectiveImpl.java index 184ebc401b..d697741af3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/PatternConstraintEffectiveImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/PatternConstraintEffectiveImpl.java @@ -103,19 +103,17 @@ public class PatternConstraintEffectiveImpl implements PatternConstraint { @Override public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append(PatternConstraintEffectiveImpl.class.getSimpleName()); - builder.append(" [regex="); - builder.append(regEx); - builder.append(", description="); - builder.append(description); - builder.append(", reference="); - builder.append(reference); - builder.append(", errorAppTag="); - builder.append(errorAppTag); - builder.append(", errorMessage="); - builder.append(errorMessage); - builder.append("]"); - return builder.toString(); + return PatternConstraintEffectiveImpl.class.getSimpleName() + + " [regex=" + + regEx + + ", description=" + + description + + ", reference=" + + reference + + ", errorAppTag=" + + errorAppTag + + ", errorMessage=" + + errorMessage + + "]"; } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/RangeConstraintEffectiveImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/RangeConstraintEffectiveImpl.java index 4308ecb07b..0b1b71c809 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/RangeConstraintEffectiveImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/RangeConstraintEffectiveImpl.java @@ -110,21 +110,19 @@ public class RangeConstraintEffectiveImpl implements RangeConstraint { @Override public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append(RangeConstraintEffectiveImpl.class.getSimpleName()); - builder.append(" [min="); - builder.append(min); - builder.append(", max="); - builder.append(max); - builder.append(", description="); - builder.append(description); - builder.append(", reference="); - builder.append(reference); - builder.append(", errorAppTag="); - builder.append(errorAppTag); - builder.append(", errorMessage="); - builder.append(errorMessage); - builder.append("]"); - return builder.toString(); + return RangeConstraintEffectiveImpl.class.getSimpleName() + + " [min=" + + min + + ", max=" + + max + + ", description=" + + description + + ", reference=" + + reference + + ", errorAppTag=" + + errorAppTag + + ", errorMessage=" + + errorMessage + + "]"; } }