From 246887769bc45b7f5a33116e8636a70bd4776184 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Fri, 4 Aug 2017 15:15:12 +0200 Subject: [PATCH] Simplify boolean expressions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * Drop explicit “? true : false” (or the reverse). * Simplify “if (...) return true; else return false;”. * Simplify tail “if (...) return false; return true;”. * Simplify explicit comparisons with true or false. This was mostly done automatically by IntelliJ. Change-Id: Ib252f58f2feb2fe6e05e89ad90ab11f85b5e3289 Signed-off-by: Stephen Kitt --- .../commands/NetconfConnectDeviceCommand.java | 4 ++-- .../console/impl/NetconfCommandsImpl.java | 4 ++-- .../console/utils/NetconfConsoleUtils.java | 5 +---- .../netconf/mapping/api/HandlingPriority.java | 7 ++----- .../AbstractNetconfSessionNegotiator.java | 2 +- .../NetconfXMLToHelloMessageDecoder.java | 2 +- .../handler/exi/NetconfStartExiMessage.java | 2 +- .../handler/ssh/client/AsyncSshHandler.java | 2 +- .../ssh/client/AsyncSshHandlerWriter.java | 4 ++-- .../impl/ops/CreateSubscription.java | 6 +++--- .../netconf/notifications/impl/ops/Get.java | 2 +- .../netconf/ssh/RemoteNetconfCommand.java | 2 +- .../netconf/util/messages/SubtreeFilter.java | 8 ++++---- .../connect/netconf/NetconfStateSchemas.java | 18 +++++++----------- .../connect/netconf/NotificationHandler.java | 2 +- .../netconf/listener/UncancellableFuture.java | 2 +- .../util/NetconfMessageTransformUtil.java | 2 +- .../sal/connect/util/MessageCounter.java | 2 +- .../sal/connect/util/RemoteDeviceId.java | 6 +----- .../java/org/opendaylight/netconf/cli/Cli.java | 2 +- .../cli/NetconfDeviceConnectionManager.java | 2 +- .../cli/commands/CommandDispatcher.java | 2 +- .../netconf/cli/commands/output/Output.java | 2 +- .../netconf/cli/reader/AbstractReader.java | 5 +---- .../cli/reader/custom/ConfigReader.java | 2 +- .../opendaylight/netconf/test/tool/Main.java | 2 +- .../test/tool/client/http/perf/Parameters.java | 2 +- .../test/tool/client/stress/Parameters.java | 2 +- .../sal/restconf/impl/IdentityValuesDTO.java | 2 +- .../netconf/sal/restconf/impl/jmx/Config.java | 6 +----- .../netconf/sal/restconf/impl/jmx/Delete.java | 6 +----- .../netconf/sal/restconf/impl/jmx/Get.java | 6 +----- .../sal/restconf/impl/jmx/Operational.java | 6 +----- .../netconf/sal/restconf/impl/jmx/Post.java | 6 +----- .../netconf/sal/restconf/impl/jmx/Put.java | 6 +----- .../netconf/sal/restconf/impl/jmx/Rpcs.java | 6 +----- .../listeners/AbstractCommonSubscriber.java | 2 +- .../sal/rest/doc/util/RestDocgenUtil.java | 5 +---- 38 files changed, 53 insertions(+), 101 deletions(-) diff --git a/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/commands/NetconfConnectDeviceCommand.java b/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/commands/NetconfConnectDeviceCommand.java index 2e5d0c3c02..6ecaec63b2 100644 --- a/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/commands/NetconfConnectDeviceCommand.java +++ b/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/commands/NetconfConnectDeviceCommand.java @@ -93,8 +93,8 @@ public class NetconfConnectDeviceCommand extends AbstractAction { return "Invalid IP:" + deviceIp + " or Port:" + devicePort + "Please enter a valid entry to proceed."; } - final boolean isTcpOnly = (connectionType.equals("true")) ? true : false; - final boolean isSchemaless = (schemaless.equals("true")) ? true : false; + final boolean isTcpOnly = connectionType.equals("true"); + final boolean isSchemaless = schemaless.equals("true"); final Credentials credentials = new LoginPasswordBuilder().setPassword(password).setUsername(username).build(); final NetconfNode netconfNode = new NetconfNodeBuilder() diff --git a/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/impl/NetconfCommandsImpl.java b/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/impl/NetconfCommandsImpl.java index 810a4389d6..47417bc737 100644 --- a/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/impl/NetconfCommandsImpl.java +++ b/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/impl/NetconfCommandsImpl.java @@ -202,9 +202,9 @@ public class NetconfCommandsImpl implements NetconfCommands { : updated.get(NetconfConsoleConstants.NETCONF_IP); final String devicePort = Strings.isNullOrEmpty(updated.get(NetconfConsoleConstants.NETCONF_PORT)) ? netconfNode.getPort().getValue().toString() : updated.get(NetconfConsoleConstants.NETCONF_PORT); - final Boolean tcpOnly = (updated.get(NetconfConsoleConstants.TCP_ONLY).equals("true")) ? true : false; + final Boolean tcpOnly = updated.get(NetconfConsoleConstants.TCP_ONLY).equals("true"); final Boolean isSchemaless = - (updated.get(NetconfConsoleConstants.SCHEMALESS).equals("true")) ? true : false; + updated.get(NetconfConsoleConstants.SCHEMALESS).equals("true"); final String newUsername = Strings.isNullOrEmpty(updated.get(NetconfConsoleConstants.USERNAME)) ? updated.get(NetconfConsoleConstants.USERNAME) : username; final String newPassword = Strings.isNullOrEmpty(updated.get(NetconfConsoleConstants.PASSWORD)) diff --git a/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/utils/NetconfConsoleUtils.java b/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/utils/NetconfConsoleUtils.java index 0845764f21..385f0f9e82 100644 --- a/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/utils/NetconfConsoleUtils.java +++ b/netconf/netconf-console/src/main/java/org/opendaylight/netconf/console/utils/NetconfConsoleUtils.java @@ -95,10 +95,7 @@ public class NetconfConsoleUtils { * @return :true if not empty, else, false */ private static boolean isNetconfNodesPresent(final Topology topology) { - if (topology == null || topology.getNode() == null || topology.getNode().isEmpty()) { - return false; - } - return true; + return topology != null && topology.getNode() != null && !topology.getNode().isEmpty(); } /** diff --git a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/HandlingPriority.java b/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/HandlingPriority.java index 078e9aae9e..c308aa8e7b 100644 --- a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/HandlingPriority.java +++ b/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/HandlingPriority.java @@ -11,6 +11,7 @@ package org.opendaylight.netconf.mapping.api; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import java.util.Objects; public final class HandlingPriority implements Comparable { @@ -88,11 +89,7 @@ public final class HandlingPriority implements Comparable { HandlingPriority that = (HandlingPriority) obj; - if (priority != null ? !priority.equals(that.priority) : that.priority != null) { - return false; - } - - return true; + return Objects.equals(priority, that.priority); } @Override diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java index 2f30023f54..1a548f41da 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java @@ -125,7 +125,7 @@ public abstract class AbstractNetconfSessionNegotiator

() { @Override public void operationComplete(final CloseFuture future) { - if (future.isClosed() == false) { + if (!future.isClosed()) { session.close(true); } session = null; diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java index d116b99f82..35f5d972c0 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java @@ -67,7 +67,7 @@ public final class AsyncSshHandlerWriter implements AutoCloseable { promise.setFailure(new IllegalStateException("Channel closed")); } else { final ByteBuf byteBufMsg = (ByteBuf) msg; - if (pending.isEmpty() == false) { + if (!pending.isEmpty()) { queueRequest(ctx, byteBufMsg, promise); return; } @@ -129,7 +129,7 @@ public final class AsyncSshHandlerWriter implements AutoCloseable { } catch (final WritePendingException e) { - if (wasPending == false) { + if (!wasPending) { queueRequest(ctx, byteBufMsg, promise); } } diff --git a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java index 812080618c..9f79caf3f0 100644 --- a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java +++ b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java @@ -69,18 +69,18 @@ public class CreateSubscription extends AbstractSingletonNetconfOperation // Replay not supported final Optional startTime = operationElement.getOnlyChildElementWithSameNamespaceOptionally("startTime"); - Preconditions.checkArgument(startTime.isPresent() == false, "StartTime element not yet supported"); + Preconditions.checkArgument(!startTime.isPresent(), "StartTime element not yet supported"); // Stop time not supported final Optional stopTime = operationElement.getOnlyChildElementWithSameNamespaceOptionally("stopTime"); - Preconditions.checkArgument(stopTime.isPresent() == false, "StopTime element not yet supported"); + Preconditions.checkArgument(!stopTime.isPresent(), "StopTime element not yet supported"); final StreamNameType streamNameType = parseStreamIfPresent(operationElement); Preconditions.checkNotNull(netconfSession); // Premature streams are allowed (meaning listener can register even if no provider is available yet) - if (notifications.isStreamAvailable(streamNameType) == false) { + if (!notifications.isStreamAvailable(streamNameType)) { LOG.warn("Registering premature stream {}. No publisher available yet for session {}", streamNameType, getNetconfSessionIdForReporting()); } diff --git a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/Get.java b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/Get.java index 3655ae209c..0ff934b39d 100644 --- a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/Get.java +++ b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/Get.java @@ -65,7 +65,7 @@ public class Get extends AbstractNetconfOperation implements AutoCloseable { throws DocumentedException { final Document partialResponse = subsequentOperation.execute(requestMessage); final Streams availableStreams = notificationRegistry.getNotificationPublishers(); - if (availableStreams.getStream().isEmpty() == false) { + if (!availableStreams.getStream().isEmpty()) { serializeStreamsSubtree(partialResponse, availableStreams); } return partialResponse; diff --git a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/RemoteNetconfCommand.java b/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/RemoteNetconfCommand.java index b5a6355d29..d8d4148a9e 100644 --- a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/RemoteNetconfCommand.java +++ b/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/RemoteNetconfCommand.java @@ -142,7 +142,7 @@ public class RemoteNetconfCommand implements AsyncCommand, SessionAware { @Override public void operationComplete(final ChannelFuture future) throws Exception { - if (future.isSuccess() == false) { + if (!future.isSuccess()) { LOG.warn("Unable to release internal connection to netconf server on channel: {}", clientChannel); } diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java index 96e19b9378..4f6d852e69 100644 --- a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java +++ b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java @@ -135,10 +135,10 @@ public class SubtreeFilter { MatchingResult matches = matches(src, filter); if (matches != MatchingResult.NO_MATCH && matches != MatchingResult.CONTENT_MISMATCH) { // copy srcChild to dst - boolean filterHasChildren = filter.getChildElements().isEmpty() == false; + boolean filterHasChildren = !filter.getChildElements().isEmpty(); // copy to depth if this is leaf of filter tree - Element copied = (Element) document.importNode(src.getDomElement(), filterHasChildren == false); - boolean shouldAppend = filterHasChildren == false; + Element copied = (Element) document.importNode(src.getDomElement(), !filterHasChildren); + boolean shouldAppend = !filterHasChildren; if (filterHasChildren) { // this implies TAG_MATCH // do the same recursively int numberOfTextMatchingChildren = 0; @@ -191,7 +191,7 @@ public class SubtreeFilter { if (result == null) { for (Attr attr : filter.getAttributes().values()) { // ignore namespace declarations - if (XmlUtil.XMLNS_URI.equals(attr.getNamespaceURI()) == false) { + if (!XmlUtil.XMLNS_URI.equals(attr.getNamespaceURI())) { // find attr with matching localName(), namespaceURI(), == value() in src String found = src.getAttribute(attr.getLocalName(), attr.getNamespaceURI()); if (attr.getValue().equals(found) && result != MatchingResult.NO_MATCH) { diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java index 6f42761afe..f5ae6935b5 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java @@ -89,7 +89,7 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { */ static NetconfStateSchemas create(final DOMRpcService deviceRpc, final NetconfSessionPreferences remoteSessionCapabilities, final RemoteDeviceId id) { - if (remoteSessionCapabilities.isMonitoringSupported() == false) { + if (!remoteSessionCapabilities.isMonitoringSupported()) { // TODO - need to search for get-schema support, not just ietf-netconf-monitoring support // issue might be a deviation to ietf-netconf-monitoring where get-schema is unsupported... LOG.warn("{}: Netconf monitoring not supported on device, cannot detect provided schemas", id); @@ -108,7 +108,7 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { return EMPTY; } - if (schemasNodeResult.getErrors().isEmpty() == false) { + if (!schemasNodeResult.getErrors().isEmpty()) { LOG.warn("{}: Unable to detect available schemas, get to {} failed, {}", id, STATE_SCHEMAS_IDENTIFIER, schemasNodeResult.getErrors()); return EMPTY; @@ -158,13 +158,13 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { } final Optional> dataNode = ((DataContainerNode) result).getChild(toId(NETCONF_DATA_QNAME)); - if (dataNode.isPresent() == false) { + if (!dataNode.isPresent()) { return Optional.absent(); } final Optional> nStateNode = ((DataContainerNode) dataNode.get()).getChild(toId(NetconfState.QNAME)); - if (nStateNode.isPresent() == false) { + if (!nStateNode.isPresent()) { return Optional.absent(); } @@ -191,14 +191,14 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { final String formatAsString = getSingleChildNodeValue(schemaNode, childNode).get(); - if (formatAsString.equals(Yang.QNAME.toString()) == false) { + if (!formatAsString.equals(Yang.QNAME.toString())) { LOG.debug("{}: Ignoring schema due to unsupported format: {}", id, formatAsString); return Optional.absent(); } childNode = NetconfMessageTransformUtil.IETF_NETCONF_MONITORING_SCHEMA_LOCATION; final Set locationsAsString = getAllChildNodeValues(schemaNode, childNode); - if (locationsAsString.contains(Schema.Location.Enumeration.NETCONF.toString()) == false) { + if (!locationsAsString.contains(Schema.Location.Enumeration.NETCONF.toString())) { LOG.debug("{}: Ignoring schema due to unsupported location: {}", id, locationsAsString); return Optional.absent(); } @@ -272,11 +272,7 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { final RemoteYangSchema that = (RemoteYangSchema) obj; - if (!qname.equals(that.qname)) { - return false; - } - - return true; + return qname.equals(that.qname); } @Override diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NotificationHandler.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NotificationHandler.java index 5b28366c07..7db88e0d04 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NotificationHandler.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NotificationHandler.java @@ -72,7 +72,7 @@ final class NotificationHandler { } private void queueNotification(final NetconfMessage notification) { - Preconditions.checkState(passNotifications == false); + Preconditions.checkState(!passNotifications); LOG.debug("{}: Caching notification {}, remote schema not yet fully built", id, notification); if (LOG.isTraceEnabled()) { diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java index 85b45e9f94..8f010e7780 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java @@ -35,7 +35,7 @@ final class UncancellableFuture extends AbstractFuture { @Override public synchronized boolean cancel(final boolean mayInterruptIfRunning) { - return uncancellable ? false : super.cancel(mayInterruptIfRunning); + return !uncancellable && super.cancel(mayInterruptIfRunning); } @Override diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java index 80566edcf3..4726b7aaa7 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java @@ -206,7 +206,7 @@ public class NetconfMessageTransformUtil { final String inputMsgId = input.getDocument().getDocumentElement().getAttribute(MESSAGE_ID_ATTR); final String outputMsgId = output.getDocument().getDocumentElement().getAttribute(MESSAGE_ID_ATTR); - if (inputMsgId.equals(outputMsgId) == false) { + if (!inputMsgId.equals(outputMsgId)) { final Map errorInfo = ImmutableMap.builder() .put("actual-message-id", outputMsgId) .put("expected-message-id", inputMsgId) diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/MessageCounter.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/MessageCounter.java index 555c6a3f10..5ce347494b 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/MessageCounter.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/MessageCounter.java @@ -18,7 +18,7 @@ public class MessageCounter { private static final String MESSAGE_ID_BLUEPRINT = "%s-%s"; public String getNewMessageId(final String prefix) { - Preconditions.checkArgument(Strings.isNullOrEmpty(prefix) == false, "Null or empty prefix"); + Preconditions.checkArgument(!Strings.isNullOrEmpty(prefix), "Null or empty prefix"); return String.format(MESSAGE_ID_BLUEPRINT, prefix, getNewMessageId()); } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java index c52e55e7f5..bfb39330ae 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java @@ -160,11 +160,7 @@ public final class RemoteDeviceId { if (!name.equals(that.name)) { return false; } - if (!bindingPath.equals(that.bindingPath)) { - return false; - } - - return true; + return bindingPath.equals(that.bindingPath); } @Override diff --git a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/Cli.java b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/Cli.java index 8df78fa542..f29c8062b1 100644 --- a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/Cli.java +++ b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/Cli.java @@ -67,7 +67,7 @@ public class Cli implements Runnable { final String commandName = consoleIO.read(); final Optional commandOpt = commandRegistry.getCommand(commandName); - if (commandOpt.isPresent() == false) { + if (!commandOpt.isPresent()) { continue; } diff --git a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/NetconfDeviceConnectionManager.java b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/NetconfDeviceConnectionManager.java index aeebcbf669..99e25bb0c3 100644 --- a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/NetconfDeviceConnectionManager.java +++ b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/NetconfDeviceConnectionManager.java @@ -110,7 +110,7 @@ public class NetconfDeviceConnectionManager implements Closeable { final NetconfClientConfigurationBuilder configBuilder) { this.connect(name, address, configBuilder); synchronized (handler) { - while (handler.isUp() == false) { + while (!handler.isUp()) { try { // TODO implement Timeout for unsuccessful connection handler.wait(); diff --git a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/commands/CommandDispatcher.java b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/commands/CommandDispatcher.java index da448515a5..53583985a2 100644 --- a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/commands/CommandDispatcher.java +++ b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/commands/CommandDispatcher.java @@ -80,7 +80,7 @@ public class CommandDispatcher { public synchronized Optional getCommand(final String nameWithModule) { final QName commandQName = mergeCommandIds().get(nameWithModule); final Map qNameCommandMap = mergeCommands(); - if (commandQName == null || qNameCommandMap.containsKey(commandQName) == false) { + if (commandQName == null || !qNameCommandMap.containsKey(commandQName)) { return Optional.absent(); } diff --git a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/commands/output/Output.java b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/commands/output/Output.java index 45a7b4ad22..dd06fda5af 100644 --- a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/commands/output/Output.java +++ b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/commands/output/Output.java @@ -33,7 +33,7 @@ public class Output { } public Map>> unwrap(final OutputDefinition outputDefinition) { - Preconditions.checkArgument(outputDefinition.isEmpty() == false); + Preconditions.checkArgument(!outputDefinition.isEmpty()); final Map mappedSchemaNodes = mapOutput(outputDefinition); final Map>> mappedNodesToSchema = Maps.newHashMap(); diff --git a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/AbstractReader.java b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/AbstractReader.java index 1b1d222231..de7f41b3b9 100644 --- a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/AbstractReader.java +++ b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/AbstractReader.java @@ -72,10 +72,7 @@ public abstract class AbstractReader implements Reader } private boolean isReadingWanted(final DataSchemaNode node) { - if (readConfigNode && !node.isConfiguration()) { - return false; - } - return true; + return !readConfigNode || node.isConfiguration(); } // TODO javadoc diff --git a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/custom/ConfigReader.java b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/custom/ConfigReader.java index 995e232d87..74daadb706 100644 --- a/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/custom/ConfigReader.java +++ b/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/custom/ConfigReader.java @@ -194,7 +194,7 @@ public class ConfigReader extends AbstractReader { private Optional getCurrentNode(DataSchemaNode parent, final String buffer) { for (final String part : buffer.split(SEPARATOR)) { - if (IOUtil.isQName(part) == false) { + if (!IOUtil.isQName(part)) { return Optional.of(parent); } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java index 6217e6590c..3a0b69a47e 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java @@ -140,7 +140,7 @@ public final class Main { public List generate(final boolean useSsh, final int batchSize, final int generateConfigsTimeout, final String address, final int devicesPerPort) { - if (configDir.exists() == false) { + if (!configDir.exists()) { Preconditions.checkState(configDir.mkdirs(), "Unable to create directory " + configDir); } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java index 2f4bf0334f..4814940f33 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java @@ -141,7 +141,7 @@ public class Parameters { Preconditions.checkArgument(timeout > 0, "Timeout =< 0"); Preconditions.checkArgument(editContent.exists(), "Edit content file missing"); - Preconditions.checkArgument(editContent.isDirectory() == false, "Edit content file is a dir"); + Preconditions.checkArgument(!editContent.isDirectory(), "Edit content file is a dir"); Preconditions.checkArgument(editContent.canRead(), "Edit content file is unreadable"); Preconditions.checkArgument(destination.startsWith("/"), "Destination should start with a '/'"); diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/Parameters.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/Parameters.java index fdd2202678..03e7ed988b 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/Parameters.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/Parameters.java @@ -185,7 +185,7 @@ public class Parameters { } Preconditions.checkArgument(editContent.exists(), "Edit content file missing"); - Preconditions.checkArgument(editContent.isDirectory() == false, "Edit content file is a dir"); + Preconditions.checkArgument(!editContent.isDirectory(), "Edit content file is a dir"); Preconditions.checkArgument(editContent.canRead(), "Edit content file is unreadable"); Preconditions.checkArgument(threadAmount > 0, "Parameter thread-amount must be greater than 0"); Preconditions.checkArgument(msgTimeout >= 0, "Parameter msg-timeout must be greater than 0"); diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/IdentityValuesDTO.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/IdentityValuesDTO.java index 8d2de78788..1b73749a82 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/IdentityValuesDTO.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/IdentityValuesDTO.java @@ -135,7 +135,7 @@ public final class IdentityValuesDTO { } public boolean isLeafList() { - return name == null ? true : false; + return name == null; } } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Config.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Config.java index a48d962b8b..a11525408b 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Config.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Config.java @@ -75,11 +75,7 @@ public class Config { return false; } - if (!java.util.Objects.equals(put, that.put)) { - return false; - } - - return true; + return java.util.Objects.equals(put, that.put); } } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Delete.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Delete.java index dd3c4fcd11..16a815bd10 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Delete.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Delete.java @@ -63,11 +63,7 @@ public class Delete { return false; } - if (!java.util.Objects.equals(failedResponses, that.failedResponses)) { - return false; - } - - return true; + return java.util.Objects.equals(failedResponses, that.failedResponses); } } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Get.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Get.java index d2b4b6295d..45603a8e5e 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Get.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Get.java @@ -62,11 +62,7 @@ public class Get { return false; } - if (!java.util.Objects.equals(failedResponses, that.failedResponses)) { - return false; - } - - return true; + return java.util.Objects.equals(failedResponses, that.failedResponses); } } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Operational.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Operational.java index a8318544e9..5d9989b535 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Operational.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Operational.java @@ -32,11 +32,7 @@ public class Operational { return false; } final Operational that = (Operational) obj; - if (!java.util.Objects.equals(get, that.get)) { - return false; - } - - return true; + return java.util.Objects.equals(get, that.get); } } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Post.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Post.java index 8a460083a5..a466c01309 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Post.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Post.java @@ -62,11 +62,7 @@ public class Post { return false; } - if (!java.util.Objects.equals(failedResponses, that.failedResponses)) { - return false; - } - - return true; + return java.util.Objects.equals(failedResponses, that.failedResponses); } } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Put.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Put.java index 2eb6bae9aa..589f02cdba 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Put.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Put.java @@ -62,10 +62,6 @@ public class Put { return false; } - if (!java.util.Objects.equals(failedResponses, that.failedResponses)) { - return false; - } - - return true; + return java.util.Objects.equals(failedResponses, that.failedResponses); } } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Rpcs.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Rpcs.java index 6a4596eac3..d849a4dba8 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Rpcs.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Rpcs.java @@ -62,10 +62,6 @@ public class Rpcs { return false; } - if (!java.util.Objects.equals(failedResponses, that.failedResponses)) { - return false; - } - - return true; + return java.util.Objects.equals(failedResponses, that.failedResponses); } } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractCommonSubscriber.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractCommonSubscriber.java index 371cf7607b..67cffe212a 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractCommonSubscriber.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractCommonSubscriber.java @@ -104,7 +104,7 @@ abstract class AbstractCommonSubscriber extends AbstractQueryParams implements B * @return True if exist, false otherwise. */ public boolean isListening() { - return this.registration == null ? false : true; + return this.registration != null; } /** diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/util/RestDocgenUtil.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/util/RestDocgenUtil.java index f709d03652..6c21c267af 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/util/RestDocgenUtil.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/util/RestDocgenUtil.java @@ -82,10 +82,7 @@ public class RestDocgenUtil { private static boolean isEqualNamespaceAndRevision(final QName parentQName, final QName nodeQName) { if (parentQName == null) { - if (nodeQName == null) { - return true; - } - return false; + return nodeQName == null; } return parentQName.getNamespace().equals(nodeQName.getNamespace()) && parentQName.getRevision().equals(nodeQName.getRevision()); -- 2.36.6