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/05/25 17:42:20 UTC
[1/2] lucene-solr:master: SOLR-8995: Replace anonymous
implementations of SAM interfaces with Lambdas
Repository: lucene-solr
Updated Branches:
refs/heads/master be597a81e -> 366f8d18f
SOLR-8995: Replace anonymous implementations of SAM interfaces with Lambdas
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a42dc358
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a42dc358
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a42dc358
Branch: refs/heads/master
Commit: a42dc35883be1445e29df69ab207d6baf494f176
Parents: 50c4f58
Author: Noble Paul <no...@apache.org>
Authored: Wed May 25 23:11:59 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Wed May 25 23:11:59 2016 +0530
----------------------------------------------------------------------
...verseerCollectionConfigSetProcessorTest.java | 178 ++++++-------------
.../security/TestPKIAuthenticationPlugin.java | 35 +---
2 files changed, 63 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a42dc358/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
index 8efb605..4658367 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
@@ -159,182 +159,114 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
protected Set<String> commonMocks(int liveNodesCount) throws Exception {
shardHandlerFactoryMock.getShardHandler();
- expectLastCall().andAnswer(new IAnswer<ShardHandler>() {
- @Override
- public ShardHandler answer() throws Throwable {
- log.info("SHARDHANDLER");
- return shardHandlerMock;
- }
+ expectLastCall().andAnswer(() -> {
+ log.info("SHARDHANDLER");
+ return shardHandlerMock;
}).anyTimes();
workQueueMock.peekTopN(EasyMock.anyInt(), anyObject(Set.class), EasyMock.anyLong());
- expectLastCall().andAnswer(new IAnswer<List>() {
- @Override
- public List answer() throws Throwable {
- Object result;
- int count = 0;
- while ((result = queue.peek()) == null) {
- Thread.sleep(1000);
- count++;
- if (count > 1) return null;
- }
-
- return Arrays.asList(result);
+ expectLastCall().andAnswer(() -> {
+ Object result;
+ int count = 0;
+ while ((result = queue.peek()) == null) {
+ Thread.sleep(1000);
+ count++;
+ if (count > 1) return null;
}
+
+ return Arrays.asList(result);
}).anyTimes();
workQueueMock.getTailId();
- expectLastCall().andAnswer(new IAnswer<Object>() {
- @Override
- public Object answer() throws Throwable {
- Object result = null;
- Iterator iter = queue.iterator();
- while(iter.hasNext()) {
- result = iter.next();
- }
- return result==null ? null : ((QueueEvent)result).getId();
+ expectLastCall().andAnswer(() -> {
+ Object result = null;
+ Iterator iter = queue.iterator();
+ while(iter.hasNext()) {
+ result = iter.next();
}
+ return result==null ? null : ((QueueEvent)result).getId();
}).anyTimes();
workQueueMock.peek(true);
- expectLastCall().andAnswer(new IAnswer<Object>() {
- @Override
- public Object answer() throws Throwable {
- Object result;
- while ((result = queue.peek()) == null) {
- Thread.sleep(1000);
- }
- return result;
+ expectLastCall().andAnswer(() -> {
+ Object result;
+ while ((result = queue.peek()) == null) {
+ Thread.sleep(1000);
}
+ return result;
}).anyTimes();
workQueueMock.remove(anyObject(QueueEvent.class));
- expectLastCall().andAnswer(new IAnswer<Object>() {
- @Override
- public Object answer() throws Throwable {
- queue.remove((QueueEvent) getCurrentArguments()[0]);
- return null;
- }
+ expectLastCall().andAnswer(() -> {
+ queue.remove(getCurrentArguments()[0]);
+ return null;
}).anyTimes();
workQueueMock.poll();
- expectLastCall().andAnswer(new IAnswer<Object>() {
- @Override
- public Object answer() throws Throwable {
- return queue.poll();
- }
- }).anyTimes();
+ expectLastCall().andAnswer(() -> queue.poll()).anyTimes();
zkStateReaderMock.getClusterState();
- expectLastCall().andAnswer(new IAnswer<Object>() {
- @Override
- public Object answer() throws Throwable {
- return clusterStateMock;
- }
- }).anyTimes();
+ expectLastCall().andAnswer(() -> clusterStateMock).anyTimes();
zkStateReaderMock.getZkClient();
- expectLastCall().andAnswer(new IAnswer<Object>() {
- @Override
- public Object answer() throws Throwable {
- return solrZkClientMock;
- }
- }).anyTimes();
+ expectLastCall().andAnswer(() -> solrZkClientMock).anyTimes();
zkStateReaderMock.updateClusterState();
clusterStateMock.getCollections();
- expectLastCall().andAnswer(new IAnswer<Object>() {
- @Override
- public Object answer() throws Throwable {
- return collectionsSet;
- }
- }).anyTimes();
+ expectLastCall().andAnswer(() -> collectionsSet).anyTimes();
final Set<String> liveNodes = new HashSet<>();
for (int i = 0; i < liveNodesCount; i++) {
final String address = "localhost:" + (8963 + i) + "_solr";
liveNodes.add(address);
zkStateReaderMock.getBaseUrlForNodeName(address);
- expectLastCall().andAnswer(new IAnswer<Object>() {
- @Override
- public Object answer() throws Throwable {
- // This works as long as this test does not use a
- // webapp context with an underscore in it
- return address.replaceAll("_", "/");
- }
+ expectLastCall().andAnswer(() -> {
+ // This works as long as this test does not use a
+ // webapp context with an underscore in it
+ return address.replaceAll("_", "/");
}).anyTimes();
}
zkStateReaderMock.getClusterProperty("legacyCloud", "true");
- expectLastCall().andAnswer(new IAnswer<String>() {
- @Override
- public String answer() throws Throwable {
- return "true";
- }
- });
+ expectLastCall().andAnswer(() -> "true");
solrZkClientMock.getZkClientTimeout();
- expectLastCall().andAnswer(new IAnswer<Object>() {
- @Override
- public Object answer() throws Throwable {
- return 30000;
- }
- }).anyTimes();
+ expectLastCall().andAnswer(() -> 30000).anyTimes();
clusterStateMock.hasCollection(anyObject(String.class));
- expectLastCall().andAnswer(new IAnswer<Boolean>() {
- @Override
- public Boolean answer() throws Throwable {
- String key = (String) getCurrentArguments()[0];
- return collectionsSet.contains(key);
- }
- } ).anyTimes();
+ expectLastCall().andAnswer(() -> {
+ String key = (String) getCurrentArguments()[0];
+ return collectionsSet.contains(key);
+ }).anyTimes();
clusterStateMock.getLiveNodes();
- expectLastCall().andAnswer(new IAnswer<Object>() {
- @Override
- public Object answer() throws Throwable {
- return liveNodes;
- }
- }).anyTimes();
+ expectLastCall().andAnswer(() -> liveNodes).anyTimes();
solrZkClientMock.create(anyObject(String.class), anyObject(byte[].class), anyObject(CreateMode.class), anyBoolean());
- expectLastCall().andAnswer(new IAnswer<String>() {
- @Override
- public String answer() throws Throwable {
- String key = (String) getCurrentArguments()[0];
- zkMap.put(key, null);
- handleCreateCollMessage((byte[]) getCurrentArguments()[1]);
- return key;
- }
+ expectLastCall().andAnswer(() -> {
+ String key = (String) getCurrentArguments()[0];
+ zkMap.put(key, null);
+ handleCreateCollMessage((byte[]) getCurrentArguments()[1]);
+ return key;
}).anyTimes();
solrZkClientMock.makePath(anyObject(String.class), anyObject(byte[].class), anyBoolean());
- expectLastCall().andAnswer(new IAnswer<String>() {
- @Override
- public String answer() throws Throwable {
- String key = (String) getCurrentArguments()[0];
- return key;
- }
+ expectLastCall().andAnswer(() -> {
+ String key = (String) getCurrentArguments()[0];
+ return key;
}).anyTimes();
solrZkClientMock.makePath(anyObject(String.class), anyObject(byte[].class), anyObject(CreateMode.class), anyBoolean());
- expectLastCall().andAnswer(new IAnswer<String>() {
- @Override
- public String answer() throws Throwable {
- String key = (String) getCurrentArguments()[0];
- return key;
- }
+ expectLastCall().andAnswer(() -> {
+ String key = (String) getCurrentArguments()[0];
+ return key;
}).anyTimes();
solrZkClientMock.exists(anyObject(String.class),anyBoolean());
- expectLastCall().andAnswer(new IAnswer<Boolean>() {
- @Override
- public Boolean answer() throws Throwable {
- String key = (String) getCurrentArguments()[0];
- return zkMap.containsKey(key);
- }
+ expectLastCall().andAnswer(() -> {
+ String key = (String) getCurrentArguments()[0];
+ return zkMap.containsKey(key);
}).anyTimes();
zkMap.put("/configs/myconfig", null);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a42dc358/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java b/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java
index ba7d46d..2f102bf 100644
--- a/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java
+++ b/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java
@@ -100,13 +100,7 @@ public class TestPKIAuthenticationPlugin extends SolrTestCaseJ4 {
assertTrue(header.get().getValue().startsWith(nodeName));
final AtomicReference<ServletRequest> wrappedRequestByFilter = new AtomicReference<>();
HttpServletRequest mockReq = createMockRequest(header);
- FilterChain filterChain = new FilterChain() {
- @Override
- public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
- throws IOException, ServletException {
- wrappedRequestByFilter.set(servletRequest);
- }
- };
+ FilterChain filterChain = (servletRequest, servletResponse) -> wrappedRequestByFilter.set(servletRequest);
mock.doAuthenticate(mockReq, null, filterChain);
assertNotNull(wrappedRequestByFilter.get());
@@ -164,30 +158,17 @@ public class TestPKIAuthenticationPlugin extends SolrTestCaseJ4 {
HttpServletRequest mockReq = EasyMock.createMock(HttpServletRequest.class);
EasyMock.reset(mockReq);
mockReq.getHeader(EasyMock.anyObject(String.class));
- EasyMock.expectLastCall().andAnswer(new IAnswer<String>() {
- @Override
- public String answer() throws Throwable {
- if (PKIAuthenticationPlugin.HEADER.equals(getCurrentArguments()[0])) {
- if (header.get() == null) return null;
- return header.get().getValue();
- } else return null;
- }
+ EasyMock.expectLastCall().andAnswer(() -> {
+ if (PKIAuthenticationPlugin.HEADER.equals(getCurrentArguments()[0])) {
+ if (header.get() == null) return null;
+ return header.get().getValue();
+ } else return null;
}).anyTimes();
mockReq.getUserPrincipal();
- EasyMock.expectLastCall().andAnswer(new IAnswer<Principal>() {
- @Override
- public Principal answer() throws Throwable {
- return null;
- }
- }).anyTimes();
+ EasyMock.expectLastCall().andAnswer(() -> null).anyTimes();
mockReq.getRequestURI();
- EasyMock.expectLastCall().andAnswer(new IAnswer<String>() {
- @Override
- public String answer() throws Throwable {
- return "/collection1/select";
- }
- }).anyTimes();
+ EasyMock.expectLastCall().andAnswer(() -> "/collection1/select").anyTimes();
EasyMock.replay(mockReq);
return mockReq;
[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/366f8d18
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/366f8d18
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/366f8d18
Branch: refs/heads/master
Commit: 366f8d18fe3ac9c9fb93493fe60d2bf4157de032
Parents: a42dc35 be597a8
Author: Noble Paul <no...@apache.org>
Authored: Wed May 25 23:12:11 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Wed May 25 23:12:11 2016 +0530
----------------------------------------------------------------------
lucene/CHANGES.txt | 8 +
.../org/apache/lucene/index/MultiDocValues.java | 2 +-
.../java/org/apache/lucene/util/ArrayUtil.java | 268 +--
.../org/apache/lucene/util/BytesRefHash.java | 37 +-
.../lucene/util/StringMSBRadixSorter.java | 187 ++
.../apache/lucene/util/bkd/HeapPointWriter.java | 21 +-
.../org/apache/lucene/util/fst/Builder.java | 9 +-
.../lucene/index/TestPerSegmentDeletes.java | 9 +-
.../org/apache/lucene/util/TestArrayUtil.java | 28 +-
.../lucene/util/TestStringMSBRadixSorter.java | 97 +
.../search/join/ToParentBlockJoinCollector.java | 4 +-
.../search/join/ToParentBlockJoinQuery.java | 26 +-
.../lucene/search/join/TestBlockJoin.java | 16 +-
.../index/SlowCompositeReaderWrapper.java | 281 ---
.../apache/lucene/uninverting/DocTermOrds.java | 886 ---------
.../apache/lucene/uninverting/FieldCache.java | 466 -----
.../lucene/uninverting/FieldCacheImpl.java | 1085 -----------
.../uninverting/FieldCacheSanityChecker.java | 425 ----
.../lucene/uninverting/UninvertingReader.java | 391 ----
.../apache/lucene/uninverting/package-info.java | 21 -
.../index/TestSlowCompositeReaderWrapper.java | 91 -
.../lucene/uninverting/TestDocTermOrds.java | 681 -------
.../lucene/uninverting/TestFieldCache.java | 731 -------
.../uninverting/TestFieldCacheReopen.java | 70 -
.../TestFieldCacheSanityChecker.java | 164 --
.../lucene/uninverting/TestFieldCacheSort.java | 1814 ------------------
.../uninverting/TestFieldCacheSortRandom.java | 318 ---
.../uninverting/TestFieldCacheVsDocValues.java | 592 ------
.../uninverting/TestFieldCacheWithThreads.java | 227 ---
.../uninverting/TestLegacyFieldCache.java | 498 -----
.../lucene/uninverting/TestNumericTerms32.java | 156 --
.../lucene/uninverting/TestNumericTerms64.java | 166 --
.../uninverting/TestUninvertingReader.java | 395 ----
.../lucene/document/LatLonPointBoxQuery.java | 13 +-
.../document/LatLonPointDistanceQuery.java | 14 +-
.../document/LatLonPointInPolygonQuery.java | 14 +-
.../apache/lucene/document/MatchingPoints.java | 102 -
.../lucene/search/TermAutomatonQuery.java | 13 +-
.../org/apache/lucene/search/CheckHits.java | 5 +-
.../util/automaton/AutomatonTestUtil.java | 10 +-
solr/CHANGES.txt | 4 +
.../apache/solr/schema/ICUCollationField.java | 4 +-
.../solr/handler/component/ExpandComponent.java | 24 +-
.../solr/index/SlowCompositeReaderWrapper.java | 301 +++
.../apache/solr/index/SortingMergePolicy.java | 2 +-
.../solr/schema/AbstractSpatialFieldType.java | 17 +-
.../org/apache/solr/schema/BinaryField.java | 2 +-
.../java/org/apache/solr/schema/BoolField.java | 6 +-
.../org/apache/solr/schema/CollationField.java | 4 +-
.../org/apache/solr/schema/CurrencyField.java | 2 +-
.../java/org/apache/solr/schema/EnumField.java | 14 +-
.../apache/solr/schema/ExternalFileField.java | 8 +-
.../java/org/apache/solr/schema/FieldType.java | 2 +-
.../org/apache/solr/schema/GeoHashField.java | 10 +-
.../org/apache/solr/schema/IndexSchema.java | 2 +-
.../java/org/apache/solr/schema/LatLonType.java | 5 +-
.../java/org/apache/solr/schema/PointType.java | 4 +-
.../apache/solr/schema/PreAnalyzedField.java | 4 +-
.../org/apache/solr/schema/RandomSortField.java | 4 +-
.../java/org/apache/solr/schema/StrField.java | 2 +-
.../java/org/apache/solr/schema/TextField.java | 14 +-
.../java/org/apache/solr/schema/TrieField.java | 4 +-
.../solr/search/CollapsingQParserPlugin.java | 21 +-
.../java/org/apache/solr/search/Insanity.java | 6 +-
.../apache/solr/search/SolrFieldCacheMBean.java | 5 +-
.../apache/solr/search/SolrIndexSearcher.java | 4 +-
.../apache/solr/search/ValueSourceParser.java | 18 +-
.../solr/search/facet/UnInvertedField.java | 4 +-
.../solr/search/function/OrdFieldSource.java | 6 +-
.../search/function/ReverseOrdFieldSource.java | 6 +-
.../search/join/ScoreJoinQParserPlugin.java | 2 +-
.../apache/solr/uninverting/DocTermOrds.java | 887 +++++++++
.../org/apache/solr/uninverting/FieldCache.java | 466 +++++
.../apache/solr/uninverting/FieldCacheImpl.java | 1085 +++++++++++
.../uninverting/FieldCacheSanityChecker.java | 425 ++++
.../solr/uninverting/UninvertingReader.java | 391 ++++
.../apache/solr/uninverting/package-info.java | 21 +
.../solr/update/DeleteByQueryWrapper.java | 3 +-
.../org/apache/solr/update/VersionInfo.java | 2 +-
.../conf/schema-minimal-atomic-stress.xml | 38 +
.../TestStressCloudBlindAtomicUpdates.java | 483 +++++
.../index/TestSlowCompositeReaderWrapper.java | 95 +
.../org/apache/solr/request/TestFaceting.java | 2 +-
.../test/org/apache/solr/search/TestSort.java | 4 +-
.../solr/uninverting/TestDocTermOrds.java | 681 +++++++
.../apache/solr/uninverting/TestFieldCache.java | 731 +++++++
.../solr/uninverting/TestFieldCacheReopen.java | 70 +
.../TestFieldCacheSanityChecker.java | 164 ++
.../solr/uninverting/TestFieldCacheSort.java | 1814 ++++++++++++++++++
.../uninverting/TestFieldCacheSortRandom.java | 318 +++
.../uninverting/TestFieldCacheVsDocValues.java | 592 ++++++
.../uninverting/TestFieldCacheWithThreads.java | 228 +++
.../solr/uninverting/TestLegacyFieldCache.java | 497 +++++
.../solr/uninverting/TestNumericTerms32.java | 156 ++
.../solr/uninverting/TestNumericTerms64.java | 166 ++
.../solr/uninverting/TestUninvertingReader.java | 395 ++++
.../apache/solr/update/DocumentBuilderTest.java | 13 +-
97 files changed, 10543 insertions(+), 10036 deletions(-)
----------------------------------------------------------------------