diff --git a/jena/pom.xml b/jena/pom.xml index 99f1602e647..03a1d869985 100644 --- a/jena/pom.xml +++ b/jena/pom.xml @@ -73,6 +73,18 @@ ${project.version} test + + com.inrupt.client + inrupt-client-jsonb + ${project.version} + test + + + org.eclipse + yasson + ${yasson.version} + test + org.wiremock wiremock @@ -92,7 +104,20 @@ none - httpclient-test + httpclient-jackson-test + test + + test + + + + com.inrupt.client:inrupt-client-okhttp + com.inrupt.client:inrupt-client-jsonb + + + + + httpclient-jsonb-test test test @@ -100,11 +125,25 @@ com.inrupt.client:inrupt-client-okhttp + com.inrupt.client:inrupt-client-jackson + + + + + okhttp-jackson-test + test + + test + + + + com.inrupt.client:inrupt-client-httpclient + com.inrupt.client:inrupt-client-jsonb - okhhttp-test + okhttp-jsonb-test test test @@ -112,6 +151,7 @@ com.inrupt.client:inrupt-client-httpclient + com.inrupt.client:inrupt-client-jackson diff --git a/rdf4j/pom.xml b/rdf4j/pom.xml index 00915b82835..681cd123fc8 100644 --- a/rdf4j/pom.xml +++ b/rdf4j/pom.xml @@ -150,6 +150,24 @@ ${junit.version} test + + com.inrupt.client + inrupt-client-jackson + ${project.version} + test + + + com.inrupt.client + inrupt-client-jsonb + ${project.version} + test + + + org.eclipse + yasson + ${yasson.version} + test + @@ -163,7 +181,7 @@ none - httpclient-test + httpclient-jackson-test test test @@ -171,11 +189,38 @@ com.inrupt.client:inrupt-client-okhttp + com.inrupt.client:inrupt-client-jsonb + + + + + httpclient-jsonb-test + test + + test + + + + com.inrupt.client:inrupt-client-okhttp + com.inrupt.client:inrupt-client-jackson + + + + + okhttp-jackson-test + test + + test + + + + com.inrupt.client:inrupt-client-httpclient + com.inrupt.client:inrupt-client-jsonb - okhttp-test + okhttp-jsonb-test test test @@ -183,6 +228,7 @@ com.inrupt.client:inrupt-client-httpclient + com.inrupt.client:inrupt-client-jackson diff --git a/solid/pom.xml b/solid/pom.xml index 3be4e20184b..e6678461908 100644 --- a/solid/pom.xml +++ b/solid/pom.xml @@ -85,6 +85,18 @@ ${project.version} test + + com.inrupt.client + inrupt-client-jsonb + ${project.version} + test + + + org.eclipse + yasson + ${yasson.version} + test + org.slf4j slf4j-api @@ -110,7 +122,7 @@ none - httpclient-jena-test + httpclient-jena-jackson-test test test @@ -119,11 +131,40 @@ com.inrupt.client:inrupt-client-okhttp com.inrupt.client:inrupt-client-rdf4j + com.inrupt.client:inrupt-client-jsonb + + + + + httpclient-jena-jsonb-test + test + + test + + + + com.inrupt.client:inrupt-client-okhttp + com.inrupt.client:inrupt-client-rdf4j + com.inrupt.client:inrupt-client-jackson + + + + + httpclient-rdf4j-jackson-test + test + + test + + + + com.inrupt.client:inrupt-client-okhttp + com.inrupt.client:inrupt-client-jena + com.inrupt.client:inrupt-client-jsonb - httpclient-rdf4j-test + httpclient-rdf4j-jsonb-test test test @@ -132,11 +173,12 @@ com.inrupt.client:inrupt-client-okhttp com.inrupt.client:inrupt-client-jena + com.inrupt.client:inrupt-client-jackson - okhttp-jena-test + okhttp-jena-jackson-test test test @@ -146,11 +188,42 @@ com.inrupt.client:inrupt-client-httpclient com.inrupt.client:inrupt-client-rdf4j com.inrupt.client:inrupt-client-rdf-legacy + com.inrupt.client:inrupt-client-jsonb + + + + + okhttp-jena-jsonb-test + test + + test + + + + com.inrupt.client:inrupt-client-httpclient + com.inrupt.client:inrupt-client-rdf4j + com.inrupt.client:inrupt-client-rdf-legacy + com.inrupt.client:inrupt-client-jackson + + + + + okhttp-rdf4j-jackson-test + test + + test + + + + com.inrupt.client:inrupt-client-httpclient + com.inrupt.client:inrupt-client-jena + com.inrupt.client:inrupt-client-rdf-legacy + com.inrupt.client:inrupt-client-jsonb - okhttp-rdf4j-test + okhttp-rdf4j-jsonb-test test test @@ -160,6 +233,7 @@ com.inrupt.client:inrupt-client-httpclient com.inrupt.client:inrupt-client-jena com.inrupt.client:inrupt-client-rdf-legacy + com.inrupt.client:inrupt-client-jackson diff --git a/solid/src/test/java/com/inrupt/client/solid/SolidClientTest.java b/solid/src/test/java/com/inrupt/client/solid/SolidClientTest.java index dbe200c135b..af328c953cb 100644 --- a/solid/src/test/java/com/inrupt/client/solid/SolidClientTest.java +++ b/solid/src/test/java/com/inrupt/client/solid/SolidClientTest.java @@ -26,9 +26,9 @@ import com.inrupt.client.*; import com.inrupt.client.auth.Session; -import com.inrupt.client.jackson.JacksonService; import com.inrupt.client.spi.JsonService; import com.inrupt.client.spi.RDFFactory; +import com.inrupt.client.spi.ServiceProvider; import com.inrupt.client.util.URIBuilder; import com.inrupt.client.vocabulary.PIM; @@ -58,7 +58,7 @@ class SolidClientTest { private static final Map config = new HashMap<>(); private static final RDF rdf = RDFFactory.getInstance(); private static final SolidClient client = SolidClient.getClient().session(Session.anonymous()); - private static final JsonService jsonService = new JacksonService(); + private static final JsonService jsonService = ServiceProvider.getJsonService(); @BeforeAll static void setup() {