Fix various warnings from json-rpc

Change-Id: I707f6b77b09c61fe2bbfc1a57b892732eb0923aa
Signed-off-by: Rob Adams <readams@readams.net>

diff --git a/groupbasedpolicy/pom.xml b/groupbasedpolicy/pom.xml
index 2fed4c403d20c26d3344bf118e309e1dde032760..77c1d5a792cebe463abf1d48deedee56c819d1bc 100644 (file)
--- a/groupbasedpolicy/pom.xml
+++ b/groupbasedpolicy/pom.xml
@@ -30,12 +30,10 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -82,7 +80,6 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>${jackson.version}</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ChannelConnectionHandler.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ChannelConnectionHandler.java
index 8307bdb09459f1980be3bb8c5d9c6bfa79fa294f..1fb569034980509afe011d6088aa8335fd476d54 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ChannelConnectionHandler.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ChannelConnectionHandler.java
@@ -9,8 +9,6 @@
  */
 package org.opendaylight.groupbasedpolicy.renderer;
 
-import org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc.JsonRpcEndpoint;
-
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/InvalidEncodingException.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/InvalidEncodingException.java
index c1a31e11227c410fa4ea1f2ebb5f16b7ab0f9428..f83654d1d08eb8ba64e3ba43ed5409d6575d9796 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/InvalidEncodingException.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/InvalidEncodingException.java
@@ -11,6 +11,7 @@ package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
 
 public class InvalidEncodingException extends RuntimeException {
 
+    private static final long serialVersionUID = -2241512201890075052L;
     private final String actual;
 
     public InvalidEncodingException(String actual, String message) {

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcDecoder.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcDecoder.java
index 19e156b5ec97247d797e1e57a6e481e749492f26..4c76eaf8765d1826a5f9861760f0bec3a5d2b975 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcDecoder.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcDecoder.java
@@ -138,21 +138,6 @@ public class JsonRpcDecoder extends ByteToMessageDecoder {
         }
     }
 
-
-    private void print(ByteBuf buf, String message) {
-        print(buf, buf.readerIndex(), buf.readableBytes(), message == null ? "buff" : message);
-    }
-
-    private void print(ByteBuf buf, int startPos, int chars, String message) {
-        if (null == message) message = "";
-        if (startPos > buf.writerIndex()) {
-            logger.trace("startPos out of bounds");
-        }
-        byte[] b = new byte[startPos + chars <= buf.writerIndex() ? chars : buf.writerIndex() - startPos];
-        buf.getBytes(startPos, b);
-        logger.trace("{} ={}", message, new String(b));
-    }
-
     // copied from Netty decoder
     private void fail(ChannelHandlerContext ctx, long frameLength) {
         if (frameLength > 0) {

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/resolver/internal/PolicyCache.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/resolver/internal/PolicyCache.java
index 7e90136aa409b2f667a2cc03f89ef8f649a1658a..4435d988d358add177f06a49bf62f8029ace459a 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/resolver/internal/PolicyCache.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/resolver/internal/PolicyCache.java
@@ -2,7 +2,6 @@ package org.opendaylight.groupbasedpolicy.resolver.internal;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -17,7 +16,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.contract.subject.Rule;
 
 import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Table;
 

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandlerTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandlerTest.java
index 717c4996e8b3b91d75fa987401597225c7944942..81c21690c6ad36725a20c3ae4a4d7c45dd9a0d9e 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandlerTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandlerTest.java
@@ -11,15 +11,7 @@
 package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
 
 import static io.netty.buffer.Unpooled.copiedBuffer;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
 import io.netty.channel.embedded.EmbeddedChannel;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.JsonNode;