Skip to content

Commit 83c6046

Browse files
acoburnacoburn
committed
Revert "JCL-402: JSONB test coverage (#1184)"
This reverts commit 52d485b.
1 parent 61c4f7c commit 83c6046

File tree

4 files changed

+10
-170
lines changed

4 files changed

+10
-170
lines changed

‎jena/pom.xml‎

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,6 @@
7373
<version>${project.version}</version>
7474
<scope>test</scope>
7575
</dependency>
76-
<dependency>
77-
<groupId>com.inrupt.client</groupId>
78-
<artifactId>inrupt-client-jsonb</artifactId>
79-
<version>${project.version}</version>
80-
<scope>test</scope>
81-
</dependency>
82-
<dependency>
83-
<groupId>org.eclipse</groupId>
84-
<artifactId>yasson</artifactId>
85-
<version>${yasson.version}</version>
86-
<scope>test</scope>
87-
</dependency>
8876
<dependency>
8977
<groupId>org.wiremock</groupId>
9078
<artifactId>wiremock</artifactId>
@@ -104,54 +92,26 @@
10492
<phase>none</phase>
10593
</execution>
10694
<execution>
107-
<id>httpclient-jackson-test</id>
108-
<phase>test</phase>
109-
<goals>
110-
<goal>test</goal>
111-
</goals>
112-
<configuration>
113-
<classpathDependencyExcludes>
114-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-okhttp</classpathDependencyExclude>
115-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jsonb</classpathDependencyExclude>
116-
</classpathDependencyExcludes>
117-
</configuration>
118-
</execution>
119-
<execution>
120-
<id>httpclient-jsonb-test</id>
95+
<id>httpclient-test</id>
12196
<phase>test</phase>
12297
<goals>
12398
<goal>test</goal>
12499
</goals>
125100
<configuration>
126101
<classpathDependencyExcludes>
127102
<classpathDependencyExclude>com.inrupt.client:inrupt-client-okhttp</classpathDependencyExclude>
128-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jackson</classpathDependencyExclude>
129-
</classpathDependencyExcludes>
130-
</configuration>
131-
</execution>
132-
<execution>
133-
<id>okhttp-jackson-test</id>
134-
<phase>test</phase>
135-
<goals>
136-
<goal>test</goal>
137-
</goals>
138-
<configuration>
139-
<classpathDependencyExcludes>
140-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-httpclient</classpathDependencyExclude>
141-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jsonb</classpathDependencyExclude>
142103
</classpathDependencyExcludes>
143104
</configuration>
144105
</execution>
145106
<execution>
146-
<id>okhttp-jsonb-test</id>
107+
<id>okhhttp-test</id>
147108
<phase>test</phase>
148109
<goals>
149110
<goal>test</goal>
150111
</goals>
151112
<configuration>
152113
<classpathDependencyExcludes>
153114
<classpathDependencyExclude>com.inrupt.client:inrupt-client-httpclient</classpathDependencyExclude>
154-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jackson</classpathDependencyExclude>
155115
</classpathDependencyExcludes>
156116
</configuration>
157117
</execution>

‎rdf4j/pom.xml‎

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -150,24 +150,6 @@
150150
<version>${junit.version}</version>
151151
<scope>test</scope>
152152
</dependency>
153-
<dependency>
154-
<groupId>com.inrupt.client</groupId>
155-
<artifactId>inrupt-client-jackson</artifactId>
156-
<version>${project.version}</version>
157-
<scope>test</scope>
158-
</dependency>
159-
<dependency>
160-
<groupId>com.inrupt.client</groupId>
161-
<artifactId>inrupt-client-jsonb</artifactId>
162-
<version>${project.version}</version>
163-
<scope>test</scope>
164-
</dependency>
165-
<dependency>
166-
<groupId>org.eclipse</groupId>
167-
<artifactId>yasson</artifactId>
168-
<version>${yasson.version}</version>
169-
<scope>test</scope>
170-
</dependency>
171153
</dependencies>
172154

173155
<build>
@@ -181,54 +163,26 @@
181163
<phase>none</phase>
182164
</execution>
183165
<execution>
184-
<id>httpclient-jackson-test</id>
166+
<id>httpclient-test</id>
185167
<phase>test</phase>
186168
<goals>
187169
<goal>test</goal>
188170
</goals>
189171
<configuration>
190172
<classpathDependencyExcludes>
191173
<classpathDependencyExclude>com.inrupt.client:inrupt-client-okhttp</classpathDependencyExclude>
192-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jsonb</classpathDependencyExclude>
193-
</classpathDependencyExcludes>
194-
</configuration>
195-
</execution>
196-
<execution>
197-
<id>httpclient-jsonb-test</id>
198-
<phase>test</phase>
199-
<goals>
200-
<goal>test</goal>
201-
</goals>
202-
<configuration>
203-
<classpathDependencyExcludes>
204-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-okhttp</classpathDependencyExclude>
205-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jackson</classpathDependencyExclude>
206-
</classpathDependencyExcludes>
207-
</configuration>
208-
</execution>
209-
<execution>
210-
<id>okhttp-jackson-test</id>
211-
<phase>test</phase>
212-
<goals>
213-
<goal>test</goal>
214-
</goals>
215-
<configuration>
216-
<classpathDependencyExcludes>
217-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-httpclient</classpathDependencyExclude>
218-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jsonb</classpathDependencyExclude>
219174
</classpathDependencyExcludes>
220175
</configuration>
221176
</execution>
222177
<execution>
223-
<id>okhttp-jsonb-test</id>
178+
<id>okhttp-test</id>
224179
<phase>test</phase>
225180
<goals>
226181
<goal>test</goal>
227182
</goals>
228183
<configuration>
229184
<classpathDependencyExcludes>
230185
<classpathDependencyExclude>com.inrupt.client:inrupt-client-httpclient</classpathDependencyExclude>
231-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jackson</classpathDependencyExclude>
232186
</classpathDependencyExcludes>
233187
</configuration>
234188
</execution>

‎solid/pom.xml‎

Lines changed: 4 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,6 @@
8585
<version>${project.version}</version>
8686
<scope>test</scope>
8787
</dependency>
88-
<dependency>
89-
<groupId>com.inrupt.client</groupId>
90-
<artifactId>inrupt-client-jsonb</artifactId>
91-
<version>${project.version}</version>
92-
<scope>test</scope>
93-
</dependency>
94-
<dependency>
95-
<groupId>org.eclipse</groupId>
96-
<artifactId>yasson</artifactId>
97-
<version>${yasson.version}</version>
98-
<scope>test</scope>
99-
</dependency>
10088
<dependency>
10189
<groupId>org.slf4j</groupId>
10290
<artifactId>slf4j-api</artifactId>
@@ -122,7 +110,7 @@
122110
<phase>none</phase>
123111
</execution>
124112
<execution>
125-
<id>httpclient-jena-jackson-test</id>
113+
<id>httpclient-jena-test</id>
126114
<phase>test</phase>
127115
<goals>
128116
<goal>test</goal>
@@ -131,40 +119,11 @@
131119
<classpathDependencyExcludes>
132120
<classpathDependencyExclude>com.inrupt.client:inrupt-client-okhttp</classpathDependencyExclude>
133121
<classpathDependencyExclude>com.inrupt.client:inrupt-client-rdf4j</classpathDependencyExclude>
134-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jsonb</classpathDependencyExclude>
135-
</classpathDependencyExcludes>
136-
</configuration>
137-
</execution>
138-
<execution>
139-
<id>httpclient-jena-jsonb-test</id>
140-
<phase>test</phase>
141-
<goals>
142-
<goal>test</goal>
143-
</goals>
144-
<configuration>
145-
<classpathDependencyExcludes>
146-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-okhttp</classpathDependencyExclude>
147-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-rdf4j</classpathDependencyExclude>
148-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jackson</classpathDependencyExclude>
149-
</classpathDependencyExcludes>
150-
</configuration>
151-
</execution>
152-
<execution>
153-
<id>httpclient-rdf4j-jackson-test</id>
154-
<phase>test</phase>
155-
<goals>
156-
<goal>test</goal>
157-
</goals>
158-
<configuration>
159-
<classpathDependencyExcludes>
160-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-okhttp</classpathDependencyExclude>
161-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jena</classpathDependencyExclude>
162-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jsonb</classpathDependencyExclude>
163122
</classpathDependencyExcludes>
164123
</configuration>
165124
</execution>
166125
<execution>
167-
<id>httpclient-rdf4j-jsonb-test</id>
126+
<id>httpclient-rdf4j-test</id>
168127
<phase>test</phase>
169128
<goals>
170129
<goal>test</goal>
@@ -173,12 +132,11 @@
173132
<classpathDependencyExcludes>
174133
<classpathDependencyExclude>com.inrupt.client:inrupt-client-okhttp</classpathDependencyExclude>
175134
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jena</classpathDependencyExclude>
176-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jackson</classpathDependencyExclude>
177135
</classpathDependencyExcludes>
178136
</configuration>
179137
</execution>
180138
<execution>
181-
<id>okhttp-jena-jackson-test</id>
139+
<id>okhttp-jena-test</id>
182140
<phase>test</phase>
183141
<goals>
184142
<goal>test</goal>
@@ -188,42 +146,11 @@
188146
<classpathDependencyExclude>com.inrupt.client:inrupt-client-httpclient</classpathDependencyExclude>
189147
<classpathDependencyExclude>com.inrupt.client:inrupt-client-rdf4j</classpathDependencyExclude>
190148
<classpathDependencyExclude>com.inrupt.client:inrupt-client-rdf-legacy</classpathDependencyExclude>
191-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jsonb</classpathDependencyExclude>
192-
</classpathDependencyExcludes>
193-
</configuration>
194-
</execution>
195-
<execution>
196-
<id>okhttp-jena-jsonb-test</id>
197-
<phase>test</phase>
198-
<goals>
199-
<goal>test</goal>
200-
</goals>
201-
<configuration>
202-
<classpathDependencyExcludes>
203-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-httpclient</classpathDependencyExclude>
204-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-rdf4j</classpathDependencyExclude>
205-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-rdf-legacy</classpathDependencyExclude>
206-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jackson</classpathDependencyExclude>
207-
</classpathDependencyExcludes>
208-
</configuration>
209-
</execution>
210-
<execution>
211-
<id>okhttp-rdf4j-jackson-test</id>
212-
<phase>test</phase>
213-
<goals>
214-
<goal>test</goal>
215-
</goals>
216-
<configuration>
217-
<classpathDependencyExcludes>
218-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-httpclient</classpathDependencyExclude>
219-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jena</classpathDependencyExclude>
220-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-rdf-legacy</classpathDependencyExclude>
221-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jsonb</classpathDependencyExclude>
222149
</classpathDependencyExcludes>
223150
</configuration>
224151
</execution>
225152
<execution>
226-
<id>okhttp-rdf4j-jsonb-test</id>
153+
<id>okhttp-rdf4j-test</id>
227154
<phase>test</phase>
228155
<goals>
229156
<goal>test</goal>
@@ -233,7 +160,6 @@
233160
<classpathDependencyExclude>com.inrupt.client:inrupt-client-httpclient</classpathDependencyExclude>
234161
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jena</classpathDependencyExclude>
235162
<classpathDependencyExclude>com.inrupt.client:inrupt-client-rdf-legacy</classpathDependencyExclude>
236-
<classpathDependencyExclude>com.inrupt.client:inrupt-client-jackson</classpathDependencyExclude>
237163
</classpathDependencyExcludes>
238164
</configuration>
239165
</execution>

‎solid/src/test/java/com/inrupt/client/solid/SolidClientTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
import com.inrupt.client.*;
2828
import com.inrupt.client.auth.Session;
29+
import com.inrupt.client.jackson.JacksonService;
2930
import com.inrupt.client.spi.JsonService;
3031
import com.inrupt.client.spi.RDFFactory;
31-
import com.inrupt.client.spi.ServiceProvider;
3232
import com.inrupt.client.util.URIBuilder;
3333
import com.inrupt.client.vocabulary.PIM;
3434

@@ -58,7 +58,7 @@ class SolidClientTest {
5858
private static final Map<String, String> config = new HashMap<>();
5959
private static final RDF rdf = RDFFactory.getInstance();
6060
private static final SolidClient client = SolidClient.getClient().session(Session.anonymous());
61-
private static final JsonService jsonService = ServiceProvider.getJsonService();
61+
private static final JsonService jsonService = new JacksonService();
6262

6363
@BeforeAll
6464
static void setup() {

0 commit comments

Comments
 (0)