From: Thanh Ha Date: Fri, 12 Dec 2014 03:03:26 +0000 (-0500) Subject: Fix checkstyle simplify boolean expression config-api X-Git-Tag: release/lithium~761^2~2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=89a8b2bb54f83c0bc20d861c6a9dc73c437e121a Fix checkstyle simplify boolean expression config-api Change-Id: I4e47824cfd73bc798a06fc1dac299d94cebed7b3 Signed-off-by: Thanh Ha --- diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttributeValidationException.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttributeValidationException.java index 3380a10afe..b09017fe55 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttributeValidationException.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttributeValidationException.java @@ -84,7 +84,7 @@ public class JmxAttributeValidationException extends RuntimeException { public static void checkCondition(boolean condition, String message, JmxAttribute jmxAttribute) throws JmxAttributeValidationException { - if (condition == false) { + if (!condition) { throw new JmxAttributeValidationException( jmxAttribute.getAttributeName() + " " + message, jmxAttribute); diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java index ee23206eeb..0c7478dca0 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java @@ -128,7 +128,7 @@ public class ObjectNameUtil { if (quoted == null) { throw new IllegalArgumentException("Cannot find " + SERVICE_QNAME_KEY + " in " + objectName); } - if (quoted.startsWith("\"") == false || quoted.endsWith("\"") == false) { + if (!quoted.startsWith("\"") || !quoted.endsWith("\"")) { throw new IllegalArgumentException("Quotes not found in " + objectName); } String substring = quoted.substring(1); @@ -201,7 +201,7 @@ public class ObjectNameUtil { throw new IllegalArgumentException( "Expected ObjectName with transaction:" + inputON); } - if (ON_DOMAIN.equals(inputON.getDomain()) == false) { + if (!ON_DOMAIN.equals(inputON.getDomain())) { throw new IllegalArgumentException("Expected different domain: " + inputON); } @@ -263,7 +263,7 @@ public class ObjectNameUtil { Map allProperties = getAdditionalProperties(on); Map result = new HashMap<>(); for (Entry entry : allProperties.entrySet()) { - if (blacklist.contains(entry.getKey()) == false) { + if (!blacklist.contains(entry.getKey())) { result.put(entry.getKey(), entry.getValue()); } }