diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-05-30 09:28:31 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-05-30 09:28:31 +0200 |
commit | 2aeedde3a3f946d4ecd4ab5f942e7ed7c841af23 (patch) | |
tree | 1e9e8076b09bd3e5bb00624c10aa84586785fd10 /container-search/src/test/java/com/yahoo | |
parent | 9f8ba0d5208bfcf102b0d9afded28c88f8326151 (diff) |
use standard formatting for Override annotation
Diffstat (limited to 'container-search/src/test/java/com/yahoo')
9 files changed, 60 insertions, 30 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java index 40d68a29a71..35beb5cb96c 100644 --- a/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java @@ -112,7 +112,8 @@ public class TilingTestCase extends junit.framework.TestCase { private static class TiledResultProducer extends Searcher { - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { Result result=new Result(query); result.setTotalHitCount(2800000000l); @@ -256,7 +257,8 @@ public class TilingTestCase extends junit.framework.TestCase { private static class TiledResultProducer2 extends Searcher { - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { Result result=new Result(query); result.setTotalHitCount(1); diff --git a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java index 2dd3131eb6e..58107513ee2 100644 --- a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java @@ -31,7 +31,8 @@ public class ClusterSearcherTestCase extends TestCase { this.hit = hit; } - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { Result result = execution.search(query); result.hits().add(hit); return result; @@ -127,15 +128,18 @@ public class ClusterSearcherTestCase extends TestCase { super(id,searchers,hasher,false); } - public @Override Result search(Query query,Execution execution,Searcher searcher) { + @Override + public Result search(Query query,Execution execution,Searcher searcher) { return searcher.search(query,execution); } - public @Override void fill(Result result,String summaryName,Execution execution,Searcher searcher) { + @Override + public void fill(Result result,String summaryName,Execution execution,Searcher searcher) { searcher.fill(result,summaryName,execution); } - public @Override Pong ping(Ping ping,Searcher searcher) { + @Override + public Pong ping(Ping ping,Searcher searcher) { return new Execution(searcher, Execution.Context.createContextStub()).ping(ping); } diff --git a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java index 06686e8777a..01fea6f0842 100644 --- a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java @@ -161,17 +161,20 @@ public class ClusteredConnectionTestCase extends junit.framework.TestCase { super(componentId,connections,false); } - public @Override Result search(Query query,Execution execution,Connection connection) { + @Override + public Result search(Query query,Execution execution,Connection connection) { Result result=new Result(query); result.hits().add(new Hit("from:" + connection.getResponse())); return result; } - public @Override void fill(Result result,String summary,Execution execution,Connection connection) { + @Override + public void fill(Result result,String summary,Execution execution,Connection connection) { result.hits().get(0).fields().put("filled",connection.getResponse()); } - public @Override Pong ping(Ping ping,Connection connection) { + @Override + public Pong ping(Ping ping,Connection connection) { Pong pong=new Pong(); if (connection.getResponse()==null) pong.addError(ErrorMessage.createBackendCommunicationError("No ping response from '" + connection + "'")); @@ -189,7 +192,8 @@ public class ClusteredConnectionTestCase extends junit.framework.TestCase { this.hashValue = hashValue; } - public @Override int hashCode() { + @Override + public int hashCode() { return hashValue; } diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java index 11698b2b70d..2dd46b54661 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java @@ -113,7 +113,8 @@ public class QueryProfileIntegrationTestCase extends junit.framework.TestCase { public static class DefaultSearcher extends Searcher { - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { Result result=execution.search(query); result.hits().add(new Hit("from:default")); return result; @@ -123,7 +124,8 @@ public class QueryProfileIntegrationTestCase extends junit.framework.TestCase { public static class TestSearcher extends Searcher { - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { Result result=execution.search(query); result.hits().add(new Hit("from:test")); return result; @@ -135,7 +137,8 @@ public class QueryProfileIntegrationTestCase extends junit.framework.TestCase { @Provides("SomeObject") public static class SettingSearcher extends Searcher { - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { SomeObject.setTo(query,new SomeObject()); return execution.search(query); } @@ -146,7 +149,8 @@ public class QueryProfileIntegrationTestCase extends junit.framework.TestCase { @After("SomeObject") public static class ReceivingSearcher extends Searcher { - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { assertNotNull(SomeObject.getFrom(query)); assertEquals(SomeObject.class,SomeObject.getFrom(query).getClass()); return execution.search(query); diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java index 4e68ac92adc..7877e48ea50 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java @@ -194,11 +194,14 @@ public class CloningTestCase extends junit.framework.TestCase { public void set(String string) { this.string=string; } - public @Override String toString() { return string; } + @Override + public String toString() { return string; } - public @Override int hashCode() { return string.hashCode(); } + @Override + public int hashCode() { return string.hashCode(); } - public @Override boolean equals(Object other) { + @Override + public boolean equals(Object other) { if (other==this) return true; if ( ! (other instanceof MutableString)) return false; return ((MutableString)other).string.equals(string); @@ -212,7 +215,8 @@ public class CloningTestCase extends junit.framework.TestCase { super(string); } - public @Override CloneableMutableString clone() { + @Override + public CloneableMutableString clone() { try { return (CloneableMutableString)super.clone(); } diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java index 4d611e3e842..17475d20292 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java @@ -92,7 +92,8 @@ public class SearchChainConfigurerTestCase { } public static abstract class TestSearcher extends Searcher { - public @Override Result search(Query query, Execution execution) { + @Override + public Result search(Query query, Execution execution) { return execution.search(query); } } @@ -234,7 +235,8 @@ public class SearchChainConfigurerTestCase { this.intConfig = intConfig; this.stringConfig = stringConfig; } - public @Override Result search(Query query, Execution execution) { + @Override + public Result search(Query query, Execution execution) { return execution.search(query); } } @@ -244,7 +246,8 @@ public class SearchChainConfigurerTestCase { public IntSearcher(IntConfig intConfig) { this.intConfig = intConfig; } - public @Override Result search(Query query, Execution execution) { + @Override + public Result search(Query query, Execution execution) { return execution.search(query); } } @@ -254,7 +257,8 @@ public class SearchChainConfigurerTestCase { public StringSearcher(StringConfig stringConfig) { this.stringConfig = stringConfig; } - public @Override Result search(Query query, Execution execution) { + @Override + public Result search(Query query, Execution execution) { return execution.search(query); } } diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java index 6c38df8fe08..92bc09c0162 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java @@ -13,7 +13,8 @@ public class UpdateSearcher extends com.yahoo.search.Searcher { public String test = "update"; - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { Result result=execution.search(query); if (result==null) result=new Result(query); diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java index 642d8d8cd7e..5b1d99363a3 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java @@ -219,7 +219,8 @@ public class ExecutionTestCase extends junit.framework.TestCase { super(new ComponentId(id)); } - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { Result result=execution.search(query); result.hits().add(new Hit(getId().stringValue() + "-" + (counter++))); return result; @@ -229,7 +230,8 @@ public class ExecutionTestCase extends junit.framework.TestCase { public static class ForwardingSearcher extends Searcher { - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { Chain<Searcher> forwardTo=execution.context().searchChainRegistry().getChain("someChainId"); return new Execution(forwardTo,execution.context()).search(query); @@ -245,7 +247,8 @@ public class ExecutionTestCase extends junit.framework.TestCase { super(new ComponentId(id)); } - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { Result result=execution.search(query); Hit hit=new Hit(getId().stringValue() + "-" + counter); hit.setFillable(); @@ -253,7 +256,8 @@ public class ExecutionTestCase extends junit.framework.TestCase { return result; } - public @Override void fill(Result result,String summaryClass,Execution execution) { + @Override + public void fill(Result result,String summaryClass,Execution execution) { result.hits().add(new Hit(getId().stringValue() + "-" + (counter++) + "-filled")); // Not something one would normally do in fill } @@ -270,7 +274,8 @@ public class ExecutionTestCase extends junit.framework.TestCase { @After("com.yahoo.search.searchchain.test.ExecutionTestCase$TestSearcher") public static class FillingSearcher extends Searcher { - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { Result result=execution.search(query); execution.fill(result); return result; @@ -282,7 +287,8 @@ public class ExecutionTestCase extends junit.framework.TestCase { @Before("com.yahoo.search.searchchain.test.ExecutionTestCase$TestSearcher") public static class WorkflowSearcher extends Searcher { - public @Override Result search(Query query,Execution execution) { + @Override + public Result search(Query query,Execution execution) { Result result1=execution.search(query); Result result2=execution.search(query); for (Iterator<Hit> i=result2.hits().iterator(); i.hasNext();) diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java index 1fe62c2cd35..0932b202dac 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java @@ -114,7 +114,8 @@ public class MetricsSearcherTestCase { this.implicitlyCreateContext = implicitlyCreateContext; } - public @Override Result search(Query query, Execution execution) { + @Override + public Result search(Query query, Execution execution) { if (implicitlyCreateContext) { String loadType = query.properties().getString("streaming.loadtype"); assignContextProperties(query, loadType); |