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

Resolves #1001
trellis-ldp · Aug 13, 2020 · b659ec6 · b659ec6
1 parent ca28ce1
commit b659ec6
Show file tree

Hide file tree

Showing 143 changed files with 3,307 additions and 302 deletions.
diff --git a/auth/webac/build.gradle b/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"

diff --git a/auth/webac/src/main/java/module-info.java b/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;

diff --git a/auth/webac/src/main/java/org/trellisldp/webac/WebAcFilter.java b/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;
 
 /**

diff --git a/auth/webac/src/test/java/org/trellisldp/webac/WebAcFilterTest.java b/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;

diff --git a/components/app/build.gradle b/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"

diff --git a/components/app/src/main/java/module-info.java b/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;

diff --git a/components/app/src/main/java/org/trellisldp/app/BaseServiceBundler.java b/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.

diff --git a/components/app/src/test/java/org/trellisldp/app/CDIServiceBundlerTest.java b/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;

diff --git a/components/audit/src/main/java/module-info.java b/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;

diff --git a/components/cache/src/main/java/module-info.java b/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;
 }
diff --git a/components/cdi/src/main/java/module-info.java b/components/cdi/src/main/java/module-info.java
@@ -16,8 +16,8 @@
 module org.trellisldp.cdi {
     exports org.trellisldp.cdi;
 
-    requires transitive org.trellisldp.api;
-    requires transitive org.trellisldp.app;
+    requires org.trellisldp.api;
+    requires org.trellisldp.app;
 
     requires jakarta.inject;
     requires jakarta.enterprise.cdi.api;

diff --git a/components/constraint/src/main/java/module-info.java b/components/constraint/src/main/java/module-info.java
@@ -16,8 +16,8 @@
 module org.trellisldp.constraint {
     exports org.trellisldp.constraint;
 
-    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;

diff --git a/...onents/dropwizard/src/main/java/org/trellisldp/dropwizard/AbstractTrellisApplication.java b/...onents/dropwizard/src/main/java/org/trellisldp/dropwizard/AbstractTrellisApplication.java
@@ -38,14 +38,14 @@
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 import org.slf4j.Logger;
 import org.trellisldp.api.ResourceService;
+import org.trellisldp.common.ServiceBundler;
 import org.trellisldp.dropwizard.config.BasicAuthConfiguration;
 import org.trellisldp.dropwizard.config.JwtAuthConfiguration;
 import org.trellisldp.dropwizard.config.TrellisConfiguration;
 import org.trellisldp.http.CacheControlFilter;
 import org.trellisldp.http.TrellisHttpFilter;
 import org.trellisldp.http.TrellisHttpResource;
 import org.trellisldp.http.WebSubHeaderFilter;
-import org.trellisldp.http.core.ServiceBundler;
 import org.trellisldp.vocabulary.Trellis;
 import org.trellisldp.webac.WebAcFilter;
 import org.trellisldp.webac.WebAcService;

diff --git a/.../dropwizard/src/main/java/org/trellisldp/dropwizard/CrossOriginResourceSharingFilter.java b/.../dropwizard/src/main/java/org/trellisldp/dropwizard/CrossOriginResourceSharingFilter.java
@@ -38,7 +38,7 @@
 import javax.ws.rs.ext.Provider;
 
 import org.slf4j.Logger;
-import org.trellisldp.http.core.LdpResource;
+import org.trellisldp.common.LdpResource;
 
 /**
  * A {@link ContainerResponseFilter} that adds CORS-related headers to HTTP responses.

diff --git a/components/dropwizard/src/test/java/org/trellisldp/dropwizard/SimpleServiceBundler.java b/components/dropwizard/src/test/java/org/trellisldp/dropwizard/SimpleServiceBundler.java
@@ -28,9 +28,9 @@
 import org.trellisldp.app.BaseServiceBundler;
 import org.trellisldp.app.DefaultConstraintServices;
 import org.trellisldp.audit.DefaultAuditService;
+import org.trellisldp.common.DefaultTimemapGenerator;
 import org.trellisldp.constraint.LdpConstraintService;
 import org.trellisldp.file.FileBinaryService;
-import org.trellisldp.http.core.DefaultTimemapGenerator;
 import org.trellisldp.jena.JenaIOService;
 import org.trellisldp.jena.NoopProfileCache;
 import org.trellisldp.triplestore.TriplestoreResourceService;

diff --git a/components/dropwizard/src/test/java/org/trellisldp/dropwizard/SimpleTrellisApp.java b/components/dropwizard/src/test/java/org/trellisldp/dropwizard/SimpleTrellisApp.java
@@ -17,8 +17,8 @@
 
 import io.dropwizard.setup.Environment;
 
+import org.trellisldp.common.ServiceBundler;
 import org.trellisldp.dropwizard.config.TrellisConfiguration;
-import org.trellisldp.http.core.ServiceBundler;
 
 /**
  * A simple test app.

diff --git a/components/dropwizard/src/test/java/org/trellisldp/dropwizard/TrellisApplicationTest.java b/components/dropwizard/src/test/java/org/trellisldp/dropwizard/TrellisApplicationTest.java
@@ -23,8 +23,8 @@
 import static org.glassfish.jersey.client.ClientProperties.CONNECT_TIMEOUT;
 import static org.glassfish.jersey.client.ClientProperties.READ_TIMEOUT;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE_TYPE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE_TYPE;
 
 import io.dropwizard.Application;
 import io.dropwizard.client.JerseyClientBuilder;

diff --git a/components/test/build.gradle b/components/test/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     implementation "org.slf4j:slf4j-api:$slf4jVersion"
     implementation project(':trellis-api')
     implementation project(':trellis-jena')
-    implementation project(':trellis-http')
+    implementation project(':trellis-common')
     implementation project(':trellis-vocabulary')
 
     testImplementation "ch.qos.logback:logback-classic:$logbackVersion"

diff --git a/components/test/src/main/java/module-info.java b/components/test/src/main/java/module-info.java
@@ -16,10 +16,10 @@
 module org.trellisldp.test {
     exports org.trellisldp.test;
 
-    requires transitive org.trellisldp.api;
-    requires transitive org.trellisldp.http;
-    requires transitive org.trellisldp.jena;
-    requires transitive org.trellisldp.vocabulary;
+    requires org.trellisldp.api;
+    requires org.trellisldp.common;
+    requires org.trellisldp.jena;
+    requires org.trellisldp.vocabulary;
 
     requires com.fasterxml.jackson.core;
     requires com.fasterxml.jackson.databind;

diff --git a/components/test/src/main/java/org/trellisldp/test/AbstractApplicationAuthTests.java b/components/test/src/main/java/org/trellisldp/test/AbstractApplicationAuthTests.java
@@ -25,9 +25,9 @@
 import static org.apache.commons.codec.binary.Base64.encodeBase64String;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.trellisldp.http.core.HttpConstants.SLUG;
-import static org.trellisldp.http.core.RdfMediaType.APPLICATION_SPARQL_UPDATE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE;
+import static org.trellisldp.common.HttpConstants.SLUG;
+import static org.trellisldp.common.RdfMediaType.APPLICATION_SPARQL_UPDATE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE;
 import static org.trellisldp.test.TestUtils.buildJwt;
 import static org.trellisldp.test.TestUtils.getLinks;
 import static org.trellisldp.test.TestUtils.getResourceAsString;

diff --git a/components/test/src/main/java/org/trellisldp/test/AuditTests.java b/components/test/src/main/java/org/trellisldp/test/AuditTests.java
@@ -24,9 +24,9 @@
 import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL;
 import static org.apache.commons.rdf.api.RDFSyntax.TURTLE;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.trellisldp.http.core.HttpConstants.SLUG;
-import static org.trellisldp.http.core.RdfMediaType.APPLICATION_SPARQL_UPDATE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE;
+import static org.trellisldp.common.HttpConstants.SLUG;
+import static org.trellisldp.common.RdfMediaType.APPLICATION_SPARQL_UPDATE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE;
 import static org.trellisldp.test.TestUtils.buildJwt;
 import static org.trellisldp.test.TestUtils.getResourceAsString;
 import static org.trellisldp.test.TestUtils.readEntityAsGraph;

diff --git a/components/test/src/main/java/org/trellisldp/test/AuthAdministratorTests.java b/components/test/src/main/java/org/trellisldp/test/AuthAdministratorTests.java
@@ -21,7 +21,7 @@
 import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 import static javax.ws.rs.core.Response.Status.fromStatusCode;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.trellisldp.http.core.RdfMediaType.APPLICATION_SPARQL_UPDATE;
+import static org.trellisldp.common.RdfMediaType.APPLICATION_SPARQL_UPDATE;
 
 import java.util.stream.Stream;
 

diff --git a/components/test/src/main/java/org/trellisldp/test/AuthAnonymousTests.java b/components/test/src/main/java/org/trellisldp/test/AuthAnonymousTests.java
@@ -20,8 +20,8 @@
 import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
 import static javax.ws.rs.core.Response.Status.fromStatusCode;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.trellisldp.http.core.RdfMediaType.APPLICATION_SPARQL_UPDATE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE;
+import static org.trellisldp.common.RdfMediaType.APPLICATION_SPARQL_UPDATE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE;
 
 import java.util.stream.Stream;
 

diff --git a/components/test/src/main/java/org/trellisldp/test/AuthOtherUserTests.java b/components/test/src/main/java/org/trellisldp/test/AuthOtherUserTests.java
@@ -21,8 +21,8 @@
 import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL;
 import static javax.ws.rs.core.Response.Status.fromStatusCode;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.trellisldp.http.core.RdfMediaType.APPLICATION_SPARQL_UPDATE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE;
+import static org.trellisldp.common.RdfMediaType.APPLICATION_SPARQL_UPDATE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE;
 
 import java.util.stream.Stream;
 

diff --git a/components/test/src/main/java/org/trellisldp/test/AuthUserTests.java b/components/test/src/main/java/org/trellisldp/test/AuthUserTests.java
@@ -21,8 +21,8 @@
 import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL;
 import static javax.ws.rs.core.Response.Status.fromStatusCode;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.trellisldp.http.core.RdfMediaType.APPLICATION_SPARQL_UPDATE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE;
+import static org.trellisldp.common.RdfMediaType.APPLICATION_SPARQL_UPDATE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE;
 
 import java.util.stream.Stream;
 

diff --git a/components/test/src/main/java/org/trellisldp/test/EventTests.java b/components/test/src/main/java/org/trellisldp/test/EventTests.java
@@ -26,8 +26,8 @@
 import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL;
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.trellisldp.http.core.HttpConstants.SLUG;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE;
+import static org.trellisldp.common.HttpConstants.SLUG;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE;
 import static org.trellisldp.test.TestUtils.buildJwt;
 import static org.trellisldp.test.TestUtils.checkEventGraph;
 import static org.trellisldp.test.TestUtils.getResourceAsString;

diff --git a/components/test/src/main/java/org/trellisldp/test/LdpBasicContainerTests.java b/components/test/src/main/java/org/trellisldp/test/LdpBasicContainerTests.java
@@ -26,13 +26,13 @@
 import static org.eclipse.microprofile.config.ConfigProvider.getConfig;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import static org.trellisldp.http.core.HttpConstants.CONFIG_HTTP_PATCH_CREATE;
-import static org.trellisldp.http.core.HttpConstants.CONFIG_HTTP_PUT_UNCONTAINED;
-import static org.trellisldp.http.core.HttpConstants.PREFER;
-import static org.trellisldp.http.core.HttpConstants.SLUG;
-import static org.trellisldp.http.core.RdfMediaType.APPLICATION_SPARQL_UPDATE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE_TYPE;
+import static org.trellisldp.common.HttpConstants.CONFIG_HTTP_PATCH_CREATE;
+import static org.trellisldp.common.HttpConstants.CONFIG_HTTP_PUT_UNCONTAINED;
+import static org.trellisldp.common.HttpConstants.PREFER;
+import static org.trellisldp.common.HttpConstants.SLUG;
+import static org.trellisldp.common.RdfMediaType.APPLICATION_SPARQL_UPDATE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE_TYPE;
 import static org.trellisldp.test.TestUtils.getResourceAsString;
 import static org.trellisldp.test.TestUtils.readEntityAsGraph;
 

diff --git a/components/test/src/main/java/org/trellisldp/test/LdpBinaryTests.java b/components/test/src/main/java/org/trellisldp/test/LdpBinaryTests.java
@@ -22,9 +22,9 @@
 import static org.apache.commons.rdf.api.RDFSyntax.TURTLE;
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.trellisldp.http.core.HttpConstants.SLUG;
-import static org.trellisldp.http.core.RdfMediaType.APPLICATION_SPARQL_UPDATE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE_TYPE;
+import static org.trellisldp.common.HttpConstants.SLUG;
+import static org.trellisldp.common.RdfMediaType.APPLICATION_SPARQL_UPDATE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE_TYPE;
 import static org.trellisldp.test.TestUtils.readEntityAsGraph;
 import static org.trellisldp.test.TestUtils.readEntityAsString;
 

diff --git a/components/test/src/main/java/org/trellisldp/test/LdpDirectContainerTests.java b/components/test/src/main/java/org/trellisldp/test/LdpDirectContainerTests.java
@@ -25,11 +25,11 @@
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import static org.trellisldp.http.core.HttpConstants.PREFER;
-import static org.trellisldp.http.core.HttpConstants.SLUG;
-import static org.trellisldp.http.core.RdfMediaType.APPLICATION_SPARQL_UPDATE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE_TYPE;
+import static org.trellisldp.common.HttpConstants.PREFER;
+import static org.trellisldp.common.HttpConstants.SLUG;
+import static org.trellisldp.common.RdfMediaType.APPLICATION_SPARQL_UPDATE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE_TYPE;
 import static org.trellisldp.test.TestUtils.getLinks;
 import static org.trellisldp.test.TestUtils.getResourceAsString;
 import static org.trellisldp.test.TestUtils.hasConstrainedBy;

diff --git a/components/test/src/main/java/org/trellisldp/test/LdpIndirectContainerTests.java b/components/test/src/main/java/org/trellisldp/test/LdpIndirectContainerTests.java
@@ -25,11 +25,11 @@
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import static org.trellisldp.http.core.HttpConstants.PREFER;
-import static org.trellisldp.http.core.HttpConstants.SLUG;
-import static org.trellisldp.http.core.RdfMediaType.APPLICATION_SPARQL_UPDATE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE;
-import static org.trellisldp.http.core.RdfMediaType.TEXT_TURTLE_TYPE;
+import static org.trellisldp.common.HttpConstants.PREFER;
+import static org.trellisldp.common.HttpConstants.SLUG;
+import static org.trellisldp.common.RdfMediaType.APPLICATION_SPARQL_UPDATE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE;
+import static org.trellisldp.common.RdfMediaType.TEXT_TURTLE_TYPE;
 import static org.trellisldp.test.TestUtils.getLinks;
 import static org.trellisldp.test.TestUtils.getResourceAsString;
 import static org.trellisldp.test.TestUtils.hasConstrainedBy;