Merge pull request #45 from zeroae/chore/refactor-url-handler

Rename the B64 Protocol to MMAP.

Author: sodre

src/main/java/co/zeroae/gate/App.java

@@ -1,6 +1,6 @@
 package co.zeroae.gate;
 
-import co.zeroae.gate.b64.Handler;
+import co.zeroae.gate.mmap.Handler;
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
@@ -52,7 +52,7 @@ public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatew
     private static final AppMetadata metadata = loadMetadata();
     private static final DocumentLRUCache cache = AWSXRay.createSegment("Cache Init",
             () -> new DocumentLRUCache(App.CACHE_DIR, App.CACHE_DIR_USAGE));
-    private static final URLStreamHandler b64Handler = new Handler();
+    private static final URLStreamHandler mmapHandler = new Handler();
 
     private static AppMetadata loadMetadata() {
         final AppMetadata rv = new AppMetadata();
@@ -180,14 +180,14 @@ private void featureMapPutContent(
             featureMap.put(Document.DOCUMENT_STRING_CONTENT_PARAMETER_NAME, content);
         else {
             // GATE FastInfosetFormat can not handle binary in the string content.
-            Handler.paths.put(contentDigest, content);
+            Handler.paths.put(contentDigest, Base64.decode(content));
             featureMap.put(
                     Document.DOCUMENT_URL_PARAMETER_NAME,
-                    new URL("b64",
+                    new URL("mmap",
                             mimeType != null ? Base64.encodeAsString(mimeType.getBytes()) : null,
                             64,
                             contentDigest,
-                            b64Handler));
+                            mmapHandler));
         }
     }
 

src/main/java/co/zeroae/gate/b64/Handler.java renamed to src/main/java/co/zeroae/gate/mmap/Handler.java

@@ -1,9 +1,8 @@
-package co.zeroae.gate.b64;
+package co.zeroae.gate.mmap;
 
 import com.amazonaws.util.Base64;
-import com.amazonaws.util.StringInputStream;
-import org.apache.commons.codec.binary.Base64InputStream;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -14,7 +13,7 @@
 import java.util.WeakHashMap;
 
 public class Handler extends URLStreamHandler {
-    static final public Map<String, String> paths = Collections.synchronizedMap(new WeakHashMap<>());
+    public static final Map<String, byte[]> paths = Collections.synchronizedMap(new WeakHashMap<>());
 
     @Override
     protected URLConnection openConnection(URL u) {
@@ -43,9 +42,7 @@ public String getContentType() {
 
         @Override
         public InputStream getInputStream() throws IOException {
-            return new Base64InputStream(new StringInputStream(
-                    paths.get(url.getPath())
-            ));
+            return new ByteArrayInputStream(paths.get(url.getPath()));
         }
     }
 }