svn commit: r1696286 - in /tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/journal: GrobidRESTParser.java JournalParser.java

[mattmann]

Author: mattmann
Date: Mon Aug 17 14:18:35 2015
New Revision: 1696286

URL: http://svn.apache.org/r1696286
Log:
- TIKA-1699: statically load the rest URL properties inside of GROBIDRESTParser

Modified:
    
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java
    
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/journal/JournalParser.java

Modified: 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java?rev=1696286&r1=1696285&r2=1696286&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java
 (original)
+++ 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java
 Mon Aug 17 14:18:35 2015
@@ -20,8 +20,12 @@ package org.apache.tika.parser.journal;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Properties;
+
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
@@ -40,14 +44,21 @@ public class GrobidRESTParser {
 
   private static final String GROBID_PROCESSHEADER_PATH = 
"/processHeaderDocument";
 
-  private static String restHostUrlStr;
+  private String restHostUrlStr;
+
+  public GrobidRESTParser() {
+    String restHostUrlStr = null;
+    try {
+      restHostUrlStr = readRestUrl();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
 
-  public GrobidRESTParser(String restHostUrlStr) {
     if (restHostUrlStr == null
         || (restHostUrlStr != null && restHostUrlStr.equals(""))) {
-      GrobidRESTParser.restHostUrlStr = GROBID_REST_HOST;
+      this.restHostUrlStr = GROBID_REST_HOST;
     } else {
-      GrobidRESTParser.restHostUrlStr = restHostUrlStr;
+      this.restHostUrlStr = restHostUrlStr;
     }
   }
 
@@ -76,11 +87,19 @@ public class GrobidRESTParser {
     }
   }
 
+  private static String readRestUrl() throws IOException {
+    Properties grobidProperties = new Properties();
+    grobidProperties.load(GrobidRESTParser.class
+        .getResourceAsStream("GrobidExtractor.properties"));
+
+    return grobidProperties.getProperty("grobid.server.url");
+  }
+
   protected static boolean canRun() {
     Response response = null;
 
     try {
-      response = WebClient.create(restHostUrlStr + GROBID_ISALIVE_PATH)
+      response = WebClient.create(readRestUrl() + GROBID_ISALIVE_PATH)
           .accept(MediaType.TEXT_HTML).get();
       String resp = response.readEntity(String.class);
       return resp != null && !resp.equals("") && resp.startsWith("<h4>");

Modified: 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/journal/JournalParser.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/journal/JournalParser.java?rev=1696286&r1=1696285&r2=1696286&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/journal/JournalParser.java
 (original)
+++ 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/journal/JournalParser.java
 Mon Aug 17 14:18:35 2015
@@ -22,9 +22,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
-import java.util.Properties;
 import java.util.Set;
-
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.io.TemporaryResources;
 import org.apache.tika.io.TikaInputStream;
@@ -58,12 +56,7 @@ public class JournalParser extends Abstr
     TikaInputStream tis = TikaInputStream.get(stream, new 
TemporaryResources());
     File tmpFile = tis.getFile();
 
-    Properties grobidProperties = new Properties();
-    grobidProperties.load(JournalParser.class
-        .getResourceAsStream("GrobidExtractor.properties"));
-
-    GrobidRESTParser grobidParser = new GrobidRESTParser(
-        grobidProperties.getProperty("grobid.server.url"));
+    GrobidRESTParser grobidParser = new GrobidRESTParser();
     grobidParser.parse(tmpFile.getAbsolutePath(), handler, metadata, context);
 
     PDFParser parser = new PDFParser();