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 2015/08/07 09:28:35 UTC
svn commit: r1694616 - in /lucene/dev/trunk/solr/contrib/uima/src:
java/org/apache/solr/uima/processor/ test/org/apache/solr/uima/processor/
Author: tommaso
Date: Fri Aug 7 07:28:35 2015
New Revision: 1694616
URL: http://svn.apache.org/r1694616
Log:
SOLR-7760 - fixed method visibility in UimaUpdateRP and SolrUimaConfiguration
Modified:
lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
Modified: lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java?rev=1694616&r1=1694615&r2=1694616&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java Fri Aug 7 07:28:35 2015
@@ -60,7 +60,7 @@ public class SolrUIMAConfiguration {
return fieldsMerging;
}
- Map<String, Map<String, MapField>> getTypesFeaturesFieldsMapping() {
+ public Map<String, Map<String, MapField>> getTypesFeaturesFieldsMapping() {
return typesFeaturesFieldsMapping;
}
@@ -80,7 +80,7 @@ public class SolrUIMAConfiguration {
return logField;
}
- static final class MapField {
+ public static final class MapField {
private String fieldName;
private final String fieldNameFeature;
@@ -104,11 +104,11 @@ public class SolrUIMAConfiguration {
}
}
- String getFieldNameFeature(){
+ public String getFieldNameFeature(){
return fieldNameFeature;
}
- String getFieldName(String featureValue){
+ public String getFieldName(String featureValue){
if(fieldNameFeature != null){
return prefix ? fieldName + featureValue : featureValue + fieldName;
}
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=1694616&r1=1694615&r2=1694616&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 Fri Aug 7 07:28:35 2015
@@ -45,7 +45,7 @@ public class UIMAUpdateRequestProcessor
private final Logger log = LoggerFactory
.getLogger(UIMAUpdateRequestProcessor.class);
- SolrUIMAConfiguration solrUIMAConfiguration;
+ private SolrUIMAConfiguration solrUIMAConfiguration;
private AnalysisEngine ae;
@@ -175,5 +175,12 @@ public class UIMAUpdateRequestProcessor
log.debug("Text processing completed");
}
}
-
+
+ /**
+ * @return the configuration object for this request processor
+ */
+ public SolrUIMAConfiguration getConfiguration()
+ {
+ return solrUIMAConfiguration;
+ }
}
Modified: lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java?rev=1694616&r1=1694615&r2=1694616&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java Fri Aug 7 07:28:35 2015
@@ -83,7 +83,7 @@ public class UIMAUpdateRequestProcessorT
assertNotNull(factory);
UpdateRequestProcessor processor = factory.getInstance(req(), null, null);
assertTrue(processor instanceof UIMAUpdateRequestProcessor);
- SolrUIMAConfiguration conf = ((UIMAUpdateRequestProcessor)processor).solrUIMAConfiguration;
+ SolrUIMAConfiguration conf = ((UIMAUpdateRequestProcessor)processor).getConfiguration();
Map<String, Map<String, MapField>> map = conf.getTypesFeaturesFieldsMapping();
Map<String, MapField> subMap = map.get("a-type-which-can-have-multiple-features");
assertEquals(2, subMap.size());