From 2e01a46f8ce334952f2febdfe87f83b0b63fed13 Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Fri, 12 Oct 2012 06:41:55 +0000 Subject: [PATCH] [SOLR-3902] - adding super constructor to FieldMappingException, adding final modifiers where possible, substituting StringBuffer with StringBuilder where possible, for each loops git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1397452 13f79535-47bb-0310-9956-ffa450edef68 --- .../uima/processor/FieldMappingException.java | 3 ++- .../uima/processor/SolrUIMAConfiguration.java | 17 +++++++++-------- .../processor/SolrUIMAConfigurationReader.java | 2 +- .../solr/uima/processor/UIMAToSolrMapper.java | 10 +++++----- .../processor/UIMAUpdateRequestProcessor.java | 16 ++++++++-------- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java index d9b566aa683..6aed0f36ac7 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java @@ -18,9 +18,10 @@ package org.apache.solr.uima.processor; */ /** - * Exception thrown when an error happening while mapping UIMA CAS model to Solt fields + * Exception thrown when an error happening while mapping UIMA CAS model to Solr fields */ public class FieldMappingException extends Exception { public FieldMappingException(Exception e) { + super(e); } } diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java index 1f0049802d5..6f5e4c7e802 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java @@ -26,19 +26,19 @@ import java.util.Map; */ public class SolrUIMAConfiguration { - private String[] fieldsToAnalyze; + private final String[] fieldsToAnalyze; - private boolean fieldsMerging; + private final boolean fieldsMerging; - private Map> typesFeaturesFieldsMapping; + private final Map> typesFeaturesFieldsMapping; - private String aePath; + private final String aePath; - private Map runtimeParameters; + private final Map runtimeParameters; - private boolean ignoreErrors; + private final boolean ignoreErrors; - private String logField; + private final String logField; SolrUIMAConfiguration(String aePath, String[] fieldsToAnalyze, boolean fieldsMerging, Map> typesFeaturesFieldsMapping, @@ -82,7 +82,8 @@ public class SolrUIMAConfiguration { static final class MapField { - private String fieldName, fieldNameFeature; + private String fieldName; + private final String fieldNameFeature; private boolean prefix; // valid if dynamicField == true // false: *_s, true: s_* diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java index fdf82ff634c..e8e252ac7f2 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java @@ -32,7 +32,7 @@ import org.apache.solr.uima.processor.SolrUIMAConfiguration.MapField; */ public class SolrUIMAConfigurationReader { - private NamedList args; + private final NamedList args; public SolrUIMAConfigurationReader(NamedList args) { this.args = args; diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java index 242e1b8e444..77dcceae79d 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java @@ -38,9 +38,9 @@ public class UIMAToSolrMapper { private final Logger log = LoggerFactory.getLogger(UIMAToSolrMapper.class); - private SolrInputDocument document; + private final SolrInputDocument document; - private JCas cas; + private final JCas cas; public UIMAToSolrMapper(SolrInputDocument document, JCas cas) { this.document = document; @@ -64,15 +64,15 @@ public class UIMAToSolrMapper { String fieldNameFeatureValue = fieldNameFeature == null ? null : fs.getFeatureValueAsString(type.getFeatureByBaseName(fieldNameFeature)); String fieldName = mapField.getFieldName(fieldNameFeatureValue); - log.info(new StringBuffer("mapping ").append(typeName).append("@").append(featureName) + log.info(new StringBuilder("mapping ").append(typeName).append("@").append(featureName) .append(" to ").append(fieldName).toString()); - String featureValue = null; + String featureValue; if (fs instanceof Annotation && "coveredText".equals(featureName)) { featureValue = ((Annotation) fs).getCoveredText(); } else { featureValue = fs.getFeatureValueAsString(type.getFeatureByBaseName(featureName)); } - log.info(new StringBuffer("writing ").append(featureValue).append(" in ").append( + log.info(new StringBuilder("writing ").append(featureValue).append(" in ").append( fieldName).toString()); document.addField(fieldName, featureValue, 1.0f); } diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java index 586355b26db..70245ae8c2e 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java @@ -73,16 +73,16 @@ public class UIMAUpdateRequestProcessor extends UpdateRequestProcessor { /* get the fields to analyze */ String[] texts = getTextsToAnalyze(solrInputDocument); - for (int i = 0; i < texts.length; i++) { - text = texts[i]; - if (text != null && text.length()>0) { + for (String currentText : texts) { + text = currentText; + if (text != null && text.length() > 0) { /* process the text value */ JCas jcas = processText(text); UIMAToSolrMapper uimaToSolrMapper = new UIMAToSolrMapper(solrInputDocument, jcas); /* get field mapping from config */ Map> typesAndFeaturesFieldsMap = solrUIMAConfiguration - .getTypesFeaturesFieldsMapping(); + .getTypesFeaturesFieldsMapping(); /* map type features on fields */ for (String typeFQN : typesAndFeaturesFieldsMap.keySet()) { uimaToSolrMapper.map(typeFQN, typesAndFeaturesFieldsMap.get(typeFQN)); @@ -133,8 +133,8 @@ public class UIMAUpdateRequestProcessor extends UpdateRequestProcessor { String[] textVals; if (merge) { StringBuilder unifiedText = new StringBuilder(""); - for (int i = 0; i < fieldsToAnalyze.length; i++) { - unifiedText.append(String.valueOf(solrInputDocument.getFieldValue(fieldsToAnalyze[i]))); + for (String aFieldsToAnalyze : fieldsToAnalyze) { + unifiedText.append(String.valueOf(solrInputDocument.getFieldValue(aFieldsToAnalyze))); } textVals = new String[1]; textVals[0] = unifiedText.toString(); @@ -150,7 +150,7 @@ public class UIMAUpdateRequestProcessor extends UpdateRequestProcessor { /* process a field value executing UIMA the CAS containing it as document text */ private JCas processText(String textFieldValue) throws ResourceInitializationException, AnalysisEngineProcessException { - log.info(new StringBuffer("Analyzing text").toString()); + log.info(new StringBuilder("Analyzing text").toString()); /* get the UIMA analysis engine */ AnalysisEngine ae = aeProvider.getAE(); @@ -160,7 +160,7 @@ public class UIMAUpdateRequestProcessor extends UpdateRequestProcessor { /* perform analysis on text field */ ae.process(jcas); - log.info(new StringBuilder("Text processing completed").toString()); + log.info("Text processing completed"); return jcas; }