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/06/16 12:09:20 UTC
[50/50] [abbrv] lucene-solr:apiv2: SOLR-8029: merging with trunk
SOLR-8029: merging with trunk
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b333e6bd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b333e6bd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b333e6bd
Branch: refs/heads/apiv2
Commit: b333e6bd0a3b86f85d68d47b65b12ef99ab03a86
Parents: b48f4d6
Author: Noble Paul <no...@apache.org>
Authored: Thu Jun 16 17:37:02 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Thu Jun 16 17:37:02 2016 +0530
----------------------------------------------------------------------
.../org/apache/solr/handler/SchemaHandler.java | 12 +++++-------
.../solr/handler/admin/CoreAdminHandler.java | 2 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 4 +++-
.../test/org/apache/solr/core/SolrCoreTest.java | 1 +
.../solr/handler/admin/TestCollectionAPIs.java | 2 +-
.../java/org/apache/solr/common/util/Map2.java | 20 ++++++++++----------
6 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b333e6bd/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
index 529c695..f3b7257 100644
--- a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
@@ -21,20 +21,20 @@ import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
+import org.apache.solr.api.Api;
+import org.apache.solr.api.ApiBag;
import org.apache.solr.cloud.ZkSolrResourceLoader;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.ContentStream;
+import org.apache.solr.common.params.MapSolrParams;
+import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.common.util.Utils;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
@@ -43,8 +43,6 @@ import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.ManagedIndexSchema;
import org.apache.solr.schema.SchemaManager;
import org.apache.solr.schema.ZkIndexSchemaReader;
-import org.apache.solr.api.Api;
-import org.apache.solr.api.ApiBag;
import org.apache.solr.security.AuthorizationContext;
import org.apache.solr.security.PermissionNameProvider;
import org.apache.solr.util.plugin.SolrCoreAware;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b333e6bd/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index b06bba1..231f6a4 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@ -63,7 +63,7 @@ import static org.apache.solr.security.PermissionNameProvider.Name.CORE_READ_PER
*
* @since solr 1.3
*/
-public class CoreAdminHandler extends RequestHandlerBase {
+public class CoreAdminHandler extends RequestHandlerBase implements PermissionNameProvider {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final CoreContainer coreContainer;
protected final Map<String, Map<String, TaskObject>> requestStatusMap;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b333e6bd/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 6812228..d83b238 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -44,6 +44,8 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.input.CloseShieldInputStream;
+import org.apache.commons.io.output.CloseShieldOutputStream;
import org.apache.commons.lang.StringUtils;
import org.apache.http.Header;
import org.apache.http.HeaderIterator;
@@ -791,7 +793,7 @@ public class HttpSolrCall {
return result;
}
- private SolrCore getCoreByCollection(String collectionName) {
+ protected SolrCore getCoreByCollection(String collectionName) {
ZkStateReader zkStateReader = cores.getZkController().getZkStateReader();
ClusterState clusterState = zkStateReader.getClusterState();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b333e6bd/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
index 049d5e7..17fc55e 100644
--- a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
+++ b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
@@ -108,6 +108,7 @@ public class SolrCoreTest extends SolrTestCaseJ4 {
++ihCount; assertEquals(pathToClassMap.get("/update/csv"), "solr.UpdateRequestHandler");
++ihCount; assertEquals(pathToClassMap.get("/update/json"), "solr.UpdateRequestHandler");
++ihCount; assertEquals(pathToClassMap.get("/update/json/docs"), "solr.UpdateRequestHandler");
+ ++ihCount; assertEquals(pathToClassMap.get("update"), "solr.UpdateRequestHandlerApi");
}
assertEquals("wrong number of implicit handlers", ihCount, implicitHandlers.size());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b333e6bd/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java b/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
index edc87e0..6cfbf92 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java
@@ -132,7 +132,7 @@ public class TestCollectionAPIs extends SolrTestCaseJ4 {
ZkNodeProps compareOutput(final ApiBag apiBag, final String path, final SolrRequest.METHOD method,
final String payload, final CoreContainer cc, String expectedOutputMapJson) throws Exception {
Pair<SolrQueryRequest, SolrQueryResponse> ctx = makeCall(apiBag, path, method, payload, cc);
- ZkNodeProps output = (ZkNodeProps) ctx.getKey().getContext().get(ZkNodeProps.class.getName());
+ ZkNodeProps output = (ZkNodeProps) ctx.first().getContext().get(ZkNodeProps.class.getName());
Map expected = (Map) fromJSONString(expectedOutputMapJson);
assertMapEqual(expected, output);
return output;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b333e6bd/solr/solrj/src/java/org/apache/solr/common/util/Map2.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Map2.java b/solr/solrj/src/java/org/apache/solr/common/util/Map2.java
index b5306a1..69a85be 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/Map2.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/Map2.java
@@ -46,25 +46,25 @@ public class Map2<K, V> implements Map<K, V> {
return null;
};
public static final Predicate<Pair> NOT_NULL_OF_TYPE = pair -> {
- if (pair.getKey() == null) return " Must not be NULL";
- if (pair.getValue() instanceof Class) {
- return ((Class) pair.getValue()).isAssignableFrom(pair.getKey().getClass()) ?
+ if (pair.first() == null) return " Must not be NULL";
+ if (pair.second() instanceof Class) {
+ return ((Class) pair.first()).isAssignableFrom(pair.first().getClass()) ?
null :
- " Must be of type " + ((Class) pair.getValue()).getName();
+ " Must be of type " + ((Class) pair.second()).getName();
}
return " Unknown Type";
};
public static final Predicate<Pair> ENUM_OF = pair -> {
- if (pair.getValue() instanceof Set) {
- Set set = (Set) pair.getValue();
- if (pair.getKey() instanceof Collection) {
- for (Object o : (Collection) pair.getKey()) {
+ if (pair.second() instanceof Set) {
+ Set set = (Set) pair.second();
+ if (pair.first() instanceof Collection) {
+ for (Object o : (Collection) pair.first()) {
if (!set.contains(o)) {
- return " Must be one of " + pair.getValue();
+ return " Must be one of " + pair.second();
}
}
} else {
- if (!set.contains(pair.getKey())) return " Must be one of " + pair.getValue() + ", got " + pair.getKey();
+ if (!set.contains(pair.first())) return " Must be one of " + pair.second() + ", got " + pair.first();
}
return null;
} else {