You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by to...@apache.org on 2013/08/28 00:16:50 UTC

svn commit: r1518018 - in /lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor: UIMAUpdateRequestProcessor.java UIMAUpdateRequestProcessorFactory.java

Author: tommaso
Date: Tue Aug 27 22:16:50 2013
New Revision: 1518018

URL: http://svn.apache.org/r1518018
Log:
SOLR-5195 - remove SolrCore reference from UIMAUpdateRequestProcessor

Modified:
    lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
    lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java

Modified: lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java?rev=1518018&r1=1518017&r2=1518018&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java Tue Aug 27 22:16:50 2013
@@ -20,7 +20,6 @@ package org.apache.solr.uima.processor;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.core.SolrCore;
 import org.apache.solr.schema.SchemaField;
 import org.apache.solr.uima.processor.SolrUIMAConfiguration.MapField;
 import org.apache.lucene.analysis.uima.ae.AEProvider;
@@ -48,19 +47,16 @@ public class UIMAUpdateRequestProcessor 
   SolrUIMAConfiguration solrUIMAConfiguration;
 
   private AEProvider aeProvider;
-  
-  private SolrCore solrCore;
 
-  public UIMAUpdateRequestProcessor(UpdateRequestProcessor next, SolrCore solrCore,
+  public UIMAUpdateRequestProcessor(UpdateRequestProcessor next, String coreName,
       SolrUIMAConfiguration config) {
     super(next);
-    initialize(solrCore, config);
+    initialize(coreName, config);
   }
 
-  private void initialize(SolrCore solrCore, SolrUIMAConfiguration config) {
-    this.solrCore = solrCore;
+  private void initialize(String coreName, SolrUIMAConfiguration config) {
     solrUIMAConfiguration = config;
-    aeProvider = AEProviderFactory.getInstance().getAEProvider(solrCore.getName(),
+    aeProvider = AEProviderFactory.getInstance().getAEProvider(coreName,
             solrUIMAConfiguration.getAePath(), solrUIMAConfiguration.getRuntimeParameters());
   }
 

Modified: lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java?rev=1518018&r1=1518017&r2=1518018&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java Tue Aug 27 22:16:50 2013
@@ -41,7 +41,7 @@ public class UIMAUpdateRequestProcessorF
   @Override
   public UpdateRequestProcessor getInstance(SolrQueryRequest req, SolrQueryResponse rsp,
           UpdateRequestProcessor next) {
-    return new UIMAUpdateRequestProcessor(next, req.getCore(),
+    return new UIMAUpdateRequestProcessor(next, req.getCore().getName(),
             new SolrUIMAConfigurationReader(args).readSolrUIMAConfiguration());
   }