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 2017/01/26 01:23:30 UTC
lucene-solr:apiv2: SOLR-8029: fixing precommit errors
Repository: lucene-solr
Updated Branches:
refs/heads/apiv2 c91b96211 -> 5a8dfd96a
SOLR-8029: fixing precommit errors
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5a8dfd96
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5a8dfd96
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5a8dfd96
Branch: refs/heads/apiv2
Commit: 5a8dfd96a28bc316d74b5b7e74b28f16b5bd3f4b
Parents: c91b962
Author: Noble Paul <no...@apache.org>
Authored: Thu Jan 26 11:53:19 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Thu Jan 26 11:53:19 2017 +1030
----------------------------------------------------------------------
.../src/java/org/apache/solr/api/ApiBag.java | 6 ++---
.../java/org/apache/solr/api/SpecProvider.java | 3 +--
.../java/org/apache/solr/api/V2HttpCall.java | 3 +--
.../org/apache/solr/core/CoreContainer.java | 1 -
.../handler/admin/ConfigSetsHandlerApi.java | 1 -
.../solr/handler/admin/CoreAdminHandler.java | 4 +--
.../solr/handler/admin/CoreAdminHandlerApi.java | 27 ++++++++++++++++----
.../security/RuleBasedAuthorizationPlugin.java | 9 ++-----
.../security/Sha256AuthenticationProvider.java | 1 -
.../org/apache/solr/util/JsonValidatorTest.java | 4 +--
.../solr/client/solrj/impl/CloudSolrClient.java | 1 -
.../solr/common/util/PredicateWithErrMsg.java | 3 +--
.../solr/common/util/ValidatingJsonMap.java | 10 ++------
13 files changed, 34 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/solr/core/src/java/org/apache/solr/api/ApiBag.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/api/ApiBag.java b/solr/core/src/java/org/apache/solr/api/ApiBag.java
index b7e27f2..7d676c6 100644
--- a/solr/core/src/java/org/apache/solr/api/ApiBag.java
+++ b/solr/core/src/java/org/apache/solr/api/ApiBag.java
@@ -28,15 +28,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
import java.util.stream.Collectors;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.ValidatingJsonMap;
import org.apache.solr.common.util.Utils;
+import org.apache.solr.common.util.ValidatingJsonMap;
import org.apache.solr.core.PluginBag;
import org.apache.solr.core.PluginInfo;
import org.apache.solr.request.SolrQueryRequest;
@@ -52,9 +50,9 @@ import org.slf4j.LoggerFactory;
import static org.apache.solr.client.solrj.SolrRequest.SUPPORTED_METHODS;
import static org.apache.solr.common.params.CommonParams.NAME;
+import static org.apache.solr.common.util.StrUtils.formatString;
import static org.apache.solr.common.util.ValidatingJsonMap.ENUM_OF;
import static org.apache.solr.common.util.ValidatingJsonMap.NOT_NULL;
-import static org.apache.solr.common.util.StrUtils.formatString;
public class ApiBag {
private final boolean isCoreSpecific;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/solr/core/src/java/org/apache/solr/api/SpecProvider.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/api/SpecProvider.java b/solr/core/src/java/org/apache/solr/api/SpecProvider.java
index 88a06c8..f877755 100644
--- a/solr/core/src/java/org/apache/solr/api/SpecProvider.java
+++ b/solr/core/src/java/org/apache/solr/api/SpecProvider.java
@@ -1,4 +1,3 @@
-package org.apache.solr.api;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +15,7 @@ package org.apache.solr.api;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+package org.apache.solr.api;
import org.apache.solr.common.util.ValidatingJsonMap;
public interface SpecProvider {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
index 4cffb3f..4a053dc 100644
--- a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
+++ b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
@@ -59,7 +59,7 @@ import static org.apache.solr.servlet.SolrDispatchFilter.Action.PASSTHROUGH;
import static org.apache.solr.servlet.SolrDispatchFilter.Action.PROCESS;
import static org.apache.solr.util.PathTrie.getPathSegments;
-
+// class that handle the '/v2' path
public class V2HttpCall extends HttpSolrCall {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Api api;
@@ -197,7 +197,6 @@ public class V2HttpCall extends HttpSolrCall {
// just try if any other method has this path
api = requestHandlers.v2lookup(path, null, parts);
}
- log.error(">> api class: " + (api == null ? "null" : api.getClass().getSimpleName())); // nocommit
if (api == null) {
return getSubPathApi(requestHandlers, path, fullPath, new CompositeApi(null));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/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 23df22b..023e7b1 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -57,7 +57,6 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Replica.State;
-import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.IOUtils;
import org.apache.solr.common.util.Utils;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandlerApi.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandlerApi.java b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandlerApi.java
index 6be26ce..6037bcd 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandlerApi.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandlerApi.java
@@ -24,7 +24,6 @@ import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.handler.admin.ConfigSetsHandler.ConfigSetOperation;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.util.CommandOperation;
import static org.apache.solr.client.solrj.SolrRequest.METHOD.DELETE;
import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/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 241153b..7b652c9 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
@@ -29,6 +29,7 @@ import java.util.concurrent.ExecutorService;
import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang.StringUtils;
+import org.apache.solr.api.Api;
import org.apache.solr.cloud.CloudDescriptor;
import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
@@ -43,14 +44,11 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.handler.RequestHandlerBase;
-import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.security.AuthorizationContext;
import org.apache.solr.security.PermissionNameProvider;
import org.apache.solr.util.DefaultSolrThreadFactory;
-import org.apache.solr.api.Api;
-import org.apache.solr.util.stats.MetricUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandlerApi.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandlerApi.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandlerApi.java
index 6ae806b..9197d66 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandlerApi.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandlerApi.java
@@ -27,15 +27,32 @@ import com.google.common.collect.ImmutableMap;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.util.CommandOperation;
-import static org.apache.solr.client.solrj.SolrRequest.METHOD.*;
-import static org.apache.solr.handler.admin.CoreAdminHandlerApi.EndPoint.NODEAPIS;
-import static org.apache.solr.handler.admin.CoreAdminHandlerApi.EndPoint.NODEINVOKE;
-import static org.apache.solr.handler.admin.CoreAdminOperation.*;
+import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET;
+import static org.apache.solr.client.solrj.SolrRequest.METHOD.POST;
import static org.apache.solr.handler.admin.CoreAdminHandlerApi.EndPoint.CORES_COMMANDS;
import static org.apache.solr.handler.admin.CoreAdminHandlerApi.EndPoint.CORES_STATUS;
+import static org.apache.solr.handler.admin.CoreAdminHandlerApi.EndPoint.NODEAPIS;
+import static org.apache.solr.handler.admin.CoreAdminHandlerApi.EndPoint.NODEINVOKE;
import static org.apache.solr.handler.admin.CoreAdminHandlerApi.EndPoint.PER_CORE_COMMANDS;
+import static org.apache.solr.handler.admin.CoreAdminOperation.CREATE_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.FORCEPREPAREFORLEADERSHIP_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.INVOKE_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.MERGEINDEXES_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.OVERSEEROP_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.PREPRECOVERY_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.REJOINLEADERELECTION_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.RELOAD_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.RENAME_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.REQUESTAPPLYUPDATES_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.REQUESTBUFFERUPDATES_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.REQUESTRECOVERY_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.REQUESTSTATUS_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.REQUESTSYNCSHARD_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.SPLIT_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.STATUS_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.SWAP_OP;
+import static org.apache.solr.handler.admin.CoreAdminOperation.UNLOAD_OP;
public class CoreAdminHandlerApi extends BaseHandlerApiSupport {
private final CoreAdminHandler handler;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java b/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
index e798670..a8a97ed 100644
--- a/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
@@ -27,15 +27,10 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Function;
-import com.google.common.collect.ImmutableSet;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.params.CollectionParams;
-import org.apache.solr.common.util.Utils;
-import org.apache.solr.common.util.ValidatingJsonMap;
-
-import org.apache.solr.util.CommandOperation;
import org.apache.solr.api.ApiBag;
import org.apache.solr.api.SpecProvider;
+import org.apache.solr.common.util.ValidatingJsonMap;
+import org.apache.solr.util.CommandOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java b/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java
index 13a1687..0cc58cd 100644
--- a/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java
+++ b/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java
@@ -30,7 +30,6 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import org.apache.commons.codec.binary.Base64;
-import org.apache.solr.api.SpecProvider;
import org.apache.solr.common.util.ValidatingJsonMap;
import org.apache.solr.util.CommandOperation;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/solr/core/src/test/org/apache/solr/util/JsonValidatorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/JsonValidatorTest.java b/solr/core/src/test/org/apache/solr/util/JsonValidatorTest.java
index ba23456..4492586 100644
--- a/solr/core/src/test/org/apache/solr/util/JsonValidatorTest.java
+++ b/solr/core/src/test/org/apache/solr/util/JsonValidatorTest.java
@@ -1,5 +1,3 @@
-package org.apache.solr.util;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +14,8 @@ package org.apache.solr.util;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.solr.util;
+
import java.util.List;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/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 f39d0e4..d0263c8 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
@@ -83,7 +83,6 @@ import org.apache.solr.common.util.StrUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
-import static org.apache.solr.common.params.CommonParams.ADMIN_PATHS;
import static org.apache.solr.common.params.CommonParams.AUTHC_PATH;
import static org.apache.solr.common.params.CommonParams.AUTHZ_PATH;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/solr/solrj/src/java/org/apache/solr/common/util/PredicateWithErrMsg.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/PredicateWithErrMsg.java b/solr/solrj/src/java/org/apache/solr/common/util/PredicateWithErrMsg.java
index 0a79724..6b3f92b 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/PredicateWithErrMsg.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/PredicateWithErrMsg.java
@@ -1,5 +1,3 @@
-package org.apache.solr.common.util;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +14,7 @@ package org.apache.solr.common.util;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.solr.common.util;
public interface PredicateWithErrMsg<T> {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a8dfd96/solr/solrj/src/java/org/apache/solr/common/util/ValidatingJsonMap.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ValidatingJsonMap.java b/solr/solrj/src/java/org/apache/solr/common/util/ValidatingJsonMap.java
index 7d007f0..6b7f02d 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/ValidatingJsonMap.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/ValidatingJsonMap.java
@@ -33,15 +33,13 @@ import java.util.Set;
import org.apache.solr.common.SolrException;
import org.noggit.JSONParser;
import org.noggit.ObjectBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Collections.unmodifiableList;
import static java.util.Collections.unmodifiableSet;
public class ValidatingJsonMap implements Map<String, Object> {
- private static final Logger log = LoggerFactory.getLogger(ValidatingJsonMap.class);
+
private static final String INCLUDE = "#include";
private static final String RESOURCE_EXTENSION = ".json";
public static final PredicateWithErrMsg<Object> NOT_NULL = o -> {
@@ -320,11 +318,7 @@ public class ValidatingJsonMap implements Map<String, Object> {
try {
map = fromJSON(is, includeLocation);
} catch (Exception e) {
- log.error("Error in JSON : " + resourceName, e);
- if (e instanceof RuntimeException) {
- throw e;
- }
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,"Error in JSON : " + resourceName, e);
}
if (map == null) throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Empty value for " + resourceName);