Skip to content

Commit 321dac4

Browse files
authored
JCL-341: Omit Accept Turtle header when reading non-RDF resources (#445)
1 parent 5b09f13 commit 321dac4

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

solid/src/main/java/com/inrupt/client/solid/SolidClient.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ public <T extends Resource> CompletionStage<T> read(final URI identifier, final
123123
decorateHeaders(builder, defaultHeaders);
124124
decorateHeaders(builder, headers);
125125

126-
builder.setHeader(ACCEPT, TEXT_TURTLE);
126+
if (RDFSource.class.isAssignableFrom(clazz)) {
127+
builder.setHeader(ACCEPT, TEXT_TURTLE);
128+
}
127129

128130
defaultHeaders.firstValue(USER_AGENT).ifPresent(agent -> builder.setHeader(USER_AGENT, agent));
129131
headers.firstValue(USER_AGENT).ifPresent(agent -> builder.setHeader(USER_AGENT, agent));

solid/src/test/java/com/inrupt/client/solid/SolidMockHttpService.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,14 @@ private void setupMocks() {
159159
.withStatus(204)));
160160

161161
wireMockServer.stubFor(get(urlEqualTo("/binary"))
162+
.atPriority(1)
163+
.withHeader("User-Agent", equalTo(USER_AGENT))
164+
.withHeader("Accept", containing("text/turtle"))
165+
.willReturn(aResponse()
166+
.withStatus(406)));
167+
168+
wireMockServer.stubFor(get(urlEqualTo("/binary"))
169+
.atPriority(2)
162170
.withHeader("User-Agent", equalTo(USER_AGENT))
163171
.willReturn(aResponse()
164172
.withStatus(200)

0 commit comments

Comments
 (0)