You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2011/03/28 15:52:48 UTC
svn commit: r1086235 - in /uima/sandbox/trunk:
RDFCASConsumer/src/main/java/org/apache/uima/rdf/
Solrcas/src/main/java/org/apache/uima/solrcas/
Author: schor
Date: Mon Mar 28 13:52:47 2011
New Revision: 1086235
URL: http://svn.apache.org/viewvc?rev=1086235&view=rev
Log:
[UIMA-2097] fix URI handling with quoted otherwise illegal chars
Added:
uima/sandbox/trunk/RDFCASConsumer/src/main/java/org/apache/uima/rdf/UriUtils.java
uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/UriUtils.java
Modified:
uima/sandbox/trunk/RDFCASConsumer/src/main/java/org/apache/uima/rdf/RDFCASConsumer.java
uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java
Modified: uima/sandbox/trunk/RDFCASConsumer/src/main/java/org/apache/uima/rdf/RDFCASConsumer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/RDFCASConsumer/src/main/java/org/apache/uima/rdf/RDFCASConsumer.java?rev=1086235&r1=1086234&r2=1086235&view=diff
==============================================================================
--- uima/sandbox/trunk/RDFCASConsumer/src/main/java/org/apache/uima/rdf/RDFCASConsumer.java (original)
+++ uima/sandbox/trunk/RDFCASConsumer/src/main/java/org/apache/uima/rdf/RDFCASConsumer.java Mon Mar 28 13:52:47 2011
@@ -18,6 +18,14 @@
*/
package org.apache.uima.rdf;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
@@ -34,14 +42,6 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.Annotation;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* CASConsumer that writes CAS contents to an RDF-like format
@@ -109,12 +109,11 @@ public class RDFCASConsumer extends JCas
OutputStream outputStream = null;
try {
- URI uri = URI.create(file);
-
+ URI uri = UriUtils.create(file);
File f = new File(uri);
- if (!f.exists())
+ if (!f.exists()) {
f.createNewFile();
-
+ }
outputStream = new FileOutputStream(f);
Serializer serializer = Serializer.getInstance();
serializer.serialize(outputStream, node.getGraph(), format);
Added: uima/sandbox/trunk/RDFCASConsumer/src/main/java/org/apache/uima/rdf/UriUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/RDFCASConsumer/src/main/java/org/apache/uima/rdf/UriUtils.java?rev=1086235&view=auto
==============================================================================
--- uima/sandbox/trunk/RDFCASConsumer/src/main/java/org/apache/uima/rdf/UriUtils.java (added)
+++ uima/sandbox/trunk/RDFCASConsumer/src/main/java/org/apache/uima/rdf/UriUtils.java Mon Mar 28 13:52:47 2011
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.rdf;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+/**
+ * Static methods supporting proper handling of URIs
+ *
+ */
+public class UriUtils {
+
+ /**
+ * Create a URI from a string, with proper quoting.
+ * Already quoted things in the input string are not re-quoted.
+ * There are several cases:
+ * String has no characters needing quoting
+ * String has chars needing quoting, but no chars are currently quoted (e.g. %20)
+ * String has quoted (e.g. %20) characters but no other chars needing quoting
+ * String has quoted (e.g. %20) characters and chars needing quoting, not currently quoted
+ * -- this case will throw an exception
+ * @param s
+ * @return URI with proper quoting
+ * @throws URISyntaxException
+ */
+ public static URI quote (String s) throws URISyntaxException {
+ if (-1 == s.indexOf('%')) {
+ // 3 argument constructor does any needed quoting of otherwise illegal chars
+ // https://issues.apache.org/jira/browse/UIMA-2097
+ return new URI(null, s, null);
+ }
+
+ // assume s already has all otherwise illegal chars properly quoted
+ return new URI(s);
+ }
+
+ /**
+ * Create a URI from a URL, with proper quoting.
+ * Already quoted things in the input string are not re-quoted.
+ * @param u
+ * @return URI with proper quoting
+ * @throws URISyntaxException
+ */
+
+ public static URI quote(URL u) throws URISyntaxException {
+ return quote(u.toString());
+ }
+
+ /**
+ * Create a URI from a String, with proper quoting.
+ * Already quoted things in the input string are not re-quoted.
+ * Mimic exception treatment of URI.create
+ * @param u
+ * @return URI with proper quoting
+ */
+
+ public static URI create(String s) {
+ try {
+ return quote(s);
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+}
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=1086235&r1=1086234&r2=1086235&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 28 13:52:47 2011
@@ -148,11 +148,11 @@ public class SolrCASConsumer extends Cas
if (path.startsWith(CLASSPATH)) {
url = System.class.getResource(path.replaceFirst(CLASSPATH, EMPTY_STRING));
} else {
- URI uriPath = URI.create(path);
+ URI uriPath = UriUtils.create(path);
if (uriPath.isAbsolute()) // this supports file://ABSOLUTE_PATH and http://URL
url = uriPath.toURL();
else // path is not absolute
- url = URI.create(new StringBuilder(FILEPATH).append(getContext().getDataPath()).
+ url = UriUtils.create(new StringBuilder(FILEPATH).append(getContext().getDataPath()).
append("/").append(path.replace(FILEPATH, EMPTY_STRING)).toString()).
toURL(); // this supports relative file paths
}
@@ -190,7 +190,7 @@ public class SolrCASConsumer extends Cas
getConfigParameterValue("solrPath"));
if (solrInstanceTypeParam.equalsIgnoreCase("http")) {
- URL solrURL = URI.create(solrPathParam).toURL();
+ URL solrURL = UriUtils.create(solrPathParam).toURL();
solrServer = new CommonsHttpSolrServer(solrURL);
}
} catch (Exception e) {
Added: uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/UriUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/UriUtils.java?rev=1086235&view=auto
==============================================================================
--- uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/UriUtils.java (added)
+++ uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/UriUtils.java Mon Mar 28 13:52:47 2011
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.solrcas;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+/**
+ * Static methods supporting proper handling of URIs
+ *
+ */
+public class UriUtils {
+
+ /**
+ * Create a URI from a string, with proper quoting.
+ * Already quoted things in the input string are not re-quoted.
+ * There are several cases:
+ * String has no characters needing quoting
+ * String has chars needing quoting, but no chars are currently quoted (e.g. %20)
+ * String has quoted (e.g. %20) characters but no other chars needing quoting
+ * String has quoted (e.g. %20) characters and chars needing quoting, not currently quoted
+ * -- this case will throw an exception
+ * @param s
+ * @return URI with proper quoting
+ * @throws URISyntaxException
+ */
+ public static URI quote (String s) throws URISyntaxException {
+ if (-1 == s.indexOf('%')) {
+ // 3 argument constructor does any needed quoting of otherwise illegal chars
+ // https://issues.apache.org/jira/browse/UIMA-2097
+ return new URI(null, s, null);
+ }
+
+ // assume s already has all otherwise illegal chars properly quoted
+ return new URI(s);
+ }
+
+ /**
+ * Create a URI from a URL, with proper quoting.
+ * Already quoted things in the input string are not re-quoted.
+ * @param u
+ * @return URI with proper quoting
+ * @throws URISyntaxException
+ */
+
+ public static URI quote(URL u) throws URISyntaxException {
+ return quote(u.toString());
+ }
+
+ /**
+ * Create a URI from a String, with proper quoting.
+ * Already quoted things in the input string are not re-quoted.
+ * Mimic exception treatment of URI.create
+ * @param u
+ * @return URI with proper quoting
+ */
+
+ public static URI create(String s) {
+ try {
+ return quote(s);
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+}