You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by to...@apache.org on 2011/02/18 12:01:13 UTC
svn commit: r1071960 - in
/uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas:
FieldMappingReader.java FileUtils.java
Author: tommaso
Date: Fri Feb 18 11:01:13 2011
New Revision: 1071960
URL: http://svn.apache.org/viewvc?rev=1071960&view=rev
Log:
[UIMA-2047] - removed getStream method since getURL is much general
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/FileUtils.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=1071960&r1=1071959&r2=1071960&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 Fri Feb 18 11:01:13 2011
@@ -36,7 +36,7 @@ public class FieldMappingReader {
public SolrMappingConfiguration getConf(String path) throws Exception {
- InputStream input = FileUtils.getStream(path);
+ InputStream input = FileUtils.getURL(path).openStream();
SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
Modified: uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/FileUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/FileUtils.java?rev=1071960&r1=1071959&r2=1071960&view=diff
==============================================================================
--- uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/FileUtils.java (original)
+++ uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/FileUtils.java Fri Feb 18 11:01:13 2011
@@ -19,35 +19,22 @@
package org.apache.uima.solrcas;
-import java.io.IOException;
-import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
/**
- * Utility class to retrieve resources both from classpath and URIs
+ * Utility class to retrieve resources both from classpath and URLs
*/
public class FileUtils {
private static final String CLASSPATH = "classpath:";
private static final String EMPTY_STRING = "";
- public static InputStream getStream(String path) throws IOException {
- InputStream input;
- if (path.startsWith(CLASSPATH)) {
- input = System.class.getResourceAsStream(path.replaceFirst(CLASSPATH, EMPTY_STRING));
- } else {
- input = URI.create(path).toURL().openStream();
- }
- return input;
- }
-
public static URL getURL(String path) throws MalformedURLException {
URL solrURL;
if (path.startsWith(CLASSPATH)) {
- path = path.replaceFirst(CLASSPATH, EMPTY_STRING);
- solrURL = System.class.getResource(path);
+ solrURL = System.class.getResource(path.replaceFirst(CLASSPATH, EMPTY_STRING));
} else {
solrURL = URI.create(path).toURL();
}