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/24 16:23:23 UTC
svn commit: r1084998 - in
/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl:
UimaApplication_Impl.java UimaCasProcessor_impl.java UriUtils.java
Author: schor
Date: Thu Mar 24 15:23:22 2011
New Revision: 1084998
URL: http://svn.apache.org/viewvc?rev=1084998&view=rev
Log:
[UIMA-2097] fix URI handling with quoted otherwise illegal chars
Added:
uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UriUtils.java
Modified:
uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UimaApplication_Impl.java
uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UimaCasProcessor_impl.java
Modified: uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UimaApplication_Impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UimaApplication_Impl.java?rev=1084998&r1=1084997&r2=1084998&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UimaApplication_Impl.java (original)
+++ uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UimaApplication_Impl.java Thu Mar 24 15:23:22 2011
@@ -715,7 +715,9 @@ public class UimaApplication_Impl extend
// Create a name from URI
String name = "Unknow";
try {
- name = new URI(uriSpecifier.getUri()).getPath();
+ // use 3 arg form of URI Constructor to properly quote any otherwise illegal chars such as blank
+ // https://issues.apache.org/jira/browse/UIMA-2097
+ name = UriUtils.quote(uriSpecifier.getUri()).getPath();
} catch (URISyntaxException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified: uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UimaCasProcessor_impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UimaCasProcessor_impl.java?rev=1084998&r1=1084997&r2=1084998&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UimaCasProcessor_impl.java (original)
+++ uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UimaCasProcessor_impl.java Thu Mar 24 15:23:22 2011
@@ -303,7 +303,9 @@ public class UimaCasProcessor_impl exten
// Create a name from URI
String name = "Unknow";
try {
- name = new URI(specifier.getUri()).getPath();
+ // use 3 arg form of URI Constructor to properly quote any otherwise illegal chars such as blank
+ // https://issues.apache.org/jira/browse/UIMA-2097
+ name = UriUtils.quote(specifier.getUri()).getPath();
} catch (URISyntaxException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -377,7 +379,7 @@ public class UimaCasProcessor_impl exten
// Create a name from URI
String name = "Unknow";
try {
- name = new URI(specifier.getUri()).getPath();
+ name = UriUtils.quote(specifier.getUri()).getPath();
} catch (URISyntaxException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Added: uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UriUtils.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UriUtils.java?rev=1084998&view=auto
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UriUtils.java (added)
+++ uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/application/metadata/impl/UriUtils.java Thu Mar 24 15:23:22 2011
@@ -0,0 +1,67 @@
+/*
+ * 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.application.metadata.impl;
+
+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());
+ }
+}