mirror of https://github.com/apache/lucene.git
SOLR-20: make private URL parsing function public so it is accessible to an embedded solrj client.
(this commit also includes StrUtils refactoring ommited of previous commit) git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@547324 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
8f8b006c1c
commit
3503a882d9
|
@ -21,6 +21,8 @@ import junit.framework.TestCase;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.apache.solr.common.util.StrUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author yonik
|
* @author yonik
|
||||||
* @version $Id$
|
* @version $Id$
|
||||||
|
|
|
@ -18,11 +18,8 @@
|
||||||
package org.apache.solr.servlet;
|
package org.apache.solr.servlet;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.io.Reader;
|
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
|
@ -109,7 +106,7 @@ public class SolrRequestParsers
|
||||||
return sreq;
|
return sreq;
|
||||||
}
|
}
|
||||||
|
|
||||||
SolrQueryRequest buildRequestFrom( SolrParams params, Collection<ContentStream> streams ) throws Exception
|
public SolrQueryRequest buildRequestFrom( SolrParams params, Collection<ContentStream> streams ) throws Exception
|
||||||
{
|
{
|
||||||
// The content type will be applied to all streaming content
|
// The content type will be applied to all streaming content
|
||||||
String contentType = params.get( SolrParams.STREAM_CONTENTTYPE );
|
String contentType = params.get( SolrParams.STREAM_CONTENTTYPE );
|
||||||
|
|
|
@ -19,8 +19,8 @@ package org.apache.solr.servlet;
|
||||||
|
|
||||||
import org.apache.solr.request.SolrQueryRequestBase;
|
import org.apache.solr.request.SolrQueryRequestBase;
|
||||||
import org.apache.solr.request.ServletSolrParams;
|
import org.apache.solr.request.ServletSolrParams;
|
||||||
|
import org.apache.solr.common.util.StrUtils;
|
||||||
import org.apache.solr.core.SolrCore;
|
import org.apache.solr.core.SolrCore;
|
||||||
import org.apache.solr.util.StrUtils;
|
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
Loading…
Reference in New Issue