Add URIQueryProps: Simple tool to process URI queries as properties

3 files changed, 151 insertions, 3 deletions

diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index ac33ece..2bbf36d 100755
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -97,11 +97,11 @@ function onetest() {
 #onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
-onetest com.jogamp.common.util.TestSyncRingBuffer01 $*
-onetest com.jogamp.common.util.TestLFRingBuffer01 $*
+#onetest com.jogamp.common.util.TestSyncRingBuffer01 $*
+#onetest com.jogamp.common.util.TestLFRingBuffer01 $*
 #onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.URLCompositionTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.URLCompositionTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG
diff --git a/src/java/com/jogamp/common/net/URIQueryProps.java b/src/java/com/jogamp/common/net/URIQueryProps.java
new file mode 100644
index 0000000..598659f
--- /dev/null
+++ b/src/java/com/jogamp/common/net/URIQueryProps.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright 2013 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package com.jogamp.common.net;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Helper class to process URI's query, handled as properties.
+ * <p>
+ * The order of the URI segments (any properties) are <i>not</i> preserved.
+ * </p>
+ * <pre>
+ *  URI: [scheme:][//authority][path][?query][#fragment]
+ *  w/ authority: [user-info@]host[:port]
+ *  Note: 'path' starts w/ fwd slash
+ * </pre>
+ */
+public class URIQueryProps {
+   private static final String QMARK = "?";
+   private static final String AMPER = "&";
+   private static final char ASSIG = '=';
+   private static final String EMPTY = "";
+   
+   private final HashMap<String, String> properties = new HashMap<String, String>();
+   
+   public final Map<String, String> getProperties() { return properties; }
+   
+   public final String appendQuery(String baseQuery) throws URISyntaxException {
+       boolean needsSep = false;
+       final StringBuilder sb = new StringBuilder();
+       if ( null != baseQuery ) {
+           if( !baseQuery.startsWith(QMARK) ) {
+               baseQuery = baseQuery.substring(1);
+           }
+           sb.append(baseQuery);
+           if( !baseQuery.endsWith(AMPER) ) {
+               needsSep = true;
+           }
+       }
+       Iterator<String> propKeys = properties.keySet().iterator();
+       while(propKeys.hasNext()) {
+           if(needsSep) {
+               sb.append(AMPER);
+           }
+           final String key = propKeys.next();
+           final String val = properties.get(key);
+           sb.append(key);
+           if( EMPTY != val ) {
+               sb.append(ASSIG).append(properties.get(key));
+           }
+           needsSep = true;
+       }
+       return sb.toString();
+   }
+   
+   public final URI appendQuery(URI base) throws URISyntaxException {
+       return new URI(base.getScheme(),
+                      base.getRawUserInfo(), base.getHost(), base.getPort(),
+                      base.getRawPath(), appendQuery(base.getRawQuery()), base.getRawFragment());
+   }
+   
+   public static final URIQueryProps create(URI uri) {
+       final URIQueryProps data = new URIQueryProps();
+       final String q = uri.getQuery();
+       final int q_l = null != q ? q.length() : -1;
+       int q_e = -1;
+       while(q_e < q_l) {
+           int q_b = q_e + 1; // next term
+           q_e = q.indexOf(AMPER, q_b);
+           if(0 == q_e) {
+               // single separator
+               continue; 
+           }
+           if(0 > q_e) {
+               // end
+               q_e = q_l;
+           }
+           // n-part
+           final String part = q.substring(q_b, q_e);
+           final int assignment = part.indexOf(ASSIG);
+           if(0 < assignment) {
+               // assignment
+               final String k = part.substring(0, assignment);
+               final String v = part.substring(assignment+1);
+               data.properties.put(k, v);
+           } else {
+               // property key only
+               data.properties.put(part, EMPTY);
+           }
+       }
+       return data;
+   }
+}
diff --git a/src/junit/com/jogamp/common/net/URLCompositionTest.java b/src/junit/com/jogamp/common/net/URLCompositionTest.java
index 5d19c1d..dcf8d9c 100644
--- a/src/junit/com/jogamp/common/net/URLCompositionTest.java
+++ b/src/junit/com/jogamp/common/net/URLCompositionTest.java
@@ -204,6 +204,32 @@ public class URLCompositionTest extends JunitTracer {
         Assert.assertTrue(refURL.sameFile(uri2.toURL()));
     }
     
+    @Test
+    public void testURLProps() throws IOException, URISyntaxException {
+       final String SCHEME = "camera";
+       final String HOST = "somewhere";
+       final String PATH = "0";
+       String[] args = new String[] {
+           SCHEME+"://"+HOST+"/"+PATH,
+           SCHEME+"://"+HOST+"/"+PATH+"?p1=1",
+       };
+       for(int i=0; i<args.length-1; i+=2) {
+           String uri_s0 = args[i];
+           String uri_s1 = args[i+1];
+           URI uri0 = new URI(uri_s0);
+           URI uri1 = new URI(uri_s1);
+           showURI(uri0);
+           showURI(uri1);
+           URIQueryProps data = URIQueryProps.create(uri1);
+           if(null == data) {
+               System.err.println("Error: NULL: <"+uri_s1+"> -> "+uri1+" -> NULL");
+           } else {
+               URI uri1T = data.appendQuery(uri0);
+               showURI(uri1T);
+               Assert.assertEquals(uri1, uri1T);
+           }
+       }
+    }
     public static void main(String args[]) throws IOException {
         String tstname = URLCompositionTest.class.getName();
         org.junit.runner.JUnitCore.main(tstname);