From d7b76c5423e3130047f21f1485faf5b0393b2d98 Mon Sep 17 00:00:00 2001 From: Igor Foltin Date: Fri, 11 Sep 2015 15:03:56 +0200 Subject: [PATCH] Fixed some major sonar issues - mockito-configuration - websocket-client - yang-common - concepts Change-Id: I5a418919e09ce7e423d31a64759349b9e05be5ad Signed-off-by: Igor Foltin --- .../concepts/CompositeObjectRegistration.java | 4 ++-- .../ThrowsUnstubbedMethodException.java | 2 +- .../websocket/client/WebSocketClientHandler.java | 12 ++++++------ .../opendaylight/yangtools/yang/common/QName.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java index 16daf74007..265866f518 100644 --- a/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java +++ b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java @@ -50,7 +50,7 @@ public final class CompositeObjectRegistration extends AbstractObjectRegistra } public CompositeObjectRegistrationBuilder add(final ObjectRegistration registration) { - if (registration.getInstance() != instance) { + if (!registration.getInstance().equals(instance)) { throw new IllegalArgumentException("Instance must be same."); } registrations.add(registration); @@ -58,7 +58,7 @@ public final class CompositeObjectRegistration extends AbstractObjectRegistra } public CompositeObjectRegistrationBuilder remove(final ObjectRegistration registration) { - if (registration.getInstance() != instance) { + if (!registration.getInstance().equals(instance)) { throw new IllegalArgumentException("Instance must be same."); } registrations.remove(registration); diff --git a/common/mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java b/common/mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java index 95b5c2054d..d039130588 100644 --- a/common/mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java +++ b/common/mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java @@ -18,7 +18,7 @@ public class ThrowsUnstubbedMethodException implements Answer, Serializa private static final long serialVersionUID = 1L; @Override - public Object answer(final InvocationOnMock invocation) throws UnstubbedMethodException { + public Object answer(final InvocationOnMock invocation) { throw new UnstubbedMethodException(invocation.toString() + " was not stubbed"); } } diff --git a/websocket/websocket-client/src/main/java/org/opendaylight/yangtools/websocket/client/WebSocketClientHandler.java b/websocket/websocket-client/src/main/java/org/opendaylight/yangtools/websocket/client/WebSocketClientHandler.java index d2392a4fd3..b4f98eb4da 100644 --- a/websocket/websocket-client/src/main/java/org/opendaylight/yangtools/websocket/client/WebSocketClientHandler.java +++ b/websocket/websocket-client/src/main/java/org/opendaylight/yangtools/websocket/client/WebSocketClientHandler.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; */ public class WebSocketClientHandler extends SimpleChannelInboundHandler { - private static final Logger logger = LoggerFactory + private static final Logger LOGGER = LoggerFactory .getLogger(WebSocketClientHandler.class.toString()); private final WebSocketClientHandshaker handshaker; private ChannelPromise handshakeFuture; @@ -72,7 +72,7 @@ public class WebSocketClientHandler extends SimpleChannelInboundHandler @Override public void channelInactive(ChannelHandlerContext ctx) throws Exception { - logger.info("WebSocket Client disconnected!"); + LOGGER.info("WebSocket Client disconnected!"); } @Override @@ -81,7 +81,7 @@ public class WebSocketClientHandler extends SimpleChannelInboundHandler Channel ch = ctx.channel(); if (!handshaker.isHandshakeComplete()) { handshaker.finishHandshake(ch, (FullHttpResponse) msg); - logger.info("WebSocket Client connected!"); + LOGGER.info("WebSocket Client connected!"); handshakeFuture.setSuccess(); return; } @@ -100,12 +100,12 @@ public class WebSocketClientHandler extends SimpleChannelInboundHandler if (frame instanceof TextWebSocketFrame) { TextWebSocketFrame textFrame = (TextWebSocketFrame) frame; - logger.info("WebSocket Client received message: " + LOGGER.info("WebSocket Client received message: " + textFrame.text()); } else if (frame instanceof PongWebSocketFrame) { - logger.info("WebSocket Client received pong"); + LOGGER.info("WebSocket Client received pong"); } else if (frame instanceof CloseWebSocketFrame) { - logger.info("WebSocket Client received closing"); + LOGGER.info("WebSocket Client received closing"); ch.close(); } } diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java index 588579fdb9..25f6d30b99 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java @@ -82,7 +82,7 @@ public final class QName implements Immutable, Serializable, Comparable { final QNameModule cacheMod = QNameModule.cachedReference(myMod); final QName what; - if (cacheMod == myMod) { + if (cacheMod.equals(myMod)) { what = qname; } else { what = QName.create(cacheMod, qname.localName); -- 2.36.6