Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8995: Replace anonymous implementations of SAM interfaces with Lambdas

This commit is contained in:
Noble Paul 2016-04-15 18:58:08 +05:30
parent 6c74669375
commit f82a27aa5c
18 changed files with 25 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/cloud/rule/RemoteCallback.java
View File

@ -19,5 +19,5 @@ package org.apache.solr.cloud.rule;
import java.util.Map;
public interface RemoteCallback {
public void remoteCallback(SnitchContext ctx, Map<String, Object> returnedVal) ;
void remoteCallback(SnitchContext ctx, Map<String, Object> returnedVal);
}

2
solr/core/src/java/org/apache/solr/handler/NestedRequestHandler.java
View File

@ -24,5 +24,5 @@ import org.apache.solr.request.SolrRequestHandler;
public interface NestedRequestHandler {
/** Return a Requestandler to handle a subpath from the path this handler is registered.
*/
public SolrRequestHandler getSubHandler(String subPath);
SolrRequestHandler getSubHandler(String subPath);
}

11
solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
View File

@ -794,14 +794,9 @@ public class QueryComponent extends SearchComponent
rb.resultIds = new HashMap<>();
}
EndResultTransformer.SolrDocumentSource solrDocumentSource = new EndResultTransformer.SolrDocumentSource() {
@Override
public SolrDocument retrieve(ScoreDoc doc) {
ShardDoc solrDoc = (ShardDoc) doc;
return rb.retrievedDocuments.get(solrDoc.id);
}
EndResultTransformer.SolrDocumentSource solrDocumentSource = doc -> {
ShardDoc solrDoc = (ShardDoc) doc;
return rb.retrievedDocuments.get(solrDoc.id);
};
EndResultTransformer endResultTransformer;
if (groupSpec.isMain()) {

2
solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/EndResultTransformer.java
View File

@ -42,7 +42,7 @@ public interface EndResultTransformer {
* Abstracts the source for {@link SolrDocument} instances.
* The source of documents is different for a distributed search than local search
*/
public interface SolrDocumentSource {
interface SolrDocumentSource {
SolrDocument retrieve(ScoreDoc doc);

2
solr/core/src/java/org/apache/solr/update/SolrCoreState.java
View File

@ -140,7 +140,7 @@ public abstract class SolrCoreState {
public interface IndexWriterCloser {
public void closeWriter(IndexWriter writer) throws IOException;
void closeWriter(IndexWriter writer) throws IOException;
}
public abstract void doRecovery(CoreContainer cc, CoreDescriptor cd);

7
solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java
View File

@ -46,12 +46,7 @@ public class TestCryptoKeys extends AbstractFullDistribZkTestBase {
private void setupHarnesses() {
for (final SolrClient client : clients) {
RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
return ((HttpSolrClient) client).getBaseURL();
}
});
RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient) client).getBaseURL());
restTestHarnesses.add(harness);
}
}

7
solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
View File

@ -45,12 +45,7 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
private void setupHarnesses() {
for (final SolrClient client : clients) {
RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
return ((HttpSolrClient)client).getBaseURL();
}
});
RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient)client).getBaseURL());
restTestHarnesses.add(harness);
}
}

7
solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
View File

@ -60,12 +60,7 @@ public class TestConfigReload extends AbstractFullDistribZkTestBase {
private void setupHarnesses() {
for (final SolrClient client : clients) {
RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
return ((HttpSolrClient)client).getBaseURL();
}
});
RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient)client).getBaseURL());
restTestHarnesses.add(harness);
}
}

7
solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java
View File

@ -43,12 +43,7 @@ public class TestReqParamsAPI extends AbstractFullDistribZkTestBase {
private void setupHarnesses() {
for (final SolrClient client : clients) {
RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
return ((HttpSolrClient) client).getBaseURL();
}
});
RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient) client).getBaseURL());
restTestHarnesses.add(harness);
}
}

7
solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
View File

@ -49,12 +49,7 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
private void setupHarnesses() {
for (final SolrClient client : clients) {
RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
return ((HttpSolrClient)client).getBaseURL();
}
});
RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient)client).getBaseURL());
restTestHarnesses.add(harness);
}
}

7
solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
View File

@ -61,12 +61,7 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBa
private void setupHarnesses() {
for (final SolrClient client : clients) {
RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
return ((HttpSolrClient)client).getBaseURL();
}
});
RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient)client).getBaseURL());
restTestHarnesses.add(harness);
}
}

7
solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
View File

@ -60,12 +60,7 @@ public class TestBulkSchemaConcurrent extends AbstractFullDistribZkTestBase {
private void setupHarnesses() {
for (final SolrClient client : clients) {
RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
return ((HttpSolrClient)client).getBaseURL();
}
});
RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient)client).getBaseURL());
restTestHarnesses.add(harness);
}
}

19
solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java
View File

@ -90,12 +90,7 @@ public class TestCloudManagedSchemaConcurrent extends AbstractFullDistribZkTestB
private void setupHarnesses() {
for (final SolrClient client : clients) {
RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
return ((HttpSolrClient)client).getBaseURL();
}
});
RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient)client).getBaseURL());
restTestHarnesses.add(harness);
}
}
@ -352,11 +347,7 @@ public class TestCloudManagedSchemaConcurrent extends AbstractFullDistribZkTestB
final String coreUrl = (new ZkCoreNodeProps(shard1Leader)).getCoreUrl();
assertNotNull(coreUrl);
RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
public String getBaseURL() {
return coreUrl.endsWith("/") ? coreUrl.substring(0, coreUrl.length()-1) : coreUrl;
}
});
RestTestHarness harness = new RestTestHarness(() -> coreUrl.endsWith("/") ? coreUrl.substring(0, coreUrl.length()-1) : coreUrl);
try {
addFieldTypePut(harness, "fooInt", 15);
} finally {
@ -413,11 +404,7 @@ public class TestCloudManagedSchemaConcurrent extends AbstractFullDistribZkTestB
*/
protected void validateZkVersion(Replica replica, int schemaZkVersion, int waitSecs, boolean retry) throws Exception {
final String replicaUrl = (new ZkCoreNodeProps(replica)).getCoreUrl();
RestTestHarness testHarness = new RestTestHarness(new RESTfulServerProvider() {
public String getBaseURL() {
return replicaUrl.endsWith("/") ? replicaUrl.substring(0, replicaUrl.length()-1) : replicaUrl;
}
});
RestTestHarness testHarness = new RestTestHarness(() -> replicaUrl.endsWith("/") ? replicaUrl.substring(0, replicaUrl.length()-1) : replicaUrl);
try {
long waitMs = waitSecs * 1000L;
if (waitMs > 0) Thread.sleep(waitMs); // wait a moment for the zk watcher to fire

7
solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java
View File

@ -81,12 +81,7 @@ public class TestCloudSchemaless extends AbstractFullDistribZkTestBase {
private void setupHarnesses() {
for (final SolrClient client : clients) {
RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
return ((HttpSolrClient)client).getBaseURL();
}
});
RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient)client).getBaseURL());
restTestHarnesses.add(harness);
}
}

7
solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java
View File

@ -49,12 +49,7 @@ public class TestNamedUpdateProcessors extends AbstractFullDistribZkTestBase {
private void setupHarnesses() {
for (final SolrClient client : clients) {
RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
return ((HttpSolrClient) client).getBaseURL();
}
});
RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient) client).getBaseURL());
restTestHarnesses.add(harness);
}
}

8
solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
View File

@ -898,7 +898,7 @@ public class JavaBinCodec {
* <p>
* Implementors of this interface write a method to serialize a given object using an existing {@link JavaBinCodec}
*/
public static interface ObjectResolver {
public interface ObjectResolver {
/**
* Examine and attempt to serialize the given object, using a {@link JavaBinCodec} to write it to a stream.
*
@ -907,12 +907,12 @@ public class JavaBinCodec {
* @return the object {@code o} itself if it could not be serialized, or {@code null} if the whole object was successfully serialized.
* @see JavaBinCodec
*/
public Object resolve(Object o, JavaBinCodec codec) throws IOException;
Object resolve(Object o, JavaBinCodec codec) throws IOException;
}
public interface WritableDocFields {
public boolean isWritable(String name);
public boolean wantsAllFields();
boolean isWritable(String name);
boolean wantsAllFields();
}

2
solr/test-framework/src/java/org/apache/solr/util/RESTfulServerProvider.java
View File

@ -16,5 +16,5 @@
*/
package org.apache.solr.util;
public interface RESTfulServerProvider {
public String getBaseURL();
String getBaseURL();
}

7
solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java
View File

@ -51,12 +51,7 @@ abstract public class RestTestBase extends SolrJettyTestBase {
createJetty(solrHome, configFile, schemaFile, context, stopAtShutdown, extraServlets);
restTestHarness = new RestTestHarness(new RESTfulServerProvider() {
@Override
public String getBaseURL() {
return jetty.getBaseUrl().toString() + "/" + DEFAULT_TEST_CORENAME;
}
});
restTestHarness = new RestTestHarness(() -> jetty.getBaseUrl().toString() + "/" + DEFAULT_TEST_CORENAME);
}
/** Validates an update XML String is successful