[java-shib-shared] branch main updated: Null checking, more low hanging fruit
Rod Widdowson
rdw at steadingsoftware.com
Tue Jan 31 11:39:30 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-shib-shared.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=40fd44cac04eb1244db0a52c3d3bd248dc5014eb
The following commit(s) were added to refs/heads/main by this push:
new 40fd44ca Null checking, more low hanging fruit
40fd44ca is described below
commit 40fd44cac04eb1244db0a52c3d3bd248dc5014eb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jan 31 09:49:28 2023 +0000
Null checking, more low hanging fruit
---
.../shared/spring/httpclient/resource/FileBackedHTTPResource.java | 4 +++-
.../shibboleth/shared/httpclient/ContextHandlingHttpClient.java | 1 +
.../shared/httpclient/FileCachingHttpClientBuilder.java | 1 +
.../java/net/shibboleth/shared/servlet/HttpServletSupport.java | 2 +-
.../src/main/java/net/shibboleth/shared/security/DataSealer.java | 8 ++++++--
.../shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java | 1 +
.../net/shibboleth/shared/service/AbstractReloadableService.java | 1 +
7 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java
index 4f50c2c5..024f9ad5 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java
@@ -188,7 +188,9 @@ public class FileBackedHTTPResource extends HTTPResource {
final StringBuilder builder =
new StringBuilder("FileBackedHTTPResource [").append(urlAsString).append('|')
.append(backingResource.getDescription()).append(']');
- return builder.toString();
+ final String result = builder.toString();
+ assert result != null;
+ return result;
}
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
index 31638fb7..f4088842 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
@@ -128,6 +128,7 @@ class ContextHandlingHttpClient extends CloseableHttpClient {
HttpClientContext.adapt(context != null ? context : new BasicHttpContext());
final HttpUriRequest uriRequest = HttpUriRequest.class.isInstance(request)
? (HttpUriRequest)request : HttpRequestWrapper.wrap(request, target);
+ assert clientContext != null && uriRequest != null;
try {
invokeBefore(uriRequest, clientContext);
return httpClient.execute(target, request, clientContext);
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
index 342f33f2..438b3c1a 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
@@ -254,6 +254,7 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
final CloseableHttpClient client = (CloseableHttpClient) super.buildClient();
final ManagedHttpCacheStorage tempStorage = managedStorage;
// Null this out so we don't keep a reference, inhibiting garbage collection.
+ assert client != null && tempStorage != null;
managedStorage = null;
return new StorageManagingHttpClient(client, tempStorage, getMaintentanceTaskInterval().toMillis());
}
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/servlet/HttpServletSupport.java b/shib-networking/src/main/java/net/shibboleth/shared/servlet/HttpServletSupport.java
index a15cfdc7..79dc147c 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/servlet/HttpServletSupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/servlet/HttpServletSupport.java
@@ -161,7 +161,7 @@ public final class HttpServletSupport {
final String languages = StringSupport.trimOrNull(request.getHeader("Accept-Language"));
if (languages != null) {
try {
- return List.copyOf(LanguageRange.parse(languages));
+ return CollectionSupport.copyToList(LanguageRange.parse(languages));
} catch (final IllegalArgumentException e) {
LOG.warn("Could not parse provided languages '{}'", languages, e);
}
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
index f3e06649..69fde0e4 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
@@ -343,7 +343,9 @@ public class DataSealer extends AbstractInitializableComponent {
}
log.trace("Unwrapped data verified");
- return accumulator.toString();
+ final String result = accumulator.toString();
+ assert result != null;
+ return result;
} catch (final IOException e) {
log.error(e.getMessage());
throw new DataSealerException("Caught IOException unwrapping data", e);
@@ -439,7 +441,9 @@ public class DataSealer extends AbstractInitializableComponent {
.append(nodePrefix)
.append(new String(encoder.encode(finalByteStream.toByteArray()),
StandardCharsets.UTF_8));
- return builder.toString();
+ final String result = builder.toString();
+ assert result != null;
+ return result;
}
return new String(encoder.encode(finalByteStream.toByteArray()), StandardCharsets.UTF_8);
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
index 76409dcd..d0df1fa2 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
@@ -310,6 +310,7 @@ public class BasicKeystoreKeyStrategy extends AbstractInitializableComponent imp
@Nonnull public SecretKey getKey(@Nonnull @NotEmpty final String name) throws KeyException {
synchronized(this) {
if (defaultKey != null && name.equals(currentAlias)) {
+ assert defaultKey!=null;
return defaultKey;
}
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java b/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
index 363609d4..c4a6e601 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
@@ -78,6 +78,7 @@ public abstract class AbstractReloadableService<T> extends AbstractIdentifiableI
/** Constructor. */
public AbstractReloadableService() {
+ assert Duration.ZERO!=null;
reloadCheckDelay = Duration.ZERO;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list