More edge case testing

Author: acoburn

platform/webapp/src/main/java/org/trellisldp/webapp/AppUtils.java

@@ -16,23 +16,30 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Objects.isNull;
+import static java.util.Optional.empty;
 import static java.util.Optional.of;
 import static java.util.ServiceLoader.load;
 import static org.apache.jena.query.DatasetFactory.createTxnMem;
 import static org.apache.jena.query.DatasetFactory.wrap;
 import static org.apache.jena.rdfconnection.RDFConnectionFactory.connect;
 import static org.apache.jena.tdb2.DatabaseMgr.connectDatasetGraph;
 
-
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Optional;
 import java.util.function.Supplier;
 
 import org.apache.jena.rdfconnection.RDFConnection;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.ConfigurationProvider;
 import org.trellisldp.api.RuntimeTrellisException;
+import org.trellisldp.http.CacheControlFilter;
+import org.trellisldp.http.CrossOriginResourceSharingFilter;
 
 final class AppUtils {
 
+    private static final Configuration config = ConfigurationProvider.getConfiguration();
+
     public static <T> T loadFirst(final Class<T> service) {
         return of(load(service).iterator()).filter(Iterator::hasNext).map(Iterator::next)
             .orElseThrow(() -> new RuntimeTrellisException("No loadable " + service.getName() + " on the classpath"));
@@ -46,6 +53,29 @@ public static Collection<String> asCollection(final String value) {
         return isNull(value) ? emptyList() :  asList(value.trim().split("\\s*,\\s*"));
     }
 
+    public static Optional<CacheControlFilter> getCacheControlFilter() {
+        if (config.getOrDefault("trellis.cache.enabled", Boolean.class, false)) {
+            return of(new CacheControlFilter(
+                        config.getOrDefault("trellis.cache.maxAge", Integer.class, 86400),
+                        config.getOrDefault("trellis.cache.mustRevalidate", Boolean.class, true),
+                        config.getOrDefault("trellis.cache.noCache", Boolean.class, false)));
+        }
+        return empty();
+    }
+
+    public static Optional<CrossOriginResourceSharingFilter> getCORSFilter() {
+        if (config.getOrDefault("trellis.cors.enabled", Boolean.class, false)) {
+            return of(new CrossOriginResourceSharingFilter(
+                        AppUtils.asCollection(config.get("trellis.cors.allowOrigin")),
+                        AppUtils.asCollection(config.get("trellis.cors.allowMethods")),
+                        AppUtils.asCollection(config.get("trellis.cors.allowHeaders")),
+                        AppUtils.asCollection(config.get("trellis.cors.exposeHeaders")),
+                        false, // <- Allow-Credentials not supported
+                        config.getOrDefault("trellis.cors.maxAge", Integer.class, 180)));
+        }
+        return empty();
+    }
+
     public static RDFConnection getRDFConnection(final String location) {
         if (isNull(location)) {
             return connect(createTxnMem());

platform/webapp/src/main/java/org/trellisldp/webapp/TrellisApplication.java

@@ -28,8 +28,6 @@
 import org.trellisldp.file.FileBinaryService;
 import org.trellisldp.file.FileMementoService;
 import org.trellisldp.http.AgentAuthorizationFilter;
-import org.trellisldp.http.CacheControlFilter;
-import org.trellisldp.http.CrossOriginResourceSharingFilter;
 import org.trellisldp.http.LdpResource;
 import org.trellisldp.io.JenaIOService;
 import org.trellisldp.namespaces.NamespacesJsonContext;
@@ -66,21 +64,8 @@ public TrellisApplication() {
         register(new LdpResource(resourceService, ioService, binaryService, agentService, resourceService));
         register(new AgentAuthorizationFilter(agentService));
 
-        if (config.getOrDefault("trellis.cache.enabled", Boolean.class, false)) {
-            register(new CacheControlFilter(
-                        config.getOrDefault("trellis.cache.maxAge", Integer.class, 86400),
-                        config.getOrDefault("trellis.cache.mustRevalidate", Boolean.class, true),
-                        config.getOrDefault("trellis.cache.noCache", Boolean.class, false)));
-        }
+        AppUtils.getCacheControlFilter().ifPresent(this::register);
+        AppUtils.getCORSFilter().ifPresent(this::register);
 
-        if (config.getOrDefault("trellis.cors.enabled", Boolean.class, false)) {
-            register(new CrossOriginResourceSharingFilter(
-                        AppUtils.asCollection(config.get("trellis.cors.allowOrigin")),
-                        AppUtils.asCollection(config.get("trellis.cors.allowMethods")),
-                        AppUtils.asCollection(config.get("trellis.cors.allowHeaders")),
-                        AppUtils.asCollection(config.get("trellis.cors.exposeHeaders")),
-                        false, // <- Allow-Credentials not supported
-                        config.getOrDefault("trellis.cors.maxAge", Integer.class, 180)));
-        }
     }
 }

platform/webapp/src/test/java/org/trellisldp/webapp/AppUtilsTest.java

@@ -89,4 +89,27 @@ public void testRDFConnectionRemoteSSL() {
         assertFalse(conn.isClosed());
     }
 
+    @Test
+    public void testNoCORSFilter() {
+       System.getProperties().setProperty("trellis.cors.enabled", "false");
+       assertFalse(AppUtils.getCORSFilter().isPresent());
+       System.getProperties().remove("trellis.cors.enabled");
+    }
+
+    @Test
+    public void testCORSFilter() {
+       assertTrue(AppUtils.getCORSFilter().isPresent());
+    }
+
+    @Test
+    public void testNoCacheFilter() {
+       System.getProperties().setProperty("trellis.cache.enabled", "false");
+       assertFalse(AppUtils.getCacheControlFilter().isPresent());
+       System.getProperties().remove("trellis.cache.enabled");
+    }
+
+    @Test
+    public void testCacheFilter() {
+       assertTrue(AppUtils.getCacheControlFilter().isPresent());
+    }
 }