Don't expand wild cards when matchType is set explicitly

As a consequence of actually testing this we also fix prefix wildcard
expansion so it actually works. Oops.

Fixes #14

Author: ato

src/outbackcdx/WbCdxApi.java

@@ -58,7 +58,7 @@ static class Query {
         Query(Map<String,String> params) {
             accessPoint = params.get("accesspoint");
             url = params.get("url");
-            matchType = MatchType.valueOf(params.getOrDefault("matchType", "exact").toUpperCase());
+            matchType = MatchType.valueOf(params.getOrDefault("matchType", "default").toUpperCase());
             sort = SortType.valueOf(params.getOrDefault("sort", "default").toUpperCase());
             closest = params.get("closest");
 
@@ -72,13 +72,15 @@ static class Query {
         }
 
         void expandWildcards() {
-            if (matchType == MatchType.EXACT) {
+            if (matchType == MatchType.DEFAULT) {
                 if (url.endsWith("*")) {
                     matchType = MatchType.PREFIX;
-                    url = url.substring(url.length() - 1);
+                    url = url.substring(0, url.length() - 1);
                 } else if (url.startsWith("*.")) {
                     matchType = MatchType.DOMAIN;
                     url = url.substring(2);
+                } else {
+                    matchType = MatchType.EXACT;
                 }
             }
         }
@@ -232,7 +234,7 @@ public void close() {
     }
 
     enum MatchType {
-        EXACT, PREFIX, HOST, DOMAIN, RANGE;
+        DEFAULT, EXACT, PREFIX, HOST, DOMAIN, RANGE;
     }
 
     enum SortType {

test/outbackcdx/WbCdxApiTest.java

@@ -2,12 +2,46 @@
 
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.junit.Assert.assertEquals;
 
 public class WbCdxApiTest {
     @Test
-    public void hostFromSurt() throws Exception {
+    public void hostFromSurt() {
         assertEquals("org,example", WbCdxApi.hostFromSurt("org,example)/foo/bar"));
         assertEquals("org,example", WbCdxApi.hostFromSurt("org,example"));
     }
+
+    @Test
+    public void queryDefaultShouldExpandPrefixWildcards() {
+        Map<String,String> params = new HashMap<>();
+        params.put("url", "http://example.org/*");
+        WbCdxApi.Query query = new WbCdxApi.Query(params);
+        query.expandWildcards();
+        assertEquals(WbCdxApi.MatchType.PREFIX, query.matchType);
+        assertEquals("http://example.org/", query.url);
+    }
+
+    @Test
+    public void queryDefaultShouldExpandDomainWildcards() {
+        Map<String,String> params = new HashMap<>();
+        params.put("url", "*.example.org");
+        WbCdxApi.Query query = new WbCdxApi.Query(params);
+        query.expandWildcards();
+        assertEquals(WbCdxApi.MatchType.DOMAIN, query.matchType);
+        assertEquals("example.org", query.url);
+    }
+
+    @Test
+    public void queryExactMatchShouldNotExpandWildcards() {
+        Map<String,String> params = new HashMap<>();
+        params.put("url", "http://example.org/*");
+        params.put("matchType", "exact");
+        WbCdxApi.Query query = new WbCdxApi.Query(params);
+        query.expandWildcards();
+        assertEquals(WbCdxApi.MatchType.EXACT, query.matchType);
+        assertEquals("http://example.org/*", query.url);
+    }
 }