svn commit: r1086234 - in /uima/uima-as/trunk/uimaj-as-camel/src/main/java/org/apache/uima/camel: UimaAsComponent.java UriUtils.java

[sc...@apache.org]

Author: schor
Date: Mon Mar 28 13:50:42 2011
New Revision: 1086234

URL: http://svn.apache.org/viewvc?rev=1086234&view=rev
Log:
[UIMA-2097] fix URI handling with quoted otherwise illegal chars

Added:
    uima/uima-as/trunk/uimaj-as-camel/src/main/java/org/apache/uima/camel/UriUtils.java
Modified:
    uima/uima-as/trunk/uimaj-as-camel/src/main/java/org/apache/uima/camel/UimaAsComponent.java

Modified: uima/uima-as/trunk/uimaj-as-camel/src/main/java/org/apache/uima/camel/UimaAsComponent.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-camel/src/main/java/org/apache/uima/camel/UimaAsComponent.java?rev=1086234&r1=1086233&r2=1086234&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-camel/src/main/java/org/apache/uima/camel/UimaAsComponent.java (original)
+++ uima/uima-as/trunk/uimaj-as-camel/src/main/java/org/apache/uima/camel/UimaAsComponent.java Mon Mar 28 13:50:42 2011
@@ -36,7 +36,7 @@ public class UimaAsComponent extends Def
 	protected Endpoint<Exchange> createEndpoint(String uri, String remaining,
     		Map parameters) throws Exception {
 		
-    	URI hbaseURI = URI.create(uri);
+    	URI hbaseURI = UriUtils.create(uri);
     	
     	String scheme = hbaseURI.getScheme();
     	

Added: uima/uima-as/trunk/uimaj-as-camel/src/main/java/org/apache/uima/camel/UriUtils.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-camel/src/main/java/org/apache/uima/camel/UriUtils.java?rev=1086234&view=auto
==============================================================================
--- uima/uima-as/trunk/uimaj-as-camel/src/main/java/org/apache/uima/camel/UriUtils.java (added)
+++ uima/uima-as/trunk/uimaj-as-camel/src/main/java/org/apache/uima/camel/UriUtils.java Mon Mar 28 13:50:42 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.camel;
+
+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);
+    }
+  }
+}