RE: svn commit: r1633390 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/handler/loader/ core/src/java/org/apache/solr/util/xslt/ core/src/test/org/apache/solr/handler/ example/solr/collect

2014-10-21 Thread Uwe Schindler 
Hi,

JSONLoader imports java.lang.reflect.Field, but it is unused in the code. I was 
afraid that this one uses reflection, so I stumbled on it. Could you remove the 
bogus import?

Uwe

-
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: u...@thetaphi.de


 -Original Message-
 From: no...@apache.org [mailto:no...@apache.org]
 Sent: Tuesday, October 21, 2014 4:53 PM
 To: comm...@lucene.apache.org
 Subject: svn commit: r1633390 - in /lucene/dev/trunk/solr:
 core/src/java/org/apache/solr/handler/loader/
 core/src/java/org/apache/solr/util/xslt/
 core/src/test/org/apache/solr/handler/ example/solr/collection1/conf/
 solrj/src/test/org/apache/solr/client/solrj/e...
 
 Author: noble
 Date: Tue Oct 21 14:53:04 2014
 New Revision: 1633390
 
 URL: http://svn.apache.org/r1633390
 Log:
 SOLR-6633
 
 Added:
 
 lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/xslt/RecordingJSO
 NParser.java   (with props)
 Modified:
 
 lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JsonL
 oader.java
 
 lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/JsonLoaderTe
 st.java
 lucene/dev/trunk/solr/example/solr/collection1/conf/schema.xml
 lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml
 
 lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedde
 d/SolrExampleJettyTest.java
 
 Modified:
 lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JsonL
 oader.java
 URL:
 http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
 che/solr/handler/loader/JsonLoader.java?rev=1633390r1=1633389r2=163
 3390view=diff
 ==
 
 ---
 lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JsonL
 oader.java (original)
 +++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/J
 +++ sonLoader.java Tue Oct 21 14:53:04 2014
 @@ -16,21 +16,34 @@ package org.apache.solr.handler.loader;
   * limitations under the License.
   */
 
 +import java.io.FilterReader;
  import java.io.IOException;
  import java.io.Reader;
  import java.io.StringReader;
 +import java.lang.reflect.Field;
 +import java.nio.CharBuffer;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.HashMap;
  import java.util.Iterator;
 +import java.util.LinkedHashMap;
  import java.util.List;
 +import java.util.Locale;
  import java.util.Map;
 +import java.util.UUID;
  import java.util.concurrent.atomic.AtomicBoolean;
 +import java.util.concurrent.atomic.AtomicReference;
 
 +import com.ctc.wstx.stax.FilteredStreamReader;
  import org.apache.commons.io.IOUtils;
 +import org.apache.commons.io.input.TeeInputStream;
 +import org.apache.solr.common.params.CommonParams;
  import org.apache.solr.common.params.SolrParams;
  import org.apache.solr.common.params.UpdateParams;
  import org.apache.solr.common.util.JsonRecordReader;
 +import org.apache.solr.schema.SchemaField;
 +import org.apache.solr.util.xslt.RecordingJSONParser;
 +import org.noggit.CharArr;
  import org.noggit.JSONParser;
  import org.noggit.ObjectBuilder;
  import org.apache.solr.common.SolrException;
 @@ -50,50 +63,49 @@ import org.slf4j.Logger;  import
 org.slf4j.LoggerFactory;
 
 
 -
  /**
   * @since solr 4.0
   */
  public class JsonLoader extends ContentStreamLoader {
 -  final static Logger log = LoggerFactory.getLogger( JsonLoader.class );
 +  final static Logger log = LoggerFactory.getLogger(JsonLoader.class);
private static final String CHILD_DOC_KEY = _childDocuments_;
 
@Override
public String getDefaultWT() {
  return json;
}
 -
 +
@Override
public void load(SolrQueryRequest req, SolrQueryResponse rsp,
 -  ContentStream stream, UpdateRequestProcessor processor) throws
 Exception {
 -new SingleThreadedJsonLoader(req,rsp,processor).load(req, rsp, stream,
 processor);
 +   ContentStream stream, UpdateRequestProcessor processor)
 throws Exception {
 +new SingleThreadedJsonLoader(req, rsp, processor).load(req, rsp,
 + stream, processor);
}
 
 -
 +
static class SingleThreadedJsonLoader extends ContentStreamLoader {
 -
 +
  protected final UpdateRequestProcessor processor;
  protected final SolrQueryRequest req;
  protected SolrQueryResponse rsp;
  protected JSONParser parser;
  protected final int commitWithin;
  protected final boolean overwrite;
 -
 +
  public SingleThreadedJsonLoader(SolrQueryRequest req,
 SolrQueryResponse rsp, UpdateRequestProcessor processor) {
this.processor = processor;
this.req = req;
this.rsp = rsp;
 
commitWithin =
 req.getParams().getInt(UpdateParams.COMMIT_WITHIN, -1);
 -  overwrite = req.getParams().getBool(UpdateParams.OVERWRITE, true);
 +  overwrite = req.getParams().getBool(UpdateParams.OVERWRITE,
 + true);
  }
 -
 +
  @Override
 -public void load(SolrQueryRequest req,
 -

Re: svn commit: r1633390 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/handler/loader/ core/src/java/org/apache/solr/util/xslt/ core/src/test/org/apache/solr/handler/ example/solr/collect

2014-10-21 Thread Noble Paul 
It was removed in a subsequent commit

On Tue, Oct 21, 2014 at 8:28 PM, Uwe Schindler u...@thetaphi.de wrote:

 Hi,

 JSONLoader imports java.lang.reflect.Field, but it is unused in the code.
 I was afraid that this one uses reflection, so I stumbled on it. Could you
 remove the bogus import?

 Uwe

 -
 Uwe Schindler
 H.-H.-Meier-Allee 63, D-28213 Bremen
 http://www.thetaphi.de
 eMail: u...@thetaphi.de


  -Original Message-
  From: no...@apache.org [mailto:no...@apache.org]
  Sent: Tuesday, October 21, 2014 4:53 PM
  To: comm...@lucene.apache.org
  Subject: svn commit: r1633390 - in /lucene/dev/trunk/solr:
  core/src/java/org/apache/solr/handler/loader/
  core/src/java/org/apache/solr/util/xslt/
  core/src/test/org/apache/solr/handler/ example/solr/collection1/conf/
  solrj/src/test/org/apache/solr/client/solrj/e...
 
  Author: noble
  Date: Tue Oct 21 14:53:04 2014
  New Revision: 1633390
 
  URL: http://svn.apache.org/r1633390
  Log:
  SOLR-6633
 
  Added:
 
 
 lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/xslt/RecordingJSO
  NParser.java   (with props)
  Modified:
 
  lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JsonL
  oader.java
 
  lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/JsonLoaderTe
  st.java
  lucene/dev/trunk/solr/example/solr/collection1/conf/schema.xml
  lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml
 
  lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedde
  d/SolrExampleJettyTest.java
 
  Modified:
  lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JsonL
  oader.java
  URL:
  http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
  che/solr/handler/loader/JsonLoader.java?rev=1633390r1=1633389r2=163
  3390view=diff
  ==
  
  ---
  lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JsonL
  oader.java (original)
  +++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/J
  +++ sonLoader.java Tue Oct 21 14:53:04 2014
  @@ -16,21 +16,34 @@ package org.apache.solr.handler.loader;
* limitations under the License.
*/
 
  +import java.io.FilterReader;
   import java.io.IOException;
   import java.io.Reader;
   import java.io.StringReader;
  +import java.lang.reflect.Field;
  +import java.nio.CharBuffer;
   import java.util.ArrayList;
   import java.util.Arrays;
   import java.util.HashMap;
   import java.util.Iterator;
  +import java.util.LinkedHashMap;
   import java.util.List;
  +import java.util.Locale;
   import java.util.Map;
  +import java.util.UUID;
   import java.util.concurrent.atomic.AtomicBoolean;
  +import java.util.concurrent.atomic.AtomicReference;
 
  +import com.ctc.wstx.stax.FilteredStreamReader;
   import org.apache.commons.io.IOUtils;
  +import org.apache.commons.io.input.TeeInputStream;
  +import org.apache.solr.common.params.CommonParams;
   import org.apache.solr.common.params.SolrParams;
   import org.apache.solr.common.params.UpdateParams;
   import org.apache.solr.common.util.JsonRecordReader;
  +import org.apache.solr.schema.SchemaField;
  +import org.apache.solr.util.xslt.RecordingJSONParser;
  +import org.noggit.CharArr;
   import org.noggit.JSONParser;
   import org.noggit.ObjectBuilder;
   import org.apache.solr.common.SolrException;
  @@ -50,50 +63,49 @@ import org.slf4j.Logger;  import
  org.slf4j.LoggerFactory;
 
 
  -
   /**
* @since solr 4.0
*/
   public class JsonLoader extends ContentStreamLoader {
  -  final static Logger log = LoggerFactory.getLogger( JsonLoader.class );
  +  final static Logger log = LoggerFactory.getLogger(JsonLoader.class);
 private static final String CHILD_DOC_KEY = _childDocuments_;
 
 @Override
 public String getDefaultWT() {
   return json;
 }
  -
  +
 @Override
 public void load(SolrQueryRequest req, SolrQueryResponse rsp,
  -  ContentStream stream, UpdateRequestProcessor processor) throws
  Exception {
  -new SingleThreadedJsonLoader(req,rsp,processor).load(req, rsp,
 stream,
  processor);
  +   ContentStream stream, UpdateRequestProcessor
 processor)
  throws Exception {
  +new SingleThreadedJsonLoader(req, rsp, processor).load(req, rsp,
  + stream, processor);
 }
 
  -
  +
 static class SingleThreadedJsonLoader extends ContentStreamLoader {
  -
  +
   protected final UpdateRequestProcessor processor;
   protected final SolrQueryRequest req;
   protected SolrQueryResponse rsp;
   protected JSONParser parser;
   protected final int commitWithin;
   protected final boolean overwrite;
  -
  +
   public SingleThreadedJsonLoader(SolrQueryRequest req,
  SolrQueryResponse rsp, UpdateRequestProcessor processor) {
 this.processor = processor;
 this.req = req;
 this.rsp = rsp;
 
 commitWithin =
  req.getParams().getInt(UpdateParams.COMMIT_WITHIN, -1);
  -