Skip to content

Commit 6d9af74

Browse files
authored
JCL-322: added a Objects.requireNonNull (#402)
* added a Objects.requireNonNull * moved session null check to the constructor * added http client null check to the constructor
1 parent 6acfe3a commit 6d9af74

File tree

6 files changed

+14
-1
lines changed

6 files changed

+14
-1
lines changed

access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrantClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ private AccessGrantClient(final Client client, final AccessGrantConfiguration co
133133
* @return the scoped access grant client
134134
*/
135135
public AccessGrantClient session(final Session session) {
136+
Objects.requireNonNull(session, "Session may not be null!");
136137
return new AccessGrantClient(client.session(session), config);
137138
}
138139

core/src/main/java/com/inrupt/client/core/DefaultClient.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.inrupt.client.spi.ServiceProvider;
3333

3434
import java.util.List;
35+
import java.util.Objects;
3536
import java.util.concurrent.CompletableFuture;
3637
import java.util.concurrent.CompletionStage;
3738

@@ -57,6 +58,8 @@ public final class DefaultClient implements Client {
5758
}
5859

5960
DefaultClient(final HttpService httpClient, final Session session) {
61+
Objects.requireNonNull(httpClient, "Http client may not be null!");
62+
Objects.requireNonNull(session, "Session may not be null!");
6063
this.httpClient = httpClient;
6164
this.clientSession = session;
6265
}

core/src/test/java/com/inrupt/client/core/DefaultClientTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,12 @@ void testOfStringPublisherUmaAnonSession() throws IOException, InterruptedExcept
368368
assertEquals(401, response.statusCode());
369369
}
370370

371+
@Test
372+
void testNullSession() {
373+
assertThrows(NullPointerException.class, () ->
374+
client.session(null));
375+
}
376+
371377
@Test
372378
void testUmaSessionExpiredIdToken() throws Exception {
373379
final Map<String, Object> claims = new HashMap<>();

openid/src/main/java/com/inrupt/client/openid/OpenIdSession.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public static Session ofClientCredentials(final URI issuer, final String clientI
144144
* @param clientId the client id value
145145
* @param clientSecret the client secret value
146146
* @param authMethod the authentication mechanism (e.g. {@code client_secret_post} or {@code client_secret_basic})
147-
* @param config the ID token verifification config
147+
* @param config the ID token verification config
148148
* @return the session
149149
*/
150150
public static Session ofClientCredentials(final OpenIdProvider provider,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public class SolidClient {
7878
* @return a session-scoped client
7979
*/
8080
public SolidClient session(final Session session) {
81+
Objects.requireNonNull(session, "Session may not be null!");
8182
return new SolidClient(client.session(session), defaultHeaders, fetchAfterWrite);
8283
}
8384

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.inrupt.client.auth.Session;
3030

3131
import java.net.URI;
32+
import java.util.Objects;
3233
import java.util.concurrent.CompletionException;
3334
import java.util.concurrent.CompletionStage;
3435

@@ -54,6 +55,7 @@ public class SolidSyncClient {
5455
* @return a session-scoped client
5556
*/
5657
public SolidSyncClient session(final Session session) {
58+
Objects.requireNonNull(session, "Session may not be null!");
5759
return new SolidSyncClient(client.session(session));
5860
}
5961

0 commit comments

Comments
 (0)