From 81d9d5f123d6b39c34a21bc2d83f85c898cb2801 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 3 Jul 2014 23:17:59 +0200 Subject: [PATCH] Do not use "".equals(String) This is an ugly shorthand for String.isEmpty(), so let's not use it. Change-Id: I6f00cc0676f982e99690294a11e703832b404977 Signed-off-by: Robert Varga --- .../yang/unified/doc/generator/GeneratorImpl.xtend | 8 ++++---- .../yangtools/yang/parser/builder/impl/RefineUtils.java | 3 ++- .../yangtools/yang/parser/impl/YangParserImpl.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/yang/unified/doc/generator/GeneratorImpl.xtend b/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/yang/unified/doc/generator/GeneratorImpl.xtend index 67b720511f..8acc2ad111 100644 --- a/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/yang/unified/doc/generator/GeneratorImpl.xtend +++ b/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/yang/unified/doc/generator/GeneratorImpl.xtend @@ -1207,7 +1207,7 @@ class GeneratorImpl { val List path = schemaPath.path val StringBuilder pathString = new StringBuilder() if (schemaPath.absolute) { - pathString.append("/") + pathString.append('/') } val QName qname = path.get(0) @@ -1235,15 +1235,15 @@ class GeneratorImpl { var String prefix = name.prefix var String moduleName - if (prefix == null || "".equals(prefix) || prefix.equals(module.prefix)) { + if (prefix == null || prefix.empty || prefix.equals(module.prefix)) { moduleName = module.name } else { moduleName = imports.get(prefix) } pathString.append(moduleName) - pathString.append(":") + pathString.append(':') pathString.append(name.localName) - pathString.append("/") + pathString.append('/') if(node instanceof ChoiceNode && dataNode !== null) { val DataSchemaNode caseNode = dataNode.childNodes.findFirst[DataSchemaNode e | e instanceof ChoiceCaseNode]; if(caseNode !== null) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java index 875fc2228a..b9fbf520da 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import java.util.List; + import org.opendaylight.yangtools.yang.model.api.MustDefinition; import org.opendaylight.yangtools.yang.parser.builder.api.Builder; import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder; @@ -35,7 +36,7 @@ public final class RefineUtils { MustDefinition must = refine.getMust(); List unknownNodes = refine.getUnknownNodes(); - if (defaultStr != null && !("".equals(defaultStr))) { + if (defaultStr != null && !defaultStr.isEmpty()) { leaf.setDefaultStr(defaultStr); } if (mandatory != null) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java index cc62f0f552..2d0b3abaf0 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java @@ -864,7 +864,7 @@ public final class YangParserImpl implements YangContextParser { URI ns = module.getNamespace(); Date rev = module.getRevision(); String localPrefix = qn.getPrefix(); - if (localPrefix != null && !("".equals(localPrefix))) { + if (localPrefix != null && !localPrefix.isEmpty()) { ModuleBuilder currentModule = BuilderUtils.findModuleFromBuilders(modules, module, localPrefix, augment.getLine()); if (currentModule == null) { -- 2.36.6