From 0c5bc1ee1d4f2e193ddc1ce630bc399d13483100 Mon Sep 17 00:00:00 2001 From: Ladislav Borak Date: Tue, 14 Oct 2014 13:46:29 +0200 Subject: [PATCH] Resolved some sonar issues: Simplify Boolean Expression Change-Id: Ie4d9efb2a00330bede69aac80789065cac895710 Signed-off-by: Ladislav Borak --- .../generator/util/AbstractBaseType.java | 6 +++--- .../ImmutableAugmentationNodeBuilder.java | 3 +-- .../impl/ImmutableMapEntryNodeBuilder.java | 3 +-- .../valid/DataNodeContainerValidator.java | 8 +++----- .../base/parser/BaseDispatcherParser.java | 10 ++++------ .../base/parser/NodeParserDispatcher.java | 2 +- .../AbstractContainerNodeModification.java | 14 ++++++------- .../operations/ChoiceNodeModification.java | 20 +++++++++---------- .../operations/LeafSetNodeModification.java | 10 ++++------ .../data/operations/MapNodeModification.java | 8 +++----- .../yang/data/operations/OperationStack.java | 12 +++++------ .../util/FilesystemSchemaSourceCache.java | 2 +- .../builder/impl/ModuleIdentifierImpl.java | 4 +--- .../repo/SharedSchemaContextFactory.java | 2 +- 14 files changed, 43 insertions(+), 61 deletions(-) diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/AbstractBaseType.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/AbstractBaseType.java index 735c888a0e..2c15ad8a36 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/AbstractBaseType.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/AbstractBaseType.java @@ -11,7 +11,7 @@ import org.opendaylight.yangtools.sal.binding.model.api.Type; /** * It is used only as ancestor for other Types - * + * */ public class AbstractBaseType implements Type { @@ -47,7 +47,7 @@ public class AbstractBaseType implements Type { /** * Constructs the instance of this class with the concrete package name type * name. - * + * * @param pkName * string with the package name to which this Type * belongs @@ -82,7 +82,7 @@ public class AbstractBaseType implements Type { if (obj == null) { return false; } - if (false ==(obj instanceof Type)) { + if (!(obj instanceof Type)) { return false; } Type other = (Type) obj; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAugmentationNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAugmentationNodeBuilder.java index ecc0d6534f..9655284712 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAugmentationNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAugmentationNodeBuilder.java @@ -8,7 +8,6 @@ package org.opendaylight.yangtools.yang.data.impl.schema.builder.impl; import java.util.Map; - import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -52,7 +51,7 @@ public class ImmutableAugmentationNodeBuilder extends AbstractImmutableDataConta public DataContainerNodeBuilder withChild( final DataContainerChild child) { // Check nested augments - DataValidationException.checkLegalData(child instanceof AugmentationNode == false, + DataValidationException.checkLegalData(!(child instanceof AugmentationNode), "Unable to add: %s, as a child for: %s, Nested augmentations are not permitted", child.getNodeType(), getNodeIdentifier() == null ? this : getNodeIdentifier()); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java index a23b070140..0b1f58cd02 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java @@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.data.impl.schema.builder.impl; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -83,7 +82,7 @@ public class ImmutableMapEntryNodeBuilder extends AbstractImmutableDataContainer @Override public DataContainerNodeAttrBuilder withChild(final DataContainerChild child) { // Augmentation nodes cannot be keys, and do not have to be present in childrenQNamesToPaths map - if(isAugment(child.getIdentifier()) == false) { + if(!isAugment(child.getIdentifier())) { childrenQNamesToPaths.put(child.getNodeType(), child.getIdentifier()); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java index e48f5c2592..d2739d657f 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java @@ -7,9 +7,9 @@ */ package org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.valid; -import java.util.Set; - +import com.google.common.base.Preconditions; import com.google.common.collect.Sets; +import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; @@ -20,8 +20,6 @@ import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import com.google.common.base.Preconditions; - /** * General validator for container like statements, e.g. container, list-entry, choice, augment */ @@ -69,7 +67,7 @@ public class DataNodeContainerValidator { for (DataSchemaNode childSchema : nodeContainer.getChildNodes()) { if(childSchema instanceof ChoiceCaseNode) { allChildNodes.addAll(getChildNodes((DataNodeContainer) childSchema)); - } else if (childSchema instanceof AugmentationSchema == false) { + } else if (!(childSchema instanceof AugmentationSchema)) { allChildNodes.add(childSchema.getQName()); } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/BaseDispatcherParser.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/BaseDispatcherParser.java index 9de1b823ac..ed458c6c65 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/BaseDispatcherParser.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/BaseDispatcherParser.java @@ -7,11 +7,13 @@ */ package org.opendaylight.yangtools.yang.data.impl.schema.transform.base.parser; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.collect.LinkedListMultimap; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; - import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; @@ -24,10 +26,6 @@ import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ChoiceNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.LinkedListMultimap; - /** * Abstract(base) Parser for DataContainerNodes e.g. ContainerNode, AugmentationNode. */ @@ -166,7 +164,7 @@ public abstract class BaseDispatcherParser, S> } private void checkAtLeastOneNode(S schema, Iterable childNodes) { - Preconditions.checkArgument(Iterables.isEmpty(childNodes) == false, + Preconditions.checkArgument(!Iterables.isEmpty(childNodes), "Node detected 0 times, should be at least 1, identified by: %s, found: %s", schema, childNodes); } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/NodeParserDispatcher.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/NodeParserDispatcher.java index c316e72b02..220b2cb04d 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/NodeParserDispatcher.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/NodeParserDispatcher.java @@ -42,7 +42,7 @@ public interface NodeParserDispatcher { @Override public final DataContainerChild dispatchChildElement(Object schema, List childNodes) { - Preconditions.checkArgument(childNodes.isEmpty() == false); + Preconditions.checkArgument(!childNodes.isEmpty()); if (schema instanceof ContainerSchemaNode) { return factory.getContainerNodeParser().parse(childNodes, (ContainerSchemaNode) schema); diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AbstractContainerNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AbstractContainerNodeModification.java index ddfc69e6e7..fd6b9c6ab1 100644 --- a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AbstractContainerNodeModification.java +++ b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AbstractContainerNodeModification.java @@ -7,9 +7,12 @@ */ package org.opendaylight.yangtools.yang.data.operations; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import java.util.List; import java.util.Set; - import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode; @@ -27,11 +30,6 @@ 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 com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; - abstract class AbstractContainerNodeModification> implements Modification { @Override @@ -80,11 +78,11 @@ abstract class AbstractContainerNodeModification modifyContainer(S schema, Optional actual, Optional modification, OperationStack operationStack) throws DataModificationException { - if (actual.isPresent() == false) { + if (!actual.isPresent()) { return modification; } - if (modification.isPresent() == false) { + if (!modification.isPresent()) { return actual; } diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/ChoiceNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/ChoiceNodeModification.java index fdaf0c8f70..bd518fd00e 100644 --- a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/ChoiceNodeModification.java +++ b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/ChoiceNodeModification.java @@ -7,20 +7,18 @@ */ package org.opendaylight.yangtools.yang.data.operations; +import com.google.common.base.Optional; +import com.google.common.collect.Sets; import java.util.Set; - import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; import org.opendaylight.yangtools.yang.model.api.ChoiceNode; -import com.google.common.base.Optional; -import com.google.common.collect.Sets; - final class ChoiceNodeModification extends AbstractContainerNodeModification { @@ -42,7 +40,7 @@ final class ChoiceNodeModification extends Set childrenToProcess = super.getChildrenToProcess(schema, actual, modification); - if (modification.isPresent() == false) { + if (!modification.isPresent()) { return childrenToProcess; } @@ -51,12 +49,12 @@ final class ChoiceNodeModification extends for (DataContainerChild child : modification.get().getValue()) { Optional detectedCaseForChild = SchemaUtils.detectCase(schema, child); - if(detectedCaseForChild.isPresent() == false) { + if(!detectedCaseForChild.isPresent()) { DataModificationException.IllegalChoiceValuesException.throwUnknownChild(schema.getQName(), child.getNodeType()); } - if (detectedCase != null && detectedCase.equals(detectedCaseForChild.get()) == false) { + if (detectedCase != null && (!detectedCase.equals(detectedCaseForChild.get()))) { DataModificationException.IllegalChoiceValuesException.throwMultipleCasesReferenced(schema.getQName(), modification.get(), detectedCase.getQName(), detectedCaseForChild.get().getQName()); } @@ -72,10 +70,10 @@ final class ChoiceNodeModification extends for (YangInstanceIdentifier.PathArgument childToProcess : childrenToProcess) { // child from other cases, skip if (childToProcess instanceof YangInstanceIdentifier.AugmentationIdentifier - && SchemaUtils.belongsToCaseAugment(detectedCase, - (YangInstanceIdentifier.AugmentationIdentifier) childToProcess) == false) { + && (!SchemaUtils.belongsToCaseAugment(detectedCase, + (YangInstanceIdentifier.AugmentationIdentifier) childToProcess))) { continue; - } else if (belongsToCase(detectedCase, childToProcess) == false) { + } else if (!belongsToCase(detectedCase, childToProcess)) { continue; } diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/LeafSetNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/LeafSetNodeModification.java index de5a5b0e24..55327ea2a8 100644 --- a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/LeafSetNodeModification.java +++ b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/LeafSetNodeModification.java @@ -7,18 +7,16 @@ */ package org.opendaylight.yangtools.yang.data.operations; +import com.google.common.base.Optional; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import java.util.List; - import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; -import com.google.common.base.Optional; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; - final class LeafSetNodeModification implements Modification> { @Override @@ -41,7 +39,7 @@ final class LeafSetNodeModification implements Modification { public static final MapEntryNodeModification MAP_ENTRY_NODE_MODIFICATION = new MapEntryNodeModification(); @@ -28,7 +26,7 @@ public class MapNodeModification implements Modification modification, OperationStack operationStack) throws DataModificationException { // Merge or None operation on parent, leaving actual if modification not present - if (modification.isPresent() == false) + if (!modification.isPresent()) return actual; Map resultNodes = Maps.newLinkedHashMap(); diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/OperationStack.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/OperationStack.java index c4f890dc80..33681c08d7 100644 --- a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/OperationStack.java +++ b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/OperationStack.java @@ -7,10 +7,11 @@ */ package org.opendaylight.yangtools.yang.data.operations; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import java.net.URI; import java.util.Deque; import java.util.LinkedList; - import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.AttributesContainer; import org.opendaylight.yangtools.yang.data.api.ModifyAction; @@ -18,9 +19,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; - /** * Tracks netconf operations on nested nodes. */ @@ -36,7 +34,7 @@ final class OperationStack { } public void enteringNode(Optional> modificationNode) { - if (modificationNode.isPresent() == false) { + if (!modificationNode.isPresent()) { return; } @@ -55,7 +53,7 @@ final class OperationStack { } private ModifyAction getOperation(NormalizedNode modificationNode) { - if (modificationNode instanceof AttributesContainer == false) + if (!(modificationNode instanceof AttributesContainer)) return null; String operationString = ((AttributesContainer) modificationNode).getAttributes().get(OPERATION_NAME); @@ -74,7 +72,7 @@ final class OperationStack { } public void exitingNode(Optional> modificationNode) { - if (modificationNode.isPresent() == false) { + if (!modificationNode.isPresent()) { return; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java index 675a695341..3478953a06 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java @@ -62,7 +62,7 @@ public final class FilesystemSchemaSourceCache