Move http.core classes into separate module (#1012)

Resolves #1001

Author: acoburn

auth/webac/build.gradle

@@ -18,7 +18,7 @@ dependencies {
     api "org.apache.commons:commons-rdf-api:$commonsRdfVersion"
     api "org.eclipse.microprofile.metrics:microprofile-metrics-api:$microprofileMetricsVersion"
     api project(':trellis-api')
-    api project(':trellis-http')
+    api project(':trellis-common')
 
     implementation "jakarta.xml.bind:jakarta.xml.bind-api:$jaxbApiVersion"
     implementation "org.apache.jena:jena-arq:$jenaVersion"

auth/webac/src/main/java/module-info.java

@@ -16,9 +16,9 @@
 module org.trellisldp.webac {
     exports org.trellisldp.webac;
 
-    requires transitive org.trellisldp.api;
-    requires transitive org.trellisldp.http;
-    requires transitive org.trellisldp.vocabulary;
+    requires org.trellisldp.api;
+    requires org.trellisldp.common;
+    requires org.trellisldp.vocabulary;
 
     requires org.apache.commons.rdf.api;
     requires org.slf4j;

auth/webac/src/main/java/org/trellisldp/webac/WebAcFilter.java

@@ -31,10 +31,10 @@
 import static org.eclipse.microprofile.config.ConfigProvider.getConfig;
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.trellisldp.api.TrellisUtils.TRELLIS_DATA_PREFIX;
-import static org.trellisldp.http.core.HttpConstants.CONFIG_HTTP_BASE_URL;
-import static org.trellisldp.http.core.HttpConstants.PREFER;
-import static org.trellisldp.http.core.Prefer.PREFER_REPRESENTATION;
-import static org.trellisldp.http.core.TrellisRequest.buildBaseUrl;
+import static org.trellisldp.common.HttpConstants.CONFIG_HTTP_BASE_URL;
+import static org.trellisldp.common.HttpConstants.PREFER;
+import static org.trellisldp.common.Prefer.PREFER_REPRESENTATION;
+import static org.trellisldp.common.TrellisRequest.buildBaseUrl;
 import static org.trellisldp.vocabulary.Trellis.AnonymousAgent;
 import static org.trellisldp.vocabulary.Trellis.PreferAudit;
 import static org.trellisldp.vocabulary.Trellis.effectiveAcl;
@@ -62,10 +62,10 @@
 import org.trellisldp.api.RDFFactory;
 import org.trellisldp.api.ResourceService;
 import org.trellisldp.api.Session;
-import org.trellisldp.http.core.HttpConstants;
-import org.trellisldp.http.core.HttpSession;
-import org.trellisldp.http.core.LdpResource;
-import org.trellisldp.http.core.Prefer;
+import org.trellisldp.common.HttpConstants;
+import org.trellisldp.common.HttpSession;
+import org.trellisldp.common.LdpResource;
+import org.trellisldp.common.Prefer;
 import org.trellisldp.vocabulary.ACL;
 
 /**

auth/webac/src/test/java/org/trellisldp/webac/WebAcFilterTest.java

@@ -25,7 +25,7 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.trellisldp.api.TrellisUtils.TRELLIS_DATA_PREFIX;
-import static org.trellisldp.http.core.HttpConstants.PREFER;
+import static org.trellisldp.common.HttpConstants.PREFER;
 
 import java.security.Principal;
 import java.util.HashSet;

components/app/build.gradle

@@ -15,7 +15,7 @@ ext {
 dependencies {
     api "jakarta.enterprise:jakarta.enterprise.cdi-api:$cdiApiVersion"
     api project(':trellis-api')
-    api project(':trellis-http')
+    api project(':trellis-common')
     api project(':trellis-vocabulary')
 
     implementation "org.slf4j:slf4j-api:$slf4jVersion"
@@ -50,7 +50,7 @@ if (project.sourceCompatibility.isJava11Compatible()) {
         doFirst {
             jvmArgs += [
                 '--add-opens', "org.trellisldp.api/org.trellisldp.api=weld.core.impl",
-                '--add-opens', "org.trellisldp.http/org.trellisldp.http.core=weld.core.impl",
+                '--add-opens', "org.trellisldp.common/org.trellisldp.common=weld.core.impl",
                 '--add-opens', "org.trellisldp.constraint/org.trellisldp.constraint=weld.core.impl",
                 '--add-opens', "org.trellisldp.file/org.trellisldp.file=weld.core.impl",
                 '--add-opens', "org.trellisldp.jena/org.trellisldp.jena=weld.core.impl"

components/app/src/main/java/module-info.java

@@ -16,9 +16,9 @@
 module org.trellisldp.app {
     exports org.trellisldp.app;
 
-    requires transitive org.trellisldp.api;
-    requires transitive org.trellisldp.http;
-    requires transitive org.trellisldp.vocabulary;
+    requires org.trellisldp.api;
+    requires org.trellisldp.common;
+    requires org.trellisldp.vocabulary;
 
     requires jakarta.inject;
     requires jakarta.enterprise.cdi.api;

components/app/src/main/java/org/trellisldp/app/BaseServiceBundler.java

@@ -19,7 +19,7 @@
 import javax.inject.Inject;
 
 import org.trellisldp.api.*;
-import org.trellisldp.http.core.*;
+import org.trellisldp.common.*;
 
 /**
  * A {@link ServiceBundler} that supplies components for a Trellis application from its fields.

components/app/src/test/java/org/trellisldp/app/CDIServiceBundlerTest.java

@@ -26,11 +26,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.trellisldp.api.*;
+import org.trellisldp.common.DefaultTimemapGenerator;
+import org.trellisldp.common.ServiceBundler;
 import org.trellisldp.constraint.LdpConstraintService;
 import org.trellisldp.file.FileBinaryService;
 import org.trellisldp.file.FileMementoService;
-import org.trellisldp.http.core.DefaultTimemapGenerator;
-import org.trellisldp.http.core.ServiceBundler;
 import org.trellisldp.jena.JenaIOService;
 import org.trellisldp.jena.NoopProfileCache;
 import org.trellisldp.rdfa.DefaultRdfaWriterService;
@@ -52,7 +52,9 @@ class CDIServiceBundlerTest {
                                            LdpConstraintService.class,
                                            NoopProfileCache.class,
                                            TestServices.class)
-                                       .alternatives(FileMementoService.class));
+                                       .alternatives(
+                                           DefaultTimemapGenerator.class,
+                                           FileMementoService.class));
 
     @Inject
     private ServiceBundler serviceBundler;

components/audit/src/main/java/module-info.java

@@ -16,8 +16,8 @@
 module org.trellisldp.audit {
     exports org.trellisldp.audit;
 
-    requires transitive org.trellisldp.api;
-    requires transitive org.trellisldp.vocabulary;
+    requires org.trellisldp.api;
+    requires org.trellisldp.vocabulary;
 
     requires jakarta.enterprise.cdi.api;
     requires org.apache.commons.rdf.api;

components/cache/src/main/java/module-info.java

@@ -16,7 +16,7 @@
 module org.trellisldp.cache {
     exports org.trellisldp.cache;
 
-    requires transitive org.trellisldp.api;
+    requires org.trellisldp.api;
 
     requires com.google.common;
 }