You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/04/05 19:16:20 UTC
[1/2] lucene-solr:master: SOLR-8750: replace anonymous inner class
for callable, Runnable etc
Repository: lucene-solr
Updated Branches:
refs/heads/master e6fd37c4a -> ee98f6ab8
SOLR-8750: replace anonymous inner class for callable, Runnable etc
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/18fb9463
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/18fb9463
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/18fb9463
Branch: refs/heads/master
Commit: 18fb9463de4828e736fa75e0e8f06c013133513b
Parents: ef6a0d0
Author: Noble Paul <no...@apache.org>
Authored: Tue Apr 5 22:45:36 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Apr 5 22:45:36 2016 +0530
----------------------------------------------------------------------
.../solr/analytics/expression/Expression.java | 14 +--
.../src/java/org/apache/solr/hadoop/GoLive.java | 27 +++---
.../solr/hadoop/MapReduceIndexerTool.java | 7 +-
.../apache/solr/hadoop/ZooKeeperInspector.java | 9 +-
.../solr/SolrMorphlineZkAvroTest.java | 14 +--
.../OverseerAutoReplicaFailoverThread.java | 8 +-
.../org/apache/solr/core/ConfigSetService.java | 9 +-
.../org/apache/solr/core/CoreContainer.java | 35 ++++---
.../apache/solr/core/HdfsDirectoryFactory.java | 21 +----
.../src/java/org/apache/solr/core/SolrCore.java | 83 +++++++----------
.../java/org/apache/solr/core/SolrCores.java | 25 +++--
.../solr/handler/CdcrReplicatorScheduler.java | 19 ++--
.../solr/handler/MoreLikeThisHandler.java | 12 +--
.../handler/component/HttpShardHandler.java | 97 ++++++++++----------
.../request/PerSegmentSingleValuedFaceting.java | 9 +-
.../org/apache/solr/request/SimpleFacets.java | 35 ++++---
.../solr/schema/AbstractSpatialFieldType.java | 7 +-
.../apache/solr/update/SolrCmdDistributor.java | 11 +--
.../solr/cloud/BasicDistributedZkTest.java | 80 ++++++++--------
.../org/apache/solr/search/TestRecovery.java | 7 +-
.../apache/solr/search/TestRecoveryHdfs.java | 13 +--
.../apache/solr/update/AddBlockUpdateTest.java | 20 ++--
.../test/org/apache/solr/update/TestUpdate.java | 16 +---
.../solr/client/solrj/impl/CloudSolrClient.java | 7 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 7 +-
.../solrj/impl/Krb5HttpClientBuilder.java | 52 ++++-------
.../solrj/impl/SolrHttpClientBuilder.java | 8 +-
.../client/solrj/io/comp/FieldComparator.java | 42 ++++-----
.../apache/solr/cloud/MiniSolrCloudCluster.java | 14 +--
29 files changed, 264 insertions(+), 444 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/Expression.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/Expression.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/Expression.java
index 4c9bd58..ba26d9a 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/Expression.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/Expression.java
@@ -28,15 +28,11 @@ public abstract class Expression {
public abstract Comparable getValue();
public Comparator<Expression> comparator(final FacetSortDirection direction) {
- return new Comparator<Expression>(){
- @SuppressWarnings("unchecked")
- @Override
- public int compare(Expression a, Expression b) {
- if( direction == FacetSortDirection.ASCENDING ){
- return a.getValue().compareTo(b.getValue());
- } else {
- return b.getValue().compareTo(a.getValue());
- }
+ return (a, b) -> {
+ if( direction == FacetSortDirection.ASCENDING ){
+ return a.getValue().compareTo(b.getValue());
+ } else {
+ return b.getValue().compareTo(a.getValue());
}
};
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java
index 103e3ee..bd48c64 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java
@@ -87,22 +87,19 @@ class GoLive {
baseUrl = baseUrl.substring(0, lastPathIndex);
final String mergeUrl = baseUrl;
- Callable<Request> task = new Callable<Request>() {
- @Override
- public Request call() {
- Request req = new Request();
- LOG.info("Live merge " + dir.getPath() + " into " + mergeUrl);
- try (final HttpSolrClient client = new HttpSolrClient(mergeUrl)) {
- CoreAdminRequest.MergeIndexes mergeRequest = new CoreAdminRequest.MergeIndexes();
- mergeRequest.setCoreName(name);
- mergeRequest.setIndexDirs(Arrays.asList(dir.getPath().toString() + "/data/index"));
- mergeRequest.process(client);
- req.success = true;
- } catch (SolrServerException | IOException e) {
- req.e = e;
- }
- return req;
+ Callable<Request> task = () -> {
+ Request req = new Request();
+ LOG.info("Live merge " + dir.getPath() + " into " + mergeUrl);
+ try (final HttpSolrClient client = new HttpSolrClient(mergeUrl)) {
+ CoreAdminRequest.MergeIndexes mergeRequest = new CoreAdminRequest.MergeIndexes();
+ mergeRequest.setCoreName(name);
+ mergeRequest.setIndexDirs(Arrays.asList(dir.getPath().toString() + "/data/index"));
+ mergeRequest.process(client);
+ req.success = true;
+ } catch (SolrServerException | IOException e) {
+ req.e = e;
}
+ return req;
};
pending.add(completionService.submit(task));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
index a2430e7..23d04c6 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
@@ -1188,12 +1188,7 @@ public class MapReduceIndexerTool extends Configured implements Tool {
}
// use alphanumeric sort (rather than lexicographical sort) to properly handle more than 99999 shards
- Arrays.sort(dirs, new Comparator<FileStatus>() {
- @Override
- public int compare(FileStatus f1, FileStatus f2) {
- return new AlphaNumericComparator().compare(f1.getPath().getName(), f2.getPath().getName());
- }
- });
+ Arrays.sort(dirs, (f1, f2) -> new AlphaNumericComparator().compare(f1.getPath().getName(), f2.getPath().getName()));
return dirs;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
index 3672e0b..9b86dcd 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
@@ -114,12 +114,9 @@ final class ZooKeeperInspector {
public List<Slice> getSortedSlices(Collection<Slice> slices) {
List<Slice> sorted = new ArrayList(slices);
- Collections.sort(sorted, new Comparator<Slice>() {
- @Override
- public int compare(Slice slice1, Slice slice2) {
- Comparator c = new AlphaNumericComparator();
- return c.compare(slice1.getName(), slice2.getName());
- }
+ Collections.sort(sorted, (slice1, slice2) -> {
+ Comparator c = new AlphaNumericComparator();
+ return c.compare(slice1.getName(), slice2.getName());
});
LOG.trace("Sorted slices: {}", sorted);
return sorted;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
index 0eb9e40..1c30a84 100644
--- a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
+++ b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
@@ -79,12 +79,7 @@ public class SolrMorphlineZkAvroTest extends AbstractSolrMorphlineZkTestBase {
assertEquals(2104, collector.getRecords().size());
assertEquals(collector.getRecords().size(), rsp.getResults().size());
- Collections.sort(collector.getRecords(), new Comparator<Record>() {
- @Override
- public int compare(Record r1, Record r2) {
- return r1.get("id").toString().compareTo(r2.get("id").toString());
- }
- });
+ Collections.sort(collector.getRecords(), (r1, r2) -> r1.get("id").toString().compareTo(r2.get("id").toString()));
// fetch test input data and sort like solr result set
List<GenericData.Record> records = new ArrayList();
@@ -94,12 +89,7 @@ public class SolrMorphlineZkAvroTest extends AbstractSolrMorphlineZkTestBase {
records.add(expected);
}
assertEquals(collector.getRecords().size(), records.size());
- Collections.sort(records, new Comparator<GenericData.Record>() {
- @Override
- public int compare(GenericData.Record r1, GenericData.Record r2) {
- return r1.get("id").toString().compareTo(r2.get("id").toString());
- }
- });
+ Collections.sort(records, (r1, r2) -> r1.get("id").toString().compareTo(r2.get("id").toString()));
Object lastId = null;
for (int i = 0; i < records.size(); i++) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
index d6aa392..a9f8bdd 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
@@ -248,13 +248,7 @@ public class OverseerAutoReplicaFailoverThread implements Runnable, Closeable {
log.debug("submit call to {}", createUrl);
MDC.put("OverseerAutoReplicaFailoverThread.createUrl", createUrl);
try {
- updateExecutor.submit(new Callable<Boolean>() {
-
- @Override
- public Boolean call() {
- return createSolrCore(collection, createUrl, dataDir, ulogDir, coreNodeName, coreName);
- }
- });
+ updateExecutor.submit(() -> createSolrCore(collection, createUrl, dataDir, ulogDir, coreNodeName, coreName));
} finally {
MDC.remove("OverseerAutoReplicaFailoverThread.createUrl");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/core/ConfigSetService.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/ConfigSetService.java b/solr/core/src/java/org/apache/solr/core/ConfigSetService.java
index ac0cabd..3e5c8f9 100644
--- a/solr/core/src/java/org/apache/solr/core/ConfigSetService.java
+++ b/solr/core/src/java/org/apache/solr/core/ConfigSetService.java
@@ -204,12 +204,9 @@ public abstract class ConfigSetService {
if (Files.exists(schemaFile)) {
try {
String cachedName = cacheName(schemaFile);
- return schemaCache.get(cachedName, new Callable<IndexSchema>() {
- @Override
- public IndexSchema call() throws Exception {
- logger.info("Creating new index schema for core {}", cd.getName());
- return IndexSchemaFactory.buildIndexSchema(cd.getSchemaName(), solrConfig);
- }
+ return schemaCache.get(cachedName, () -> {
+ logger.info("Creating new index schema for core {}", cd.getName());
+ return IndexSchemaFactory.buildIndexSchema(cd.getSchemaName(), solrConfig);
});
} catch (ExecutionException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 4d57ad1d..e1ea6fb 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -480,28 +480,25 @@ public class CoreContainer {
solrCores.markCoreAsLoading(cd);
}
if (cd.isLoadOnStartup()) {
- futures.add(coreLoadExecutor.submit(new Callable<SolrCore>() {
- @Override
- public SolrCore call() throws Exception {
- SolrCore core;
- try {
- if (zkSys.getZkController() != null) {
- zkSys.getZkController().throwErrorIfReplicaReplaced(cd);
- }
-
- core = create(cd, false);
- } finally {
- if (asyncSolrCoreLoad) {
- solrCores.markCoreAsNotLoading(cd);
- }
+ futures.add(coreLoadExecutor.submit(() -> {
+ SolrCore core;
+ try {
+ if (zkSys.getZkController() != null) {
+ zkSys.getZkController().throwErrorIfReplicaReplaced(cd);
}
- try {
- zkSys.registerInZk(core, true);
- } catch (RuntimeException e) {
- SolrException.log(log, "Error registering SolrCore", e);
+
+ core = create(cd, false);
+ } finally {
+ if (asyncSolrCoreLoad) {
+ solrCores.markCoreAsNotLoading(cd);
}
- return core;
}
+ try {
+ zkSys.registerInZk(core, true);
+ } catch (RuntimeException e) {
+ SolrException.log(log, "Error registering SolrCore", e);
+ }
+ return core;
}));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
index 9d6797a..77d7bd9 100644
--- a/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
@@ -318,12 +318,7 @@ public class HdfsDirectoryFactory extends CachingDirectoryFactory implements Sol
FileSystem fileSystem = null;
try {
// no need to close the fs, the cache will do it
- fileSystem = tmpFsCache.get(path, new Callable<FileSystem>() {
- @Override
- public FileSystem call() throws IOException {
- return FileSystem.get(hdfsDirPath.toUri(), conf);
- }
- });
+ fileSystem = tmpFsCache.get(path, () -> FileSystem.get(hdfsDirPath.toUri(), conf));
} catch (ExecutionException e) {
throw new RuntimeException(e);
}
@@ -351,12 +346,7 @@ public class HdfsDirectoryFactory extends CachingDirectoryFactory implements Sol
try {
// no need to close the fs, the cache will do it
- fileSystem = tmpFsCache.get(cacheValue.path, new Callable<FileSystem>() {
- @Override
- public FileSystem call() throws IOException {
- return FileSystem.get(new Path(cacheValue.path).toUri(), conf);
- }
- });
+ fileSystem = tmpFsCache.get(cacheValue.path, () -> FileSystem.get(new Path(cacheValue.path).toUri(), conf));
} catch (ExecutionException e) {
throw new RuntimeException(e);
}
@@ -487,12 +477,7 @@ public class HdfsDirectoryFactory extends CachingDirectoryFactory implements Sol
final Configuration conf = getConf();
FileSystem fileSystem = null;
try {
- fileSystem = tmpFsCache.get(dataDir, new Callable<FileSystem>() {
- @Override
- public FileSystem call() throws IOException {
- return FileSystem.get(dataDirPath.toUri(), conf);
- }
- });
+ fileSystem = tmpFsCache.get(dataDir, () -> FileSystem.get(dataDirPath.toUri(), conf));
} catch (ExecutionException e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index e511de0..3e10efe 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -735,12 +735,9 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
// cause the executor to stall so firstSearcher events won't fire
// until after inform() has been called for all components.
// searchExecutor must be single-threaded for this to work
- searcherExecutor.submit(new Callable<Void>() {
- @Override
- public Void call() throws Exception {
- latch.await();
- return null;
- }
+ searcherExecutor.submit(() -> {
+ latch.await();
+ return null;
});
this.updateHandler = initUpdateHandler(updateHandler);
@@ -854,14 +851,7 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
if (iwRef != null) {
final IndexWriter iw = iwRef.get();
final SolrCore core = this;
- newReaderCreator = new Callable<DirectoryReader>() {
- // this is used during a core reload
-
- @Override
- public DirectoryReader call() throws Exception {
- return indexReaderFactory.newReader(iw, core);
- }
- };
+ newReaderCreator = () -> indexReaderFactory.newReader(iw, core);
}
}
@@ -1779,57 +1769,48 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
// warm the new searcher based on the current searcher.
// should this go before the other event handlers or after?
if (currSearcher != null) {
- future = searcherExecutor.submit(new Callable() {
- @Override
- public Object call() throws Exception {
- try {
- newSearcher.warm(currSearcher);
- } catch (Throwable e) {
- SolrException.log(log, e);
- if (e instanceof Error) {
- throw (Error) e;
- }
+ future = searcherExecutor.submit(() -> {
+ try {
+ newSearcher.warm(currSearcher);
+ } catch (Throwable e) {
+ SolrException.log(log, e);
+ if (e instanceof Error) {
+ throw (Error) e;
}
- return null;
}
+ return null;
});
}
if (currSearcher == null) {
- future = searcherExecutor.submit(new Callable() {
- @Override
- public Object call() throws Exception {
- try {
- for (SolrEventListener listener : firstSearcherListeners) {
- listener.newSearcher(newSearcher, null);
- }
- } catch (Throwable e) {
- SolrException.log(log, null, e);
- if (e instanceof Error) {
- throw (Error) e;
- }
+ future = searcherExecutor.submit(() -> {
+ try {
+ for (SolrEventListener listener : firstSearcherListeners) {
+ listener.newSearcher(newSearcher, null);
+ }
+ } catch (Throwable e) {
+ SolrException.log(log, null, e);
+ if (e instanceof Error) {
+ throw (Error) e;
}
- return null;
}
+ return null;
});
}
if (currSearcher != null) {
- future = searcherExecutor.submit(new Callable() {
- @Override
- public Object call() throws Exception {
- try {
- for (SolrEventListener listener : newSearcherListeners) {
- listener.newSearcher(newSearcher, currSearcher);
- }
- } catch (Throwable e) {
- SolrException.log(log, null, e);
- if (e instanceof Error) {
- throw (Error) e;
- }
+ future = searcherExecutor.submit(() -> {
+ try {
+ for (SolrEventListener listener : newSearcherListeners) {
+ listener.newSearcher(newSearcher, currSearcher);
+ }
+ } catch (Throwable e) {
+ SolrException.log(log, null, e);
+ if (e instanceof Error) {
+ throw (Error) e;
}
- return null;
}
+ return null;
});
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/core/SolrCores.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCores.java b/solr/core/src/java/org/apache/solr/core/SolrCores.java
index 86fab0d..af287b7 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCores.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCores.java
@@ -127,22 +127,19 @@ class SolrCores {
new DefaultSolrThreadFactory("coreCloseExecutor"));
try {
for (SolrCore core : coreList) {
- coreCloseExecutor.submit(new Callable<SolrCore>() {
- @Override
- public SolrCore call() throws Exception {
- MDCLoggingContext.setCore(core);
- try {
- core.close();
- } catch (Throwable e) {
- SolrException.log(log, "Error shutting down core", e);
- if (e instanceof Error) {
- throw (Error) e;
- }
- } finally {
- MDCLoggingContext.clear();
+ coreCloseExecutor.submit(() -> {
+ MDCLoggingContext.setCore(core);
+ try {
+ core.close();
+ } catch (Throwable e) {
+ SolrException.log(log, "Error shutting down core", e);
+ if (e instanceof Error) {
+ throw (Error) e;
}
- return core;
+ } finally {
+ MDCLoggingContext.clear();
}
+ return core;
});
}
} finally {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java
index 7217abb..bb817e5 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java
@@ -73,19 +73,14 @@ class CdcrReplicatorScheduler {
for (int i = 0; i < nCandidates; i++) {
// a thread that poll one state from the queue, execute the replication task, and push back
// the state in the queue when the task is completed
- replicatorsPool.execute(new Runnable() {
-
- @Override
- public void run() {
- CdcrReplicatorState state = statesQueue.poll();
- assert state != null; // Should never happen
- try {
- new CdcrReplicator(state, batchSize).run();
- } finally {
- statesQueue.offer(state);
- }
+ replicatorsPool.execute(() -> {
+ CdcrReplicatorState state = statesQueue.poll();
+ assert state != null; // Should never happen
+ try {
+ new CdcrReplicator(state, batchSize).run();
+ } finally {
+ statesQueue.offer(state);
}
-
});
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
index 89b0180..a4d9ea0 100644
--- a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
@@ -284,17 +284,7 @@ public class MoreLikeThisHandler extends RequestHandlerBase
{
public Term term;
public float boost;
-
- public static Comparator<InterestingTerm> BOOST_ORDER = new Comparator<InterestingTerm>() {
- @Override
- public int compare(InterestingTerm t1, InterestingTerm t2) {
- float d = t1.boost - t2.boost;
- if( d == 0 ) {
- return 0;
- }
- return (d>0)?1:-1;
- }
- };
+
}
/**
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
index 09dc1b8..4ae013c 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
@@ -160,64 +160,61 @@ public class HttpShardHandler extends ShardHandler {
// do this outside of the callable for thread safety reasons
final List<String> urls = getURLs(shard, preferredHostAddress);
- Callable<ShardResponse> task = new Callable<ShardResponse>() {
- @Override
- public ShardResponse call() throws Exception {
+ Callable<ShardResponse> task = () -> {
- ShardResponse srsp = new ShardResponse();
- if (sreq.nodeName != null) {
- srsp.setNodeName(sreq.nodeName);
+ ShardResponse srsp = new ShardResponse();
+ if (sreq.nodeName != null) {
+ srsp.setNodeName(sreq.nodeName);
+ }
+ srsp.setShardRequest(sreq);
+ srsp.setShard(shard);
+ SimpleSolrResponse ssr = new SimpleSolrResponse();
+ srsp.setSolrResponse(ssr);
+ long startTime = System.nanoTime();
+
+ try {
+ params.remove(CommonParams.WT); // use default (currently javabin)
+ params.remove(CommonParams.VERSION);
+
+ QueryRequest req = makeQueryRequest(sreq, params, shard);
+ req.setMethod(SolrRequest.METHOD.POST);
+
+ // no need to set the response parser as binary is the default
+ // req.setResponseParser(new BinaryResponseParser());
+
+ // if there are no shards available for a slice, urls.size()==0
+ if (urls.size()==0) {
+ // TODO: what's the right error code here? We should use the same thing when
+ // all of the servers for a shard are down.
+ throw new SolrException(SolrException.ErrorCode.SERVICE_UNAVAILABLE, "no servers hosting shard: " + shard);
}
- srsp.setShardRequest(sreq);
- srsp.setShard(shard);
- SimpleSolrResponse ssr = new SimpleSolrResponse();
- srsp.setSolrResponse(ssr);
- long startTime = System.nanoTime();
-
- try {
- params.remove(CommonParams.WT); // use default (currently javabin)
- params.remove(CommonParams.VERSION);
-
- QueryRequest req = makeQueryRequest(sreq, params, shard);
- req.setMethod(SolrRequest.METHOD.POST);
-
- // no need to set the response parser as binary is the default
- // req.setResponseParser(new BinaryResponseParser());
-
- // if there are no shards available for a slice, urls.size()==0
- if (urls.size()==0) {
- // TODO: what's the right error code here? We should use the same thing when
- // all of the servers for a shard are down.
- throw new SolrException(SolrException.ErrorCode.SERVICE_UNAVAILABLE, "no servers hosting shard: " + shard);
- }
- if (urls.size() <= 1) {
- String url = urls.get(0);
- srsp.setShardAddress(url);
- try (SolrClient client = new HttpSolrClient(url, httpClient)) {
- ssr.nl = client.request(req);
- }
- } else {
- LBHttpSolrClient.Rsp rsp = httpShardHandlerFactory.makeLoadBalancedRequest(req, urls);
- ssr.nl = rsp.getResponse();
- srsp.setShardAddress(rsp.getServer());
+ if (urls.size() <= 1) {
+ String url = urls.get(0);
+ srsp.setShardAddress(url);
+ try (SolrClient client = new HttpSolrClient(url, httpClient)) {
+ ssr.nl = client.request(req);
}
+ } else {
+ LBHttpSolrClient.Rsp rsp = httpShardHandlerFactory.makeLoadBalancedRequest(req, urls);
+ ssr.nl = rsp.getResponse();
+ srsp.setShardAddress(rsp.getServer());
}
- catch( ConnectException cex ) {
- srsp.setException(cex); //????
- } catch (Exception th) {
- srsp.setException(th);
- if (th instanceof SolrException) {
- srsp.setResponseCode(((SolrException)th).code());
- } else {
- srsp.setResponseCode(-1);
- }
+ }
+ catch( ConnectException cex ) {
+ srsp.setException(cex); //????
+ } catch (Exception th) {
+ srsp.setException(th);
+ if (th instanceof SolrException) {
+ srsp.setResponseCode(((SolrException)th).code());
+ } else {
+ srsp.setResponseCode(-1);
}
+ }
- ssr.elapsedTime = TimeUnit.MILLISECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS);
+ ssr.elapsedTime = TimeUnit.MILLISECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS);
- return transfomResponse(sreq, srsp, shard);
- }
+ return transfomResponse(sreq, srsp, shard);
};
try {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java b/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java
index 62a4146..2be8d1e 100644
--- a/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java
+++ b/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java
@@ -103,12 +103,9 @@ class PerSegmentSingleValuedFaceting {
for (final LeafReaderContext leave : leaves) {
final SegFacet segFacet = new SegFacet(leave);
- Callable<SegFacet> task = new Callable<SegFacet>() {
- @Override
- public SegFacet call() throws Exception {
- segFacet.countTerms();
- return segFacet;
- }
+ Callable<SegFacet> task = () -> {
+ segFacet.countTerms();
+ return segFacet;
};
// TODO: if limiting threads, submit by largest segment first?
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
index a9ce11d..3dd3403 100644
--- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
+++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
@@ -662,26 +662,23 @@ public class SimpleFacets {
final String termList = localParams == null ? null : localParams.get(CommonParams.TERMS);
final String key = parsed.key;
final String facetValue = parsed.facetValue;
- Callable<NamedList> callable = new Callable<NamedList>() {
- @Override
- public NamedList call() throws Exception {
- try {
- NamedList<Object> result = new SimpleOrderedMap<>();
- if(termList != null) {
- List<String> terms = StrUtils.splitSmart(termList, ",", true);
- result.add(key, getListedTermCounts(facetValue, parsed, terms));
- } else {
- result.add(key, getTermCounts(facetValue, parsed));
- }
- return result;
- } catch (SolrException se) {
- throw se;
- } catch (Exception e) {
- throw new SolrException(ErrorCode.SERVER_ERROR,
- "Exception during facet.field: " + facetValue, e);
- } finally {
- semaphore.release();
+ Callable<NamedList> callable = () -> {
+ try {
+ NamedList<Object> result = new SimpleOrderedMap<>();
+ if(termList != null) {
+ List<String> terms = StrUtils.splitSmart(termList, ",", true);
+ result.add(key, getListedTermCounts(facetValue, parsed, terms));
+ } else {
+ result.add(key, getTermCounts(facetValue, parsed));
}
+ return result;
+ } catch (SolrException se) {
+ throw se;
+ } catch (Exception e) {
+ throw new SolrException(ErrorCode.SERVER_ERROR,
+ "Exception during facet.field: " + facetValue, e);
+ } finally {
+ semaphore.release();
}
};
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java b/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
index 7addb20..39d45c2 100644
--- a/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
@@ -407,12 +407,7 @@ public abstract class AbstractSpatialFieldType<T extends SpatialStrategy> extend
*/
public T getStrategy(final String fieldName) {
try {
- return fieldStrategyCache.get(fieldName, new Callable<T>() {
- @Override
- public T call() throws Exception {
- return newSpatialStrategy(fieldName);
- }
- });
+ return fieldStrategyCache.get(fieldName, () -> newSpatialStrategy(fieldName));
} catch (ExecutionException e) {
throw Throwables.propagate(e.getCause());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
index a99952d..9a196b7 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@ -279,14 +279,9 @@ public class SolrCmdDistributor {
// a commit using ConncurrentUpdateSolrServer is not async,
// so we make it async to prevent commits from happening
// serially across multiple nodes
- pending.add(completionService.submit(new Callable<Object>() {
-
- @Override
- public Object call() throws Exception {
- doRequest(req);
- return null;
- }
-
+ pending.add(completionService.submit(() -> {
+ doRequest(req);
+ return null;
}));
} else {
doRequest(req);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
index 6eee7db..b17f9b0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
@@ -960,35 +960,32 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
private void createSolrCore(final String collection,
List<SolrClient> collectionClients, final String baseUrl, final int num,
final String shardId) {
- Callable call = new Callable() {
- @Override
- public Object call() {
- try (HttpSolrClient client = new HttpSolrClient(baseUrl)) {
- // client.setConnectionTimeout(15000);
- Create createCmd = new Create();
- createCmd.setRoles("none");
- createCmd.setCoreName(collection + num);
- createCmd.setCollection(collection);
-
- if (random().nextBoolean()) {
- // sometimes we use an explicit core node name
- createCmd.setCoreNodeName("anode" + nodeCounter.incrementAndGet());
- }
-
- if (shardId == null) {
- createCmd.setNumShards(2);
- }
- createCmd.setDataDir(getDataDir(createTempDir(collection).toFile().getAbsolutePath()));
- if (shardId != null) {
- createCmd.setShardId(shardId);
- }
- client.request(createCmd);
- } catch (Exception e) {
- e.printStackTrace();
- //fail
+ Callable call = () -> {
+ try (HttpSolrClient client = new HttpSolrClient(baseUrl)) {
+ // client.setConnectionTimeout(15000);
+ Create createCmd = new Create();
+ createCmd.setRoles("none");
+ createCmd.setCoreName(collection + num);
+ createCmd.setCollection(collection);
+
+ if (random().nextBoolean()) {
+ // sometimes we use an explicit core node name
+ createCmd.setCoreNodeName("anode" + nodeCounter.incrementAndGet());
}
- return null;
+
+ if (shardId == null) {
+ createCmd.setNumShards(2);
+ }
+ createCmd.setDataDir(getDataDir(createTempDir(collection).toFile().getAbsolutePath()));
+ if (shardId != null) {
+ createCmd.setShardId(shardId);
+ }
+ client.request(createCmd);
+ } catch (Exception e) {
+ e.printStackTrace();
+ //fail
}
+ return null;
};
pending.add(completionService.submit(call));
@@ -1091,23 +1088,20 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
((HttpSolrClient) client).getBaseURL().length()
- DEFAULT_COLLECTION.length() -1);
final int frozeUnique = unique;
- Callable call = new Callable() {
- @Override
- public Object call() {
-
- try (HttpSolrClient client = new HttpSolrClient(baseUrl)) {
- client.setConnectionTimeout(15000);
- client.setSoTimeout(60000);
- Create createCmd = new Create();
- createCmd.setCoreName(collection);
- createCmd.setDataDir(getDataDir(createTempDir(collection).toFile().getAbsolutePath()));
- client.request(createCmd);
- } catch (Exception e) {
- e.printStackTrace();
- //fails
- }
- return null;
+ Callable call = () -> {
+
+ try (HttpSolrClient client1 = new HttpSolrClient(baseUrl)) {
+ client1.setConnectionTimeout(15000);
+ client1.setSoTimeout(60000);
+ Create createCmd = new Create();
+ createCmd.setCoreName(collection);
+ createCmd.setDataDir(getDataDir(createTempDir(collection).toFile().getAbsolutePath()));
+ client1.request(createCmd);
+ } catch (Exception e) {
+ e.printStackTrace();
+ //fails
}
+ return null;
};
collectionClients.add(createNewSolrClient(collection, baseUrl));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/test/org/apache/solr/search/TestRecovery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestRecovery.java b/solr/core/src/test/org/apache/solr/search/TestRecovery.java
index 307492f..6439498 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRecovery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRecovery.java
@@ -197,12 +197,7 @@ public class TestRecovery extends SolrTestCaseJ4 {
}
};
- UpdateLog.testing_logReplayFinishHook = new Runnable() {
- @Override
- public void run() {
- logReplayFinish.release();
- }
- };
+ UpdateLog.testing_logReplayFinishHook = logReplayFinish::release;
SolrQueryRequest req = req();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java b/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
index d0d61be..7de7a2b 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
@@ -161,7 +161,7 @@ public class TestRecoveryHdfs extends SolrTestCaseJ4 {
}
};
- UpdateLog.testing_logReplayFinishHook = () -> logReplayFinish.release();
+ UpdateLog.testing_logReplayFinishHook = logReplayFinish::release;
clearIndex();
@@ -257,7 +257,7 @@ public class TestRecoveryHdfs extends SolrTestCaseJ4 {
}
};
- UpdateLog.testing_logReplayFinishHook = () -> logReplayFinish.release();
+ UpdateLog.testing_logReplayFinishHook = logReplayFinish::release;
SolrQueryRequest req = req();
@@ -412,7 +412,7 @@ public class TestRecoveryHdfs extends SolrTestCaseJ4 {
}
};
- UpdateLog.testing_logReplayFinishHook = () -> logReplayFinish.release();
+ UpdateLog.testing_logReplayFinishHook = logReplayFinish::release;
SolrQueryRequest req = req();
@@ -722,12 +722,7 @@ public class TestRecoveryHdfs extends SolrTestCaseJ4 {
}
};
- UpdateLog.testing_logReplayFinishHook = new Runnable() {
- @Override
- public void run() {
- logReplayFinish.release();
- }
- };
+ UpdateLog.testing_logReplayFinishHook = logReplayFinish::release;
clearIndex();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
index 3be8c2e..557e6b2 100644
--- a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
+++ b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
@@ -575,22 +575,14 @@ public class AddBlockUpdateTest extends SolrTestCaseJ4 {
for (Document block : blocks) {
final String msg = block.asXML();
if (msg.length() > 0) {
- rez.add(new Callable<Void>() {
- @Override
- public Void call() {
- assertBlockU(msg);
- return null;
- }
-
+ rez.add(() -> {
+ assertBlockU(msg);
+ return null;
});
if (rarely()) {
- rez.add(new Callable<Void>() {
- @Override
- public Void call() {
- assertBlockU(commit());
- return null;
- }
-
+ rez.add(() -> {
+ assertBlockU(commit());
+ return null;
});
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/core/src/test/org/apache/solr/update/TestUpdate.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/TestUpdate.java b/solr/core/src/test/org/apache/solr/update/TestUpdate.java
index 13a2479..6efa5bb 100644
--- a/solr/core/src/test/org/apache/solr/update/TestUpdate.java
+++ b/solr/core/src/test/org/apache/solr/update/TestUpdate.java
@@ -37,20 +37,12 @@ public class TestUpdate extends SolrTestCaseJ4 {
// Test both by running the same test with and without commits
// do without commits
- doUpdateTest(new Callable() {
- @Override
- public Object call() throws Exception {
- return null;
- }
- });
+ doUpdateTest(() -> null);
// do with commits
- doUpdateTest(new Callable() {
- @Override
- public Object call() throws Exception {
- assertU(commit("softCommit","false"));
- return null;
- }
+ doUpdateTest(() -> {
+ assertU(commit("softCommit","false"));
+ return null;
});
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
index 43a4c18..aefda45 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
@@ -603,12 +603,7 @@ public class CloudSolrClient extends SolrClient {
final LBHttpSolrClient.Req lbRequest = entry.getValue();
try {
MDC.put("CloudSolrClient.url", url);
- responseFutures.put(url, threadPool.submit(new Callable<NamedList<?>>() {
- @Override
- public NamedList<?> call() throws Exception {
- return lbClient.request(lbRequest).getResponse();
- }
- }));
+ responseFutures.put(url, threadPool.submit(() -> lbClient.request(lbRequest).getResponse()));
} finally {
MDC.remove("CloudSolrClient.url");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
index 29a56a6..18038c2 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
@@ -285,12 +285,7 @@ public class HttpSolrClient extends SolrClient {
ExecutorService pool = ExecutorUtil.newMDCAwareFixedThreadPool(1, new SolrjNamedThreadFactory("httpUriRequest"));
try {
MDC.put("HttpSolrClient.url", baseUrl);
- mrr.future = pool.submit(new Callable<NamedList<Object>>(){
-
- @Override
- public NamedList<Object> call() throws Exception {
- return executeMethod(method, processor);
- }});
+ mrr.future = pool.submit(() -> executeMethod(method, processor));
} finally {
pool.shutdown();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java
index 6c7c64f..f9cf513 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientBuilder.java
@@ -96,14 +96,11 @@ public class Krb5HttpClientBuilder {
javax.security.auth.login.Configuration.setConfiguration(jaasConfig);
//Enable only SPNEGO authentication scheme.
- builder.setAuthSchemeRegistryProvider(new AuthSchemeRegistryProvider() {
- @Override
- public Lookup<AuthSchemeProvider> getAuthSchemeRegistry() {
- Lookup<AuthSchemeProvider> authProviders = RegistryBuilder.<AuthSchemeProvider>create()
- .register(AuthSchemes.SPNEGO, new SPNegoSchemeFactory(true, false))
- .build();
- return authProviders;
- }
+ builder.setAuthSchemeRegistryProvider(() -> {
+ Lookup<AuthSchemeProvider> authProviders = RegistryBuilder.<AuthSchemeProvider>create()
+ .register(AuthSchemes.SPNEGO, new SPNegoSchemeFactory(true, false))
+ .build();
+ return authProviders;
});
// Get the credentials from the JAAS configuration rather than here
Credentials useJaasCreds = new Credentials() {
@@ -117,26 +114,19 @@ public class Krb5HttpClientBuilder {
HttpClientUtil.setCookiePolicy(SolrPortAwareCookieSpecFactory.POLICY_NAME);
- builder.setCookieSpecRegistryProvider(new CookieSpecRegistryProvider() {
- @Override
- public Lookup<CookieSpecProvider> getCookieSpecRegistry() {
- SolrPortAwareCookieSpecFactory cookieFactory = new SolrPortAwareCookieSpecFactory();
+ builder.setCookieSpecRegistryProvider(() -> {
+ SolrPortAwareCookieSpecFactory cookieFactory = new SolrPortAwareCookieSpecFactory();
- Lookup<CookieSpecProvider> cookieRegistry = RegistryBuilder.<CookieSpecProvider> create()
- .register(SolrPortAwareCookieSpecFactory.POLICY_NAME, cookieFactory).build();
+ Lookup<CookieSpecProvider> cookieRegistry = RegistryBuilder.<CookieSpecProvider> create()
+ .register(SolrPortAwareCookieSpecFactory.POLICY_NAME, cookieFactory).build();
- return cookieRegistry;
- }
+ return cookieRegistry;
});
- builder.setDefaultCredentialsProvider(new CredentialsProviderProvider() {
-
- @Override
- public CredentialsProvider getCredentialsProvider() {
- CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
- credentialsProvider.setCredentials(AuthScope.ANY, useJaasCreds);
- return credentialsProvider;
- }
+ builder.setDefaultCredentialsProvider(() -> {
+ CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+ credentialsProvider.setCredentials(AuthScope.ANY, useJaasCreds);
+ return credentialsProvider;
});
HttpClientUtil.addRequestInterceptor(bufferedEntityInterceptor);
}
@@ -146,15 +136,11 @@ public class Krb5HttpClientBuilder {
}
// Set a buffered entity based request interceptor
- private HttpRequestInterceptor bufferedEntityInterceptor = new HttpRequestInterceptor() {
- @Override
- public void process(HttpRequest request, HttpContext context) throws HttpException,
- IOException {
- if(request instanceof HttpEntityEnclosingRequest) {
- HttpEntityEnclosingRequest enclosingRequest = ((HttpEntityEnclosingRequest) request);
- HttpEntity requestEntity = enclosingRequest.getEntity();
- enclosingRequest.setEntity(new BufferedHttpEntity(requestEntity));
- }
+ private HttpRequestInterceptor bufferedEntityInterceptor = (request, context) -> {
+ if(request instanceof HttpEntityEnclosingRequest) {
+ HttpEntityEnclosingRequest enclosingRequest = ((HttpEntityEnclosingRequest) request);
+ HttpEntity requestEntity = enclosingRequest.getEntity();
+ enclosingRequest.setEntity(new BufferedHttpEntity(requestEntity));
}
};
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java
index 98217f8..7b49ea18 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpClientBuilder.java
@@ -35,19 +35,19 @@ public class SolrHttpClientBuilder {
}
public interface HttpRequestInterceptorProvider {
- public HttpRequestInterceptor getHttpRequestInterceptor();
+ HttpRequestInterceptor getHttpRequestInterceptor();
}
public interface CredentialsProviderProvider {
- public CredentialsProvider getCredentialsProvider();
+ CredentialsProvider getCredentialsProvider();
}
public interface AuthSchemeRegistryProvider {
- public Lookup<AuthSchemeProvider> getAuthSchemeRegistry();
+ Lookup<AuthSchemeProvider> getAuthSchemeRegistry();
}
public interface CookieSpecRegistryProvider {
- public Lookup<CookieSpecProvider> getCookieSpecRegistry();
+ Lookup<CookieSpecProvider> getCookieSpecRegistry();
}
private CookieSpecRegistryProvider cookieSpecRegistryProvider;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java
index c3a2289..10c7c29 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java
@@ -97,34 +97,28 @@ public class FieldComparator implements StreamComparator {
*/
private void assignComparator(){
if(ComparatorOrder.DESCENDING == order){
- comparator = new ComparatorLambda() {
- @Override
- public int compare(Tuple leftTuple, Tuple rightTuple) {
- Comparable leftComp = (Comparable)leftTuple.get(leftFieldName);
- Comparable rightComp = (Comparable)rightTuple.get(rightFieldName);
-
- if(leftComp == rightComp){ return 0; } // if both null then they are equal. if both are same ref then are equal
- if(null == leftComp){ return 1; }
- if(null == rightComp){ return -1; }
-
- return rightComp.compareTo(leftComp);
- }
+ comparator = (leftTuple, rightTuple) -> {
+ Comparable leftComp = (Comparable)leftTuple.get(leftFieldName);
+ Comparable rightComp = (Comparable)rightTuple.get(rightFieldName);
+
+ if(leftComp == rightComp){ return 0; } // if both null then they are equal. if both are same ref then are equal
+ if(null == leftComp){ return 1; }
+ if(null == rightComp){ return -1; }
+
+ return rightComp.compareTo(leftComp);
};
}
else{
// See above for black magic reasoning.
- comparator = new ComparatorLambda() {
- @Override
- public int compare(Tuple leftTuple, Tuple rightTuple) {
- Comparable leftComp = (Comparable)leftTuple.get(leftFieldName);
- Comparable rightComp = (Comparable)rightTuple.get(rightFieldName);
-
- if(leftComp == rightComp){ return 0; } // if both null then they are equal. if both are same ref then are equal
- if(null == leftComp){ return -1; }
- if(null == rightComp){ return 1; }
-
- return leftComp.compareTo(rightComp);
- }
+ comparator = (leftTuple, rightTuple) -> {
+ Comparable leftComp = (Comparable)leftTuple.get(leftFieldName);
+ Comparable rightComp = (Comparable)rightTuple.get(rightFieldName);
+
+ if(leftComp == rightComp){ return 0; } // if both null then they are equal. if both are same ref then are equal
+ if(null == leftComp){ return -1; }
+ if(null == rightComp){ return 1; }
+
+ return leftComp.compareTo(rightComp);
};
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18fb9463/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
index 0023041..118f7be 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -206,12 +206,7 @@ public class MiniSolrCloudCluster {
List<Callable<JettySolrRunner>> startups = new ArrayList<>(numServers);
for (int i = 0; i < numServers; ++i) {
- startups.add(new Callable<JettySolrRunner>() {
- @Override
- public JettySolrRunner call() throws Exception {
- return startJettySolrRunner(newNodeName(), jettyConfig.context, jettyConfig);
- }
- });
+ startups.add(() -> startJettySolrRunner(newNodeName(), jettyConfig.context, jettyConfig));
}
Collection<Future<JettySolrRunner>> futures = executor.invokeAll(startups);
@@ -424,12 +419,7 @@ public class MiniSolrCloudCluster {
solrClient.close();
List<Callable<JettySolrRunner>> shutdowns = new ArrayList<>(jettys.size());
for (final JettySolrRunner jetty : jettys) {
- shutdowns.add(new Callable<JettySolrRunner>() {
- @Override
- public JettySolrRunner call() throws Exception {
- return stopJettySolrRunner(jetty);
- }
- });
+ shutdowns.add(() -> stopJettySolrRunner(jetty));
}
jettys.clear();
Collection<Future<JettySolrRunner>> futures = executor.invokeAll(shutdowns);
[2/2] lucene-solr:master: Merge remote-tracking branch 'origin/master'
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ee98f6ab
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ee98f6ab
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ee98f6ab
Branch: refs/heads/master
Commit: ee98f6ab8d367071b78c1a4026771346e47e6cb5
Parents: 18fb946 e6fd37c
Author: Noble Paul <no...@apache.org>
Authored: Tue Apr 5 22:46:05 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Apr 5 22:46:05 2016 +0530
----------------------------------------------------------------------
lucene/CHANGES.txt | 7 +
.../org/apache/lucene/codecs/package-info.java | 1 +
.../src/java/org/apache/lucene/geo/Polygon.java | 200 ++--
.../test/org/apache/lucene/geo/TestPolygon.java | 38 +-
lucene/ivy-versions.properties | 2 +-
.../randomizedtesting-runner-2.3.2.jar.sha1 | 1 -
.../randomizedtesting-runner-2.3.4.jar.sha1 | 1 +
.../org/apache/lucene/document/LatLonGrid.java | 155 +++
.../org/apache/lucene/document/LatLonPoint.java | 5 +-
.../document/LatLonPointInPolygonQuery.java | 24 +-
.../apache/lucene/document/TestLatLonGrid.java | 50 +
.../lucene/spatial/spatial4j/Geo3dRptTest.java | 30 +-
.../Geo3dShapeRectRelationTestCase.java | 22 +-
.../Geo3dShapeSphereModelRectRelationTest.java | 4 +-
.../Geo3dShapeWGS84ModelRectRelationTest.java | 19 +-
.../geopoint/search/GeoPointInPolygonQuery.java | 10 +-
.../search/GeoPointInPolygonQueryImpl.java | 8 +-
.../org/apache/lucene/spatial3d/Geo3DPoint.java | 130 +--
.../lucene/spatial3d/geom/BaseXYZSolid.java | 2 +-
.../lucene/spatial3d/geom/GeoBaseBBox.java | 2 +-
.../lucene/spatial3d/geom/GeoBaseCircle.java | 4 +-
.../lucene/spatial3d/geom/GeoBasePath.java | 34 +
.../lucene/spatial3d/geom/GeoBasePolygon.java | 4 +-
.../spatial3d/geom/GeoConcavePolygon.java | 394 ++++++++
.../lucene/spatial3d/geom/GeoConvexPolygon.java | 180 +++-
.../geom/GeoDegenerateHorizontalLine.java | 2 +-
.../geom/GeoDegenerateLatitudeZone.java | 2 +-
.../geom/GeoDegenerateLongitudeSlice.java | 2 +-
.../spatial3d/geom/GeoDegeneratePoint.java | 2 +-
.../lucene/spatial3d/geom/GeoLatitudeZone.java | 2 +-
.../spatial3d/geom/GeoLongitudeSlice.java | 2 +-
.../spatial3d/geom/GeoNorthLatitudeZone.java | 2 +-
.../spatial3d/geom/GeoNorthRectangle.java | 2 +-
.../apache/lucene/spatial3d/geom/GeoPath.java | 776 +--------------
.../lucene/spatial3d/geom/GeoPathFactory.java | 39 +
.../spatial3d/geom/GeoPolygonFactory.java | 983 +++++++++++++++++--
.../lucene/spatial3d/geom/GeoRectangle.java | 2 +-
.../spatial3d/geom/GeoSouthLatitudeZone.java | 2 +-
.../spatial3d/geom/GeoSouthRectangle.java | 2 +-
.../spatial3d/geom/GeoStandardCircle.java | 2 +-
.../lucene/spatial3d/geom/GeoStandardPath.java | 797 +++++++++++++++
.../geom/GeoWideDegenerateHorizontalLine.java | 2 +-
.../spatial3d/geom/GeoWideLongitudeSlice.java | 2 +-
.../spatial3d/geom/GeoWideNorthRectangle.java | 2 +-
.../lucene/spatial3d/geom/GeoWideRectangle.java | 2 +-
.../spatial3d/geom/GeoWideSouthRectangle.java | 2 +-
.../apache/lucene/spatial3d/geom/GeoWorld.java | 2 +-
.../lucene/spatial3d/geom/SidedPlane.java | 20 +-
.../lucene/spatial3d/geom/StandardXYZSolid.java | 2 +-
.../apache/lucene/spatial3d/geom/XYdZSolid.java | 2 +-
.../apache/lucene/spatial3d/geom/XdYZSolid.java | 2 +-
.../lucene/spatial3d/geom/XdYdZSolid.java | 2 +-
.../apache/lucene/spatial3d/geom/dXYZSolid.java | 2 +-
.../lucene/spatial3d/geom/dXYdZSolid.java | 2 +-
.../lucene/spatial3d/geom/dXdYZSolid.java | 2 +-
.../lucene/spatial3d/geom/dXdYdZSolid.java | 2 +-
.../apache/lucene/spatial3d/TestGeo3DPoint.java | 13 +-
.../lucene/spatial3d/geom/GeoPathTest.java | 36 +-
.../lucene/spatial3d/geom/GeoPolygonTest.java | 176 +++-
solr/licenses/junit4-ant-2.3.2.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.3.4.jar.sha1 | 1 +
.../randomizedtesting-runner-2.3.2.jar.sha1 | 1 -
.../randomizedtesting-runner-2.3.4.jar.sha1 | 1 +
63 files changed, 3005 insertions(+), 1218 deletions(-)
----------------------------------------------------------------------