Fix foldable trigraphs

Sonar correctly points out the expression can be simplified, this
patch does exactly that.

Change-Id: I0ea51d18d551be0f4bd416d7b18da3eb543e0244
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 71892d4c8f435650eeef99f276884f7c2a3d57bd)

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RequireInstanceRestrictedTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RequireInstanceRestrictedTypeBuilder.java
index 9c208bf280f8fa76ae0f18e11ebce5f1da154fa6..c65e4acf820f439528b2b854e27b92a7046beb39 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RequireInstanceRestrictedTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RequireInstanceRestrictedTypeBuilder.java
@@ -14,12 +14,11 @@ import org.opendaylight.yangtools.yang.model.api.type.RequireInstanceRestrictedT
 @Beta
 public abstract class RequireInstanceRestrictedTypeBuilder<T extends RequireInstanceRestrictedTypeDefinition<T>>
         extends AbstractRestrictedTypeBuilder<T> {
-
     private boolean requireInstance;
 
     RequireInstanceRestrictedTypeBuilder(final T baseType, final SchemaPath path) {
         super(baseType, path);
-        requireInstance = baseType != null ? baseType.requireInstance() : true;
+        requireInstance = baseType == null || baseType.requireInstance();
     }
 
     public final void setRequireInstance(final boolean requireInstance) {

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
index 9fcbb686085006d8a3d580946848fe95ebe2da4e..2047911d1a4067f32f67e227c37aca6f29719478 100644 (file)
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
@@ -210,9 +210,7 @@ public abstract class StatementContextBase<A, D extends DeclaredStatement<A>, E
         // If the set of supported features has not been provided, all features are supported by default.
         final Set<QName> supportedFeatures = getFromNamespace(SupportedFeaturesNamespace.class,
                 SupportedFeatures.SUPPORTED_FEATURES);
-        final boolean ret = supportedFeatures == null ? true
-                : StmtContextUtils.checkFeatureSupport(this, supportedFeatures);
-
+        final boolean ret = supportedFeatures == null || StmtContextUtils.checkFeatureSupport(this, supportedFeatures);
         supportedByFeatures = OptionalBoolean.of(ret);
         return ret;
     }

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
index 13b4983c0a24adaf203b82cf65574a654ab5b71a..8f154ac45ecfce1f304e4da8d45c531767c48f15 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
@@ -77,7 +77,7 @@ public final class ExtensionStatementSupport
         stmt.addToNs(StatementDefinitionNamespace.class, stmt.getStatementArgument(),
             new ModelDefinedStatementSupport(new ModelDefinedStatementDefinition(stmt.getStatementArgument(),
                 argument != null ? argument.getStatementArgument() : null,
-                        yinElement != null ? yinElement.getStatementArgument() : false)));
+                        yinElement != null && yinElement.getStatementArgument())));
     }
 
     @Override

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
index 3d23b4ae902e010e6eae98d3ca149bafe3ce3807..b21b46f80e104ce9d53066e5172683975a82866d 100644 (file)
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
@@ -403,7 +403,7 @@ public final class StmtContextUtils {
     public static boolean hasParentOfType(final StmtContext<?, ?, ?> ctx, final StatementDefinition parentType) {
         requireNonNull(parentType);
         final StmtContext<?, ?, ?> parentContext = ctx.getParentContext();
-        return parentContext != null ? parentType.equals(parentContext.getPublicDefinition()) : false;
+        return parentContext != null && parentType.equals(parentContext.getPublicDefinition());
     }
 
     /**