From 1f554f8bb745cb3b5ea60e9dd2aafd10ceb1f22e Mon Sep 17 00:00:00 2001 From: Olli Virtanen Date: Thu, 30 Aug 2018 10:08:02 +0200 Subject: Clean issues/warnings reported in Eclipse IDE --- .../src/main/java/com/yahoo/search/dispatch/RpcClient.java | 1 - .../src/main/java/com/yahoo/search/dispatch/SearchCluster.java | 1 - container-search/src/main/java/com/yahoo/search/yql/TypeCheckers.java | 3 ++- .../test/java/com/yahoo/prelude/hitfield/test/JSONStringTestCase.java | 4 ++-- .../src/test/java/com/yahoo/search/dispatch/FillTestCase.java | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) (limited to 'container-search') diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/RpcClient.java b/container-search/src/main/java/com/yahoo/search/dispatch/RpcClient.java index 8107a50e8c0..67e032eca37 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/RpcClient.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/RpcClient.java @@ -15,7 +15,6 @@ import com.yahoo.jrt.Values; import com.yahoo.prelude.fastsearch.FastHit; import java.util.List; -import java.util.concurrent.atomic.AtomicReference; /** * A client which uses rpc request to search nodes to implement the Client API. diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/SearchCluster.java b/container-search/src/main/java/com/yahoo/search/dispatch/SearchCluster.java index efce2fdac9c..48ddba6c301 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/SearchCluster.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/SearchCluster.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.dispatch; -import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/container-search/src/main/java/com/yahoo/search/yql/TypeCheckers.java b/container-search/src/main/java/com/yahoo/search/yql/TypeCheckers.java index cb693d6801d..af54d28c2ac 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/TypeCheckers.java +++ b/container-search/src/main/java/com/yahoo/search/yql/TypeCheckers.java @@ -64,7 +64,8 @@ final class TypeCheckers { TypeLiteral arg = TypeLiteral.get(type.getActualTypeArguments()[0]); if (OperatorNode.class.isAssignableFrom(arg.getRawType())) { Preconditions.checkArgument(arg.getType() instanceof ParameterizedType, "Type spec must be List>"); - Class optype = (Class) TypeLiteral.get(((ParameterizedType) arg.getType()).getActualTypeArguments()[0]).getRawType(); + Class rawType = (Class) TypeLiteral.get(((ParameterizedType) arg.getType()).getActualTypeArguments()[0]).getRawType(); + Class optype = (Class) rawType; return new OperatorNodeListTypeChecker(parent, idx, optype, ImmutableSet.of()); } else { return new JavaListTypeChecker(parent, idx, arg.getRawType()); diff --git a/container-search/src/test/java/com/yahoo/prelude/hitfield/test/JSONStringTestCase.java b/container-search/src/test/java/com/yahoo/prelude/hitfield/test/JSONStringTestCase.java index 09a439c7bc9..18231785a26 100644 --- a/container-search/src/test/java/com/yahoo/prelude/hitfield/test/JSONStringTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/hitfield/test/JSONStringTestCase.java @@ -329,8 +329,8 @@ public class JSONStringTestCase { String rendered = js.renderFromInspector(); assertTrue(-1 < rendered.indexOf(f1)); - int offsetF2; - assertTrue(-1 < (offsetF2 = rendered.indexOf(f2))); + int offsetF2 = rendered.indexOf(f2); + assertTrue(-1 < offsetF2); offsetF2 += f2.length(); assertTrue(-1 < rendered.indexOf(f2_1, offsetF2)); assertTrue(-1 < rendered.indexOf(f2_2, offsetF2)); diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/FillTestCase.java b/container-search/src/test/java/com/yahoo/search/dispatch/FillTestCase.java index 0191b1a799b..5e3e0dc301e 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/FillTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/FillTestCase.java @@ -2,7 +2,6 @@ package com.yahoo.search.dispatch; import com.yahoo.compress.CompressionType; -import com.yahoo.log.event.Collection; import com.yahoo.prelude.fastsearch.DocsumDefinition; import com.yahoo.prelude.fastsearch.DocsumDefinitionSet; import com.yahoo.prelude.fastsearch.DocsumField; -- cgit v1.2.3