From 69299ce4f9da74b94ab60cda00907b0b5f35f955 Mon Sep 17 00:00:00 2001 From: Rob Adams Date: Fri, 20 Jun 2014 16:16:59 -0700 Subject: [PATCH] Fix various warnings from json-rpc Change-Id: I707f6b77b09c61fe2bbfc1a57b892732eb0923aa Signed-off-by: Rob Adams --- groupbasedpolicy/pom.xml | 3 --- .../renderer/ChannelConnectionHandler.java | 2 -- .../lib/jsonrpc/InvalidEncodingException.java | 1 + .../renderer/lib/jsonrpc/JsonRpcDecoder.java | 15 --------------- .../resolver/internal/PolicyCache.java | 2 -- .../jsonrpc/JsonRpcServiceBinderHandlerTest.java | 8 -------- 6 files changed, 1 insertion(+), 30 deletions(-) diff --git a/groupbasedpolicy/pom.xml b/groupbasedpolicy/pom.xml index 2fed4c403..77c1d5a79 100644 --- a/groupbasedpolicy/pom.xml +++ b/groupbasedpolicy/pom.xml @@ -30,12 +30,10 @@ com.fasterxml.jackson.core jackson-core - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.google.guava @@ -82,7 +80,6 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson.version} test 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 8307bdb09..1fb569034 100644 --- 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 c1a31e112..f83654d1d 100644 --- 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 19e156b5e..4c76eaf87 100644 --- 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 7e90136aa..4435d988d 100644 --- 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 717c4996e..81c21690c 100644 --- 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; -- 2.36.6