svn commit: r1078825 - in /uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas: FieldMappingReader.java SolrCASConsumer.java

[to...@apache.org]

Author: tommaso
Date: Mon Mar  7 16:08:03 2011
New Revision: 1078825

URL: http://svn.apache.org/viewvc?rev=1078825&view=rev
Log:
[UIMA-2043] - refactored initialize() method to properly set the error log to a proper message depending on which parameter initialization is failing, specialized thrown exception (removed generic Exceptions)

Modified:
    uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/FieldMappingReader.java
    uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java

Modified: uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/FieldMappingReader.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/FieldMappingReader.java?rev=1078825&r1=1078824&r2=1078825&view=diff
==============================================================================
--- uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/FieldMappingReader.java (original)
+++ uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/FieldMappingReader.java Mon Mar  7 16:08:03 2011
@@ -23,8 +23,11 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
+import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
@@ -34,7 +37,7 @@ import java.util.Map;
  */
 public class FieldMappingReader {
 
-  public SolrMappingConfiguration getConf(InputStream input) throws Exception {
+  public SolrMappingConfiguration getConf(InputStream input) throws ParserConfigurationException, SAXException, IOException  {
 
     SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
 

Modified: uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java?rev=1078825&r1=1078824&r2=1078825&view=diff
==============================================================================
--- uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java (original)
+++ uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java Mon Mar  7 16:08:03 2011
@@ -25,6 +25,8 @@ import java.net.URI;
 import java.net.URL;
 import java.util.Map;
 
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
@@ -41,6 +43,7 @@ import org.apache.uima.cas.text.Annotati
 import org.apache.uima.resource.ResourceAccessException;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.util.Level;
+import org.xml.sax.SAXException;
 
 /**
  * CAS Consumer to write on a Solr instance
@@ -60,20 +63,31 @@ public class SolrCASConsumer extends Cas
   @Override
   public void initialize(UimaContext context) throws ResourceInitializationException {
     super.initialize(context);
+
+    /* create the SolrServer*/
     try {
-      /* create the SolrServer*/
       this.solrServer = createServer();
+    } catch (Exception e) {
+      context.getLogger().log(Level.SEVERE, "Unable to initialize SolrServer properly");
+      throw new ResourceInitializationException(e);
+    }
 
-      /* create the mapping configuration */
+    /* create the mapping configuration */
+    try{
       this.mappingConfig = createSolrMappingConfiguration();
+    } catch (Exception e) {
+      context.getLogger().log(Level.SEVERE, "Unable to initialize Solr mapping configuration properly");
+      throw new ResourceInitializationException(e);
+    }
 
       /* set Solr autoCommit parameter */
+    try {
       this.autoCommit = getAutoCommitValue();
-
     } catch (Exception e) {
-      context.getLogger().log(Level.SEVERE, e.toString());
+      context.getLogger().log(Level.SEVERE, "Unable to initialize Solr autoCommit parameter properly");
       throw new ResourceInitializationException(e);
     }
+
   }
 
   /* allows retrieve of input stream from a path specifying one of:
@@ -107,7 +121,7 @@ public class SolrCASConsumer extends Cas
   }
 
   private SolrMappingConfiguration createSolrMappingConfiguration()
-          throws IOException, ResourceAccessException, Exception {
+          throws IOException, ResourceAccessException, ParserConfigurationException, SAXException {
     FieldMappingReader fieldMappingReader = new FieldMappingReader();
     String mappingFileParam = String.valueOf(getContext().getConfigParameterValue("mappingFile"));