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:18 UTC
[48/50] [abbrv] lucene-solr:apiv2: Merge branch 'master' into apiv2

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/core/PluginBag.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
index 288c96c,063c3d4..529c695
--- a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
@@@ -28,12 -25,14 +28,13 @@@ 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.cloud.ZkSolrResourceLoader;
  import org.apache.solr.common.SolrException;
 -import org.apache.solr.common.params.MapSolrParams;
 -import org.apache.solr.common.params.SolrParams;
+ import org.apache.solr.common.util.ContentStream;
  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;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index c0ca223,6d501a1..769db01
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@@ -33,9 -33,9 +33,10 @@@ import com.google.common.collect.Immuta
  import com.google.common.collect.ImmutableSet;
  import org.apache.commons.io.IOUtils;
  import org.apache.commons.lang.StringUtils;
 +import org.apache.solr.api.Api;
  import org.apache.solr.client.solrj.SolrResponse;
  import org.apache.solr.client.solrj.impl.HttpSolrClient;
+ import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;
  import org.apache.solr.client.solrj.request.CoreAdminRequest;
  import org.apache.solr.client.solrj.request.CoreAdminRequest.RequestSyncShard;
  import org.apache.solr.client.solrj.response.RequestStatusState;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index d969a0c46,49da174..b06bba1
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@@ -45,9 -44,9 +45,11 @@@ import org.apache.solr.core.CoreDescrip
  import org.apache.solr.handler.RequestHandlerBase;
  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.api.ApiSupport;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  import org.slf4j.MDC;
@@@ -82,11 -82,10 +86,11 @@@ public class CoreAdminHandler extends R
      // should happen in the constructor...  
      this.coreContainer = null;
      HashMap<String, Map<String, TaskObject>> map = new HashMap<>(3, 1.0f);
-     map.put(RUNNING, Collections.synchronizedMap(new LinkedHashMap<>()));
-     map.put(COMPLETED, Collections.synchronizedMap(new LinkedHashMap<>()));
-     map.put(FAILED, Collections.synchronizedMap(new LinkedHashMap<>()));
+     map.put(RUNNING, Collections.synchronizedMap(new LinkedHashMap<String, TaskObject>()));
+     map.put(COMPLETED, Collections.synchronizedMap(new LinkedHashMap<String, TaskObject>()));
+     map.put(FAILED, Collections.synchronizedMap(new LinkedHashMap<String, TaskObject>()));
      requestStatusMap = Collections.unmodifiableMap(map);
 +    coreAdminHandlerApi = new CoreAdminHandlerApi(this);
    }
  
  

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
index 330a3b9,ed5a05c..1b4ec13
--- a/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
@@@ -24,17 -24,10 +24,17 @@@ import java.util.HashMap
  import java.util.HashSet;
  import java.util.List;
  import java.util.Map;
- import java.util.Objects;
  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.Map2;
 +import org.apache.solr.common.util.Utils;
  import org.apache.solr.util.CommandOperation;
 +import org.apache.solr.api.ApiBag;
 +import org.apache.solr.api.SpecProvider;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
index 12a6c41,9d7e7d9..9f613d9
--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
@@@ -42,9 -42,8 +43,10 @@@ import java.util.Map
  import org.apache.commons.fileupload.FileItem;
  import org.apache.commons.fileupload.disk.DiskFileItemFactory;
  import org.apache.commons.fileupload.servlet.ServletFileUpload;
+ import org.apache.commons.io.input.CloseShieldInputStream;
  import org.apache.lucene.util.IOUtils;
 +import org.apache.solr.api.ApiBag;
 +import org.apache.solr.api.V2HttpCall;
  import org.apache.solr.common.SolrException;
  import org.apache.solr.common.SolrException.ErrorCode;
  import org.apache.solr.common.params.CommonParams;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/java/org/apache/solr/util/CommandOperation.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/resources/ImplicitPlugins.json
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/core/src/test/org/apache/solr/security/TestRuleBasedAuthorizationPlugin.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java
index 19beed5,b47cf00..4968cf2
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java
@@@ -105,10 -108,11 +108,14 @@@ public class Replica extends ZkNodeProp
    public String getCoreUrl() {
      return ZkCoreNodeProps.getCoreUrl(getStr(BASE_URL_PROP), getStr(CORE_NAME_PROP));
    }
 +  public String getBaseUrl(){
 +    return getStr(ZkStateReader.BASE_URL_PROP);
 +  }
  
+   public String getCoreName() {
+     return getStr(CORE_NAME_PROP);
+   }
+ 
    /** The name of the node this replica resides on */
    public String getNodeName() {
      return nodeName;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b48f4d69/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
----------------------------------------------------------------------