aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/test/java/com/yahoo/search/searchchain
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-05-30 09:28:31 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-05-30 09:28:31 +0200
commit2aeedde3a3f946d4ecd4ab5f942e7ed7c841af23 (patch)
tree1e9e8076b09bd3e5bb00624c10aa84586785fd10 /container-search/src/test/java/com/yahoo/search/searchchain
parent9f8ba0d5208bfcf102b0d9afded28c88f8326151 (diff)
use standard formatting for Override annotation
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/searchchain')
-rw-r--r--container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java12
-rw-r--r--container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java3
-rw-r--r--container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java18
3 files changed, 22 insertions, 11 deletions
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();)