From 0c789332f683a66f9db27c38a29ed4bc4b93f284 Mon Sep 17 00:00:00 2001 From: Luca Bassi Date: Wed, 6 Nov 2024 16:59:39 +0100 Subject: [PATCH] Remove non-idiomatic use of Objects.isNull This method exists to be used as a Predicate, filter(Objects::isNull) --- .../webdav/authn/AuthenticationUtils.java | 7 +-- .../storm/webdav/authn/PrincipalHelper.java | 3 +- .../storm/webdav/authz/VOMSPolicyService.java | 3 +- .../authz/pdp/PathAuthorizationPolicy.java | 3 +- .../WlcgStructuredPathAuthorizationPdp.java | 5 +-- .../authz/pdp/principal/AnonymousUser.java | 4 +- .../pdp/principal/AnyAuthenticatedUser.java | 4 +- .../authz/pdp/principal/AuthorityHolder.java | 4 +- .../util/StructuredPathScopeMatcher.java | 17 ++++--- .../authz/voters/FineGrainedAuthzVoter.java | 3 +- .../voters/FineGrainedCopyMoveAuthzVoter.java | 3 +- .../voters/WlcgScopeAuthzCopyMoveVoter.java | 3 +- .../authz/voters/WlcgScopeAuthzVoter.java | 3 +- .../config/validation/PrincipalValidator.java | 5 +-- .../metrics/StorageAreaStatsFilter.java | 3 +- .../webdav/milton/StoRMFileResource.java | 7 ++- .../GrantedAuthoritiesMapperSupport.java | 4 +- .../jwt/DefaultJwtTokenIssuer.java | 13 +++--- .../DefaultOidcConfigurationFetcher.java | 3 +- .../oauth/validator/AudienceValidator.java | 7 ++- .../oauth/validator/WlcgProfileValidator.java | 13 +++--- .../oidc/ClientRegistrationCacheLoader.java | 3 +- .../oidc/OidcGrantedAuthoritiesMapper.java | 4 +- .../webdav/redirector/RedirectFilter.java | 7 ++- .../webdav/server/DefaultPathResolver.java | 9 ++-- .../server/TLSServerConnectorBuilder.java | 44 +++++++++---------- .../webdav/server/servlet/MiltonFilter.java | 4 +- .../storm/webdav/spring/AppConfig.java | 3 +- .../tpc/StaticHostListLocalURLService.java | 4 +- .../webdav/tpc/TransferFilterSupport.java | 3 +- .../webdav/tpc/http/GetResponseHandler.java | 4 +- .../tpc/http/ResponseHandlerSupport.java | 6 +-- .../transfer/impl/TransferRequestImpl.java | 3 +- .../voms/VOMSSecurityContextBuilder.java | 7 ++- 34 files changed, 86 insertions(+), 132 deletions(-) diff --git a/src/main/java/org/italiangrid/storm/webdav/authn/AuthenticationUtils.java b/src/main/java/org/italiangrid/storm/webdav/authn/AuthenticationUtils.java index 0cd57a82..ae4b373b 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authn/AuthenticationUtils.java +++ b/src/main/java/org/italiangrid/storm/webdav/authn/AuthenticationUtils.java @@ -15,10 +15,7 @@ */ package org.italiangrid.storm.webdav.authn; -import static java.util.Objects.isNull; - import java.util.Map; -import java.util.Objects; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; @@ -33,7 +30,7 @@ private AuthenticationUtils() { } public static String getPalatableSubject(Authentication authn) { - if (Objects.isNull(authn) || authn instanceof AnonymousAuthenticationToken) { + if (authn == null || authn instanceof AnonymousAuthenticationToken) { return "Anonymous user"; } else if (authn instanceof OAuth2AuthenticationToken) { OAuth2AuthenticationToken authToken = (OAuth2AuthenticationToken) authn; @@ -41,7 +38,7 @@ public static String getPalatableSubject(Authentication authn) { String subjectIssuer = String.format("%s @ %s", attributes.get("sub"), attributes.get("iss")); - if (!isNull(attributes.get("name"))) { + if (attributes.get("name") != null) { return (String) attributes.get("name"); } diff --git a/src/main/java/org/italiangrid/storm/webdav/authn/PrincipalHelper.java b/src/main/java/org/italiangrid/storm/webdav/authn/PrincipalHelper.java index 41cb1cc4..d2f0de9b 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authn/PrincipalHelper.java +++ b/src/main/java/org/italiangrid/storm/webdav/authn/PrincipalHelper.java @@ -18,7 +18,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Map; -import java.util.Objects; import java.util.Optional; import org.italiangrid.storm.webdav.config.ServiceConfigurationProperties; @@ -43,7 +42,7 @@ public PrincipalHelper(ServiceConfigurationProperties config) throws MalformedUR } public String getPrincipalAsString(Authentication authn) { - if (Objects.isNull(authn) || authn instanceof AnonymousAuthenticationToken) { + if (authn == null || authn instanceof AnonymousAuthenticationToken) { return "anonymous"; } else if (authn instanceof OAuth2AuthenticationToken) { OAuth2AuthenticationToken authToken = (OAuth2AuthenticationToken) authn; diff --git a/src/main/java/org/italiangrid/storm/webdav/authz/VOMSPolicyService.java b/src/main/java/org/italiangrid/storm/webdav/authz/VOMSPolicyService.java index 1081737d..af579caf 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authz/VOMSPolicyService.java +++ b/src/main/java/org/italiangrid/storm/webdav/authz/VOMSPolicyService.java @@ -15,7 +15,6 @@ */ package org.italiangrid.storm.webdav.authz; -import static java.util.Objects.isNull; import static org.italiangrid.storm.webdav.authz.SAPermission.canRead; import static org.italiangrid.storm.webdav.authz.SAPermission.canWrite; @@ -49,7 +48,7 @@ public VOMSPolicyService(StorageAreaConfiguration saConfig) { voMapPerms = ArrayListMultimap.create(); for (StorageAreaInfo sa : saConfig.getStorageAreaInfo()) { - if (!isNull(sa.vos())) { + if (sa.vos() != null) { for (String vo : sa.vos()) { voPerms.put(vo, canRead(sa.name())); voPerms.put(vo, canWrite(sa.name())); diff --git a/src/main/java/org/italiangrid/storm/webdav/authz/pdp/PathAuthorizationPolicy.java b/src/main/java/org/italiangrid/storm/webdav/authz/pdp/PathAuthorizationPolicy.java index e5a2efc1..ba29d611 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authz/pdp/PathAuthorizationPolicy.java +++ b/src/main/java/org/italiangrid/storm/webdav/authz/pdp/PathAuthorizationPolicy.java @@ -16,7 +16,6 @@ package org.italiangrid.storm.webdav.authz.pdp; import java.util.List; -import java.util.Objects; import java.util.UUID; import javax.servlet.http.HttpServletRequest; @@ -158,7 +157,7 @@ public Builder withPrincipalMatcher(PrincipalMatcher m) { } public PathAuthorizationPolicy build() { - if (Objects.isNull(id)) { + if (id == null) { id = UUID.randomUUID().toString(); } return new PathAuthorizationPolicy(this); diff --git a/src/main/java/org/italiangrid/storm/webdav/authz/pdp/WlcgStructuredPathAuthorizationPdp.java b/src/main/java/org/italiangrid/storm/webdav/authz/pdp/WlcgStructuredPathAuthorizationPdp.java index 76db289c..6cb4d3ba 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authz/pdp/WlcgStructuredPathAuthorizationPdp.java +++ b/src/main/java/org/italiangrid/storm/webdav/authz/pdp/WlcgStructuredPathAuthorizationPdp.java @@ -16,7 +16,6 @@ package org.italiangrid.storm.webdav.authz.pdp; import static java.lang.String.format; -import static java.util.Objects.isNull; import static java.util.stream.Collectors.toList; import static org.italiangrid.storm.webdav.authz.pdp.PathAuthorizationResult.deny; import static org.italiangrid.storm.webdav.authz.pdp.PathAuthorizationResult.indeterminate; @@ -181,13 +180,13 @@ public PathAuthorizationResult authorizeRequest(PathAuthorizationRequest authzRe JwtAuthenticationToken jwtAuth = (JwtAuthenticationToken) authentication; - if (isNull(jwtAuth.getToken().getClaimAsString(SCOPE_CLAIM))) { + if (jwtAuth.getToken().getClaimAsString(SCOPE_CLAIM) == null) { return indeterminate(ERROR_INVALID_TOKEN_NO_SCOPE); } StorageAreaInfo sa = pathResolver.resolveStorageArea(requestPath); - if (isNull(sa)) { + if (sa == null) { return indeterminate(ERROR_SA_NOT_FOUND); } diff --git a/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AnonymousUser.java b/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AnonymousUser.java index dc13c395..74fbc843 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AnonymousUser.java +++ b/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AnonymousUser.java @@ -15,8 +15,6 @@ */ package org.italiangrid.storm.webdav.authz.pdp.principal; -import static java.util.Objects.isNull; - import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; @@ -24,7 +22,7 @@ public class AnonymousUser implements PrincipalMatcher { @Override public boolean matchesPrincipal(Authentication authentication) { - return isNull(authentication) || authentication instanceof AnonymousAuthenticationToken; + return authentication == null || authentication instanceof AnonymousAuthenticationToken; } @Override diff --git a/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AnyAuthenticatedUser.java b/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AnyAuthenticatedUser.java index 40d99d38..0e309924 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AnyAuthenticatedUser.java +++ b/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AnyAuthenticatedUser.java @@ -15,8 +15,6 @@ */ package org.italiangrid.storm.webdav.authz.pdp.principal; -import static java.util.Objects.isNull; - import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; @@ -24,7 +22,7 @@ public class AnyAuthenticatedUser implements PrincipalMatcher { @Override public boolean matchesPrincipal(Authentication authentication) { - return !isNull(authentication) && !(authentication instanceof AnonymousAuthenticationToken) + return authentication != null && !(authentication instanceof AnonymousAuthenticationToken) && authentication.isAuthenticated(); } diff --git a/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AuthorityHolder.java b/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AuthorityHolder.java index 4b572723..c71c7f3f 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AuthorityHolder.java +++ b/src/main/java/org/italiangrid/storm/webdav/authz/pdp/principal/AuthorityHolder.java @@ -15,8 +15,6 @@ */ package org.italiangrid.storm.webdav.authz.pdp.principal; -import java.util.Objects; - import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; @@ -39,7 +37,7 @@ public static AuthorityHolder fromAuthority(GrantedAuthority authority) { @Override public boolean matchesPrincipal(Authentication authentication) { - return !Objects.isNull(authentication) && authentication.getAuthorities() + return authentication != null && authentication.getAuthorities() .stream() .anyMatch(a -> a.getAuthority().equals(authority.getAuthority())); } diff --git a/src/main/java/org/italiangrid/storm/webdav/authz/util/StructuredPathScopeMatcher.java b/src/main/java/org/italiangrid/storm/webdav/authz/util/StructuredPathScopeMatcher.java index 853519b0..42017870 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authz/util/StructuredPathScopeMatcher.java +++ b/src/main/java/org/italiangrid/storm/webdav/authz/util/StructuredPathScopeMatcher.java @@ -17,7 +17,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; -import static java.util.Objects.nonNull; import java.nio.file.Path; import java.util.regex.Matcher; @@ -33,7 +32,7 @@ public class StructuredPathScopeMatcher implements ScopeMatcher { public static final Logger LOG = LoggerFactory.getLogger(StructuredPathScopeMatcher.class); private static final Pattern POINT_DIR_MATCHER = Pattern.compile("\\.\\./?"); - + private static final Character SEP = ':'; private static final String SEP_STR = SEP.toString(); @@ -55,24 +54,24 @@ private StructuredPathScopeMatcher(String prefix, String path) { @Override public boolean matchesScope(String scope) { - checkArgument(nonNull(scope), "scope must be non-null"); + checkArgument(scope != null, "scope must be non-null"); if (POINT_DIR_MATCHER.matcher(scope).find()) { throw new IllegalArgumentException("Scope contains relative path references"); } Matcher prefixMatcher = prefixMatchPattern.matcher(scope); - + boolean prefixMatches = prefixMatcher.find(); - + if (prefixMatches) { final String scopePath = scope.substring(prefix.length() + 1); - return pathMatchPattern.matcher(scopePath).matches(); + return pathMatchPattern.matcher(scopePath).matches(); } else { return false; } } - + public boolean matchesPath(String path) { return pathMatchPattern.matcher(path).matches(); } @@ -81,7 +80,7 @@ public boolean matchesPathIncludingParents(String path) { Path targetPath = Path.of(path); return this.path.startsWith(targetPath) || matchesPath(path); } - + public static StructuredPathScopeMatcher fromString(String scope) { final int sepIndex = scope.indexOf(SEP); final String prefix = scope.substring(0, sepIndex); @@ -143,5 +142,5 @@ public String getPrefix() { public String getPath() { return path.toString(); } - + } diff --git a/src/main/java/org/italiangrid/storm/webdav/authz/voters/FineGrainedAuthzVoter.java b/src/main/java/org/italiangrid/storm/webdav/authz/voters/FineGrainedAuthzVoter.java index a4f2ed04..b0cf0eb9 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authz/voters/FineGrainedAuthzVoter.java +++ b/src/main/java/org/italiangrid/storm/webdav/authz/voters/FineGrainedAuthzVoter.java @@ -15,7 +15,6 @@ */ package org.italiangrid.storm.webdav.authz.voters; -import static java.util.Objects.isNull; import static org.italiangrid.storm.webdav.authz.pdp.PathAuthorizationRequest.newAuthorizationRequest; import java.util.Collection; @@ -48,7 +47,7 @@ public int vote(Authentication authentication, FilterInvocation filter, final String requestPath = getRequestPath(filter.getHttpRequest()); StorageAreaInfo sa = resolver.resolveStorageArea(requestPath); - if (isNull(sa) || Boolean.FALSE.equals(sa.fineGrainedAuthzEnabled())) { + if (sa == null || Boolean.FALSE.equals(sa.fineGrainedAuthzEnabled())) { return ACCESS_ABSTAIN; } diff --git a/src/main/java/org/italiangrid/storm/webdav/authz/voters/FineGrainedCopyMoveAuthzVoter.java b/src/main/java/org/italiangrid/storm/webdav/authz/voters/FineGrainedCopyMoveAuthzVoter.java index 087244c1..914c4055 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authz/voters/FineGrainedCopyMoveAuthzVoter.java +++ b/src/main/java/org/italiangrid/storm/webdav/authz/voters/FineGrainedCopyMoveAuthzVoter.java @@ -15,7 +15,6 @@ */ package org.italiangrid.storm.webdav.authz.voters; -import static java.util.Objects.isNull; import static org.italiangrid.storm.webdav.server.servlet.WebDAVMethod.COPY; import static org.italiangrid.storm.webdav.server.servlet.WebDAVMethod.PUT; @@ -68,7 +67,7 @@ && requestHasRemoteDestinationHeader(filter.getRequest(), localUrlService)) { String destinationPath = getSanitizedPathFromUrl(destination); StorageAreaInfo sa = resolver.resolveStorageArea(destinationPath); - if (isNull(sa)) { + if (sa == null) { return ACCESS_ABSTAIN; } diff --git a/src/main/java/org/italiangrid/storm/webdav/authz/voters/WlcgScopeAuthzCopyMoveVoter.java b/src/main/java/org/italiangrid/storm/webdav/authz/voters/WlcgScopeAuthzCopyMoveVoter.java index 2017c71f..6584f1c3 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authz/voters/WlcgScopeAuthzCopyMoveVoter.java +++ b/src/main/java/org/italiangrid/storm/webdav/authz/voters/WlcgScopeAuthzCopyMoveVoter.java @@ -15,7 +15,6 @@ */ package org.italiangrid.storm.webdav.authz.voters; -import static java.util.Objects.isNull; import static org.italiangrid.storm.webdav.server.servlet.WebDAVMethod.COPY; import static org.italiangrid.storm.webdav.server.servlet.WebDAVMethod.PUT; @@ -74,7 +73,7 @@ && requestHasRemoteDestinationHeader(filter.getRequest(), localUrlService)) { String destinationPath = getSanitizedPathFromUrl(destination); StorageAreaInfo sa = resolver.resolveStorageArea(destinationPath); - if (isNull(sa)) { + if (sa == null) { return ACCESS_ABSTAIN; } diff --git a/src/main/java/org/italiangrid/storm/webdav/authz/voters/WlcgScopeAuthzVoter.java b/src/main/java/org/italiangrid/storm/webdav/authz/voters/WlcgScopeAuthzVoter.java index bf728ba8..68226c56 100644 --- a/src/main/java/org/italiangrid/storm/webdav/authz/voters/WlcgScopeAuthzVoter.java +++ b/src/main/java/org/italiangrid/storm/webdav/authz/voters/WlcgScopeAuthzVoter.java @@ -15,7 +15,6 @@ */ package org.italiangrid.storm.webdav.authz.voters; -import static java.util.Objects.isNull; import static org.italiangrid.storm.webdav.authz.pdp.PathAuthorizationRequest.newAuthorizationRequest; import java.util.Collection; @@ -53,7 +52,7 @@ public int vote(Authentication authentication, FilterInvocation filter, final String requestPath = getRequestPath(filter.getHttpRequest()); StorageAreaInfo sa = resolver.resolveStorageArea(requestPath); - if (isNull(sa)) { + if (sa == null) { return ACCESS_ABSTAIN; } diff --git a/src/main/java/org/italiangrid/storm/webdav/config/validation/PrincipalValidator.java b/src/main/java/org/italiangrid/storm/webdav/config/validation/PrincipalValidator.java index 7b191541..fc7d4dc0 100644 --- a/src/main/java/org/italiangrid/storm/webdav/config/validation/PrincipalValidator.java +++ b/src/main/java/org/italiangrid/storm/webdav/config/validation/PrincipalValidator.java @@ -17,7 +17,6 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static java.lang.String.format; -import static java.util.Objects.isNull; import static org.italiangrid.storm.webdav.config.FineGrainedAuthzPolicyProperties.PrincipalProperties.PrincipalType.FQAN; import static org.italiangrid.storm.webdav.config.FineGrainedAuthzPolicyProperties.PrincipalProperties.PrincipalType.JWT_GROUP; import static org.italiangrid.storm.webdav.config.FineGrainedAuthzPolicyProperties.PrincipalProperties.PrincipalType.JWT_SCOPE; @@ -63,8 +62,8 @@ public boolean isValid( ConstraintValidatorContext context) { Collection requiredArgs = REQUIRED_ARGS.get(value.getType()); - - if (isNull(requiredArgs) || requiredArgs.isEmpty()) { + + if (requiredArgs == null || requiredArgs.isEmpty()) { return true; } diff --git a/src/main/java/org/italiangrid/storm/webdav/metrics/StorageAreaStatsFilter.java b/src/main/java/org/italiangrid/storm/webdav/metrics/StorageAreaStatsFilter.java index 14e71ff3..2903f6b3 100644 --- a/src/main/java/org/italiangrid/storm/webdav/metrics/StorageAreaStatsFilter.java +++ b/src/main/java/org/italiangrid/storm/webdav/metrics/StorageAreaStatsFilter.java @@ -16,7 +16,6 @@ package org.italiangrid.storm.webdav.metrics; import static com.codahale.metrics.MetricRegistry.name; -import static java.util.Objects.isNull; import java.io.IOException; @@ -52,7 +51,7 @@ public StorageAreaStatsFilter(MetricRegistry registry, PathResolver resolver) { private void updateStats(HttpServletRequest request, HttpServletResponse response) { StorageAreaInfo sa = resolver.resolveStorageArea(getSerlvetRequestPath(request)); - if (!isNull(sa)) { + if (sa != null) { String prefix = name(SA_KEY, sa.name(), REQUESTS_KEY); registry.meter(prefix).mark(); if (response.getStatus() >= 400) { diff --git a/src/main/java/org/italiangrid/storm/webdav/milton/StoRMFileResource.java b/src/main/java/org/italiangrid/storm/webdav/milton/StoRMFileResource.java index aefbd19f..5b56cc2a 100644 --- a/src/main/java/org/italiangrid/storm/webdav/milton/StoRMFileResource.java +++ b/src/main/java/org/italiangrid/storm/webdav/milton/StoRMFileResource.java @@ -16,7 +16,6 @@ package org.italiangrid.storm.webdav.milton; import static io.milton.property.PropertySource.PropertyAccessibility.READ_ONLY; -import static java.util.Objects.isNull; import java.io.BufferedInputStream; import java.io.File; @@ -126,7 +125,7 @@ public void replaceContent(InputStream in, Long length) protected void validateRange(Range range) { long fileSize = getFile().length(); - if (isNull(range.getStart())) { + if (range.getStart() == null) { throw new StoRMWebDAVError("Invalid range: range start not defined"); } @@ -134,7 +133,7 @@ protected void validateRange(Range range) { throw new StoRMWebDAVError("Invalid range: range start out of bounds"); } - if (!isNull(range.getFinish()) && range.getFinish() > fileSize) { + if (range.getFinish() != null && range.getFinish() > fileSize) { throw new StoRMWebDAVError("Invalid range: range end out of bounds"); } } @@ -147,7 +146,7 @@ public void replacePartialContent(Range range, InputStream in) { long rangeStart = range.getStart(); long rangeEnd = getFile().length(); - if (!isNull(range.getFinish()) && range.getFinish() < rangeEnd) { + if (range.getFinish() != null && range.getFinish() < rangeEnd) { rangeEnd = range.getFinish(); } diff --git a/src/main/java/org/italiangrid/storm/webdav/oauth/GrantedAuthoritiesMapperSupport.java b/src/main/java/org/italiangrid/storm/webdav/oauth/GrantedAuthoritiesMapperSupport.java index c02d5f70..4014cc62 100644 --- a/src/main/java/org/italiangrid/storm/webdav/oauth/GrantedAuthoritiesMapperSupport.java +++ b/src/main/java/org/italiangrid/storm/webdav/oauth/GrantedAuthoritiesMapperSupport.java @@ -15,8 +15,6 @@ */ package org.italiangrid.storm.webdav.oauth; -import static java.util.Objects.isNull; - import java.util.Collection; import java.util.Set; @@ -48,7 +46,7 @@ public GrantedAuthoritiesMapperSupport(StorageAreaConfiguration conf, authzServerProperties = props.getAuthzServer(); for (StorageAreaInfo sa : conf.getStorageAreaInfo()) { - if (!isNull(sa.orgs())) { + if (sa.orgs() != null) { sa.orgs().forEach(i -> addSaGrantedAuthorities(sa, i)); } } diff --git a/src/main/java/org/italiangrid/storm/webdav/oauth/authzserver/jwt/DefaultJwtTokenIssuer.java b/src/main/java/org/italiangrid/storm/webdav/oauth/authzserver/jwt/DefaultJwtTokenIssuer.java index 8905ac39..53dd655f 100644 --- a/src/main/java/org/italiangrid/storm/webdav/oauth/authzserver/jwt/DefaultJwtTokenIssuer.java +++ b/src/main/java/org/italiangrid/storm/webdav/oauth/authzserver/jwt/DefaultJwtTokenIssuer.java @@ -15,7 +15,6 @@ */ package org.italiangrid.storm.webdav.oauth.authzserver.jwt; -import static java.util.Objects.isNull; import static java.util.stream.Collectors.toList; import java.time.Clock; @@ -98,7 +97,7 @@ protected Date computeTokenExpirationTimestamp(AccessTokenRequest request, Instant defaultExpiration = now.plusSeconds(properties.getMaxTokenLifetimeSec()); Instant expiration = defaultExpiration; - if (!isNull(request.getLifetime()) && request.getLifetime() > 0) { + if (request.getLifetime() != null && request.getLifetime() > 0) { requestedExpiration = Optional.of(now.plusSeconds(request.getLifetime())); } @@ -126,19 +125,19 @@ protected Date computeResourceTokenExpiration(ResourceAccessTokenRequest request public SignedJWT createAccessToken(AccessTokenRequest request, Authentication authentication) { Set tokenAuthorities = Sets.newHashSet(); - + Set saAuthorities = policyService.getSAPermissions(authentication); tokenAuthorities.addAll(saAuthorities); - + tokenAuthorities.addAll(authentication.getAuthorities()); - + JWTClaimsSet.Builder claimsSet = new JWTClaimsSet.Builder(); claimsSet.issuer(properties.getIssuer()); claimsSet.audience(properties.getIssuer()); claimsSet.subject(authentication.getName()); claimsSet.expirationTime(computeTokenExpirationTimestamp(request, authentication)); - + claimsSet.claim(CLAIM_AUTHORITIES, tokenAuthorities.stream().map(Object::toString).collect(toList())); @@ -162,7 +161,7 @@ public SignedJWT createResourceAccessToken(ResourceAccessTokenRequest request, claimsSet.subject(helper.getPrincipalAsString(authentication)); claimsSet.expirationTime(computeResourceTokenExpiration(request)); - + claimsSet.claim(PATH_CLAIM, request.getPath()); claimsSet.claim(PERMS_CLAIM, request.getPermission().name()); claimsSet.claim(ORIGIN_CLAIM, request.getOrigin()); diff --git a/src/main/java/org/italiangrid/storm/webdav/oauth/utils/DefaultOidcConfigurationFetcher.java b/src/main/java/org/italiangrid/storm/webdav/oauth/utils/DefaultOidcConfigurationFetcher.java index 4515bf3c..f1c1c1f3 100644 --- a/src/main/java/org/italiangrid/storm/webdav/oauth/utils/DefaultOidcConfigurationFetcher.java +++ b/src/main/java/org/italiangrid/storm/webdav/oauth/utils/DefaultOidcConfigurationFetcher.java @@ -21,7 +21,6 @@ import java.time.Duration; import java.util.Arrays; import java.util.Map; -import java.util.Objects; import org.italiangrid.storm.webdav.config.OAuthProperties; import org.slf4j.Logger; @@ -100,7 +99,7 @@ public Map loadConfigurationForIssuer(String issuer) { throw new OidcConfigurationResolutionError( format("Received status code: %s", response.getStatusCodeValue())); } - if (Objects.isNull(response.getBody())) { + if (response.getBody() == null) { throw new OidcConfigurationResolutionError("Received null body"); } metadataChecks(issuer, response.getBody()); diff --git a/src/main/java/org/italiangrid/storm/webdav/oauth/validator/AudienceValidator.java b/src/main/java/org/italiangrid/storm/webdav/oauth/validator/AudienceValidator.java index 1403f880..252d57cc 100644 --- a/src/main/java/org/italiangrid/storm/webdav/oauth/validator/AudienceValidator.java +++ b/src/main/java/org/italiangrid/storm/webdav/oauth/validator/AudienceValidator.java @@ -16,7 +16,6 @@ package org.italiangrid.storm.webdav.oauth.validator; import static com.google.common.base.Preconditions.checkArgument; -import static java.util.Objects.isNull; import java.util.Set; @@ -45,7 +44,7 @@ public class AudienceValidator implements OAuth2TokenValidator { OAuth2TokenValidatorResult.failure(INVALID_AUDIENCE_ERROR); public AudienceValidator(AuthorizationServer server) { - checkArgument(!isNull(server.getAudiences()), "null audiences"); + checkArgument(server.getAudiences() != null, "null audiences"); checkArgument(!server.getAudiences().isEmpty(), "empty audiences"); requiredAudiences.addAll(server.getAudiences()); } @@ -53,7 +52,7 @@ public AudienceValidator(AuthorizationServer server) { @Override public OAuth2TokenValidatorResult validate(Jwt jwt) { - if (isNull(jwt.getAudience()) || jwt.getAudience().isEmpty()) { + if (jwt.getAudience() == null || jwt.getAudience().isEmpty()) { return SUCCESS; } @@ -65,7 +64,7 @@ public OAuth2TokenValidatorResult validate(Jwt jwt) { LOG.debug("Audience check failed. Token audience: {}, local audience: {}", jwt.getAudience(), requiredAudiences); - + return INVALID_AUDIENCE; } diff --git a/src/main/java/org/italiangrid/storm/webdav/oauth/validator/WlcgProfileValidator.java b/src/main/java/org/italiangrid/storm/webdav/oauth/validator/WlcgProfileValidator.java index 5c55ffa0..2c59c7a0 100644 --- a/src/main/java/org/italiangrid/storm/webdav/oauth/validator/WlcgProfileValidator.java +++ b/src/main/java/org/italiangrid/storm/webdav/oauth/validator/WlcgProfileValidator.java @@ -16,7 +16,6 @@ package org.italiangrid.storm.webdav.oauth.validator; import static com.google.common.base.Strings.isNullOrEmpty; -import static java.util.Objects.isNull; import java.util.Collections; import java.util.Set; @@ -81,23 +80,23 @@ public OAuth2TokenValidatorResult validate(Jwt token) { return OAuth2TokenValidatorResult.failure(MISSING_SCOPE); } - if (isNull(token.getNotBefore())) { + if (token.getNotBefore() == null) { return OAuth2TokenValidatorResult.failure(MISSING_NBF); } - if (isNull(token.getExpiresAt())) { + if (token.getExpiresAt() == null) { return OAuth2TokenValidatorResult.failure(MISSING_EXP); } - if (isNull(token.getSubject())) { + if (token.getSubject() == null) { return OAuth2TokenValidatorResult.failure(MISSING_SUB); } - if (isNull(token.getAudience()) || token.getAudience().isEmpty()) { + if (token.getAudience() == null || token.getAudience().isEmpty()) { return OAuth2TokenValidatorResult.failure(MISSING_AUD); } - - if (isNull(token.getId())) { + + if (token.getId() == null) { return OAuth2TokenValidatorResult.failure(MISSING_JTI); } diff --git a/src/main/java/org/italiangrid/storm/webdav/oidc/ClientRegistrationCacheLoader.java b/src/main/java/org/italiangrid/storm/webdav/oidc/ClientRegistrationCacheLoader.java index 61321d47..46bf17ac 100644 --- a/src/main/java/org/italiangrid/storm/webdav/oidc/ClientRegistrationCacheLoader.java +++ b/src/main/java/org/italiangrid/storm/webdav/oidc/ClientRegistrationCacheLoader.java @@ -16,7 +16,6 @@ package org.italiangrid.storm.webdav.oidc; import static java.lang.String.format; -import static java.util.Objects.isNull; import java.util.Map; import java.util.concurrent.ExecutorService; @@ -111,7 +110,7 @@ private static Builder getBuilder(Builder builder, Provider provider) { public ClientRegistration load(String key) throws Exception { OAuth2ClientProperties.Registration reg = clientProperties.getRegistration().get(key); - if (isNull(reg)) { + if (reg == null) { return null; } diff --git a/src/main/java/org/italiangrid/storm/webdav/oidc/OidcGrantedAuthoritiesMapper.java b/src/main/java/org/italiangrid/storm/webdav/oidc/OidcGrantedAuthoritiesMapper.java index 6c5629b3..d30036ba 100644 --- a/src/main/java/org/italiangrid/storm/webdav/oidc/OidcGrantedAuthoritiesMapper.java +++ b/src/main/java/org/italiangrid/storm/webdav/oidc/OidcGrantedAuthoritiesMapper.java @@ -15,8 +15,6 @@ */ package org.italiangrid.storm.webdav.oidc; -import static java.util.Objects.isNull; - import java.util.Collection; import java.util.List; import java.util.Set; @@ -51,7 +49,7 @@ protected Collection grantGroupAuthorities(OidcUserAuthority u for (String groupClaimName : OAUTH_GROUP_CLAIM_NAMES) { List groups = userAuthority.getIdToken().getClaimAsStringList(groupClaimName); - if (!isNull(groups)) { + if (groups != null) { groups.stream() .map(g -> new JwtGroupAuthority(idTokenIssuer, g)) .forEach(groupAuthorities::add); diff --git a/src/main/java/org/italiangrid/storm/webdav/redirector/RedirectFilter.java b/src/main/java/org/italiangrid/storm/webdav/redirector/RedirectFilter.java index 12390af5..5b7d2ab8 100644 --- a/src/main/java/org/italiangrid/storm/webdav/redirector/RedirectFilter.java +++ b/src/main/java/org/italiangrid/storm/webdav/redirector/RedirectFilter.java @@ -17,7 +17,6 @@ import java.io.IOException; import java.nio.file.Path; -import java.util.Objects; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -60,7 +59,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha SecurityContext context = resolveSecurityContext(); if (isRedirectable(req)) { - + res.setHeader(LOCATION, service.buildRedirect(context.getAuthentication(), req, res)); res.setStatus(HttpServletResponse.SC_TEMPORARY_REDIRECT); @@ -73,7 +72,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha private SecurityContext resolveSecurityContext() { SecurityContext context = SecurityContextHolder.getContext(); - if (Objects.isNull(context)) { + if (context == null) { throw new RedirectError("Failed to enstabilish a valid security context"); } @@ -103,7 +102,7 @@ private boolean requestedResourceExistsAndIsAFile(HttpServletRequest req) { String path = getSerlvetRequestPath(req); Path p = pathResolver.getPath(path); - if (Objects.isNull(p)) { + if (p == null) { return false; } diff --git a/src/main/java/org/italiangrid/storm/webdav/server/DefaultPathResolver.java b/src/main/java/org/italiangrid/storm/webdav/server/DefaultPathResolver.java index c56d551d..a4415917 100644 --- a/src/main/java/org/italiangrid/storm/webdav/server/DefaultPathResolver.java +++ b/src/main/java/org/italiangrid/storm/webdav/server/DefaultPathResolver.java @@ -16,7 +16,6 @@ package org.italiangrid.storm.webdav.server; import static java.nio.file.LinkOption.NOFOLLOW_LINKS; -import static java.util.Objects.isNull; import java.nio.file.Files; import java.nio.file.Path; @@ -67,13 +66,13 @@ protected String stripContextPath(String context, String path) { @Override public String resolvePath(String pathInContext) { - if (isNull(pathInContext)) { + if (pathInContext == null) { return null; } Path p = getPath(pathInContext); - if (!isNull(p)) { + if (p != null) { return p.toString(); } @@ -102,7 +101,7 @@ public StorageAreaInfo resolveStorageArea(String pathInContext) { public boolean pathExists(String pathInContext) { String resolvedPath = resolvePath(pathInContext); - if (isNull(resolvedPath)) { + if (resolvedPath == null) { return false; } @@ -112,7 +111,7 @@ public boolean pathExists(String pathInContext) { @Override public Path getPath(String pathInContext) { - if (isNull(pathInContext)) { + if (pathInContext == null) { return null; } diff --git a/src/main/java/org/italiangrid/storm/webdav/server/TLSServerConnectorBuilder.java b/src/main/java/org/italiangrid/storm/webdav/server/TLSServerConnectorBuilder.java index 67379b58..5d735f3d 100644 --- a/src/main/java/org/italiangrid/storm/webdav/server/TLSServerConnectorBuilder.java +++ b/src/main/java/org/italiangrid/storm/webdav/server/TLSServerConnectorBuilder.java @@ -15,8 +15,6 @@ */ package org.italiangrid.storm.webdav.server; -import static java.util.Objects.isNull; - import java.io.File; import java.io.IOException; import java.security.KeyManagementException; @@ -56,7 +54,7 @@ /** * A builder that configures a Jetty server TLS connector integrated with CANL * {@link X509CertChainValidatorExt} certificate validation services. - * + * */ public class TLSServerConnectorBuilder { @@ -193,7 +191,7 @@ public class TLSServerConnectorBuilder { /** * Returns an instance of the {@link TLSServerConnectorBuilder}. - * + * * @param s the {@link Server} for which the connector is being created * @param certificateValidator a {@link X509CertChainValidatorExt} used to validate certificates * @return an instance of the {@link TLSServerConnectorBuilder} @@ -206,7 +204,7 @@ public static TLSServerConnectorBuilder instance(Server s, /** * Private ctor. - * + * * @param s the {@link Server} for which the connector is being created * @param certificateValidator a {@link X509CertChainValidatorExt} used to validate certificates */ @@ -254,7 +252,7 @@ private void loadCredentials() { /** * Configures SSL session parameters for the jetty {@link SslContextFactory}. - * + * * @param contextFactory the {@link SslContextFactory} being configured */ private void configureContextFactory(SslContextFactory.Server contextFactory) { @@ -296,7 +294,7 @@ private void configureContextFactory(SslContextFactory.Server contextFactory) { /** * Builds a default {@link HttpConfiguration} for the TLS-enabled connector being created - * + * * @return the default {@link HttpConfiguration} */ private HttpConfiguration defaultHttpConfiguration() { @@ -323,7 +321,7 @@ private HttpConfiguration defaultHttpConfiguration() { /** * Gives access to the {@link HttpConfiguration} used for the TLS-enabled connector being created. * If the configuration is not set, it creates it using {@link #defaultHttpConfiguration()}. - * + * * @return the {@link HttpConfiguration} being used for the TLS-enabled connector. */ public HttpConfiguration httpConfiguration() { @@ -338,7 +336,7 @@ public HttpConfiguration httpConfiguration() { /** * Sets the port for the connector being created. - * + * * @param port the port for the connector * @return this builder */ @@ -350,7 +348,7 @@ public TLSServerConnectorBuilder withPort(int port) { /** * Sets the certificate file for the connector being created. - * + * * @param certificateFile the certificate file * @return this builder */ @@ -362,7 +360,7 @@ public TLSServerConnectorBuilder withCertificateFile(String certificateFile) { /** * Sets the certificate key file for the connector being created. - * + * * @param certificateKeyFile the certificate key file * @return this builder */ @@ -374,7 +372,7 @@ public TLSServerConnectorBuilder withCertificateKeyFile(String certificateKeyFil /** * The the certificate key password for the connector being built - * + * * @param certificateKeyPassword the certificate key password * @return this builder */ @@ -387,7 +385,7 @@ public TLSServerConnectorBuilder withCertificateKeyPassword(char[] certificateKe /** * Sets the {@link SslContextFactory#setNeedClientAuth(boolean)} parameter for the connector being * created. - * + * * @param needClientAuth true if client authentication is required * @return this builder */ @@ -400,7 +398,7 @@ public TLSServerConnectorBuilder withNeedClientAuth(boolean needClientAuth) { /** * Sets the {@link SslContextFactory#setWantClientAuth(boolean)} parameter for the connector being * created. - * + * * @param wantClientAuth true if client authentication is wanted * @return this builder */ @@ -412,7 +410,7 @@ public TLSServerConnectorBuilder withWantClientAuth(boolean wantClientAuth) { /** * Sets SSL included protocols. See {@link SslContextFactory#setIncludeProtocols(String...)}. - * + * * @param includeProtocols the array of included protocol names * @return this builder */ @@ -424,7 +422,7 @@ public TLSServerConnectorBuilder withIncludeProtocols(String... includeProtocols /** * Sets SSL excluded protocols. See {@link SslContextFactory#setExcludeProtocols(String...)}. - * + * * @param excludeProtocols the array of excluded protocol names * @return this builder */ @@ -436,7 +434,7 @@ public TLSServerConnectorBuilder withExcludeProtocols(String... excludeProtocols /** * Sets the SSL included cipher suites. - * + * * @param includeCipherSuites the array of included cipher suites. * @return this builder */ @@ -448,7 +446,7 @@ public TLSServerConnectorBuilder withIncludeCipherSuites(String... includeCipher /** * Sets the SSL ecluded cipher suites. - * + * * @param excludeCipherSuites the array of excluded cipher suites. * @return this builder */ @@ -460,7 +458,7 @@ public TLSServerConnectorBuilder withExcludeCipherSuites(String... excludeCipher /** * Sets the {@link HttpConfiguration} for the connector being built. - * + * * @param conf the {@link HttpConfiguration} to use * @return this builder */ @@ -472,7 +470,7 @@ public TLSServerConnectorBuilder withHttpConfiguration(HttpConfiguration conf) { /** * Sets the {@link KeyManager} for the connector being built. - * + * * @param km the {@link KeyManager} to use * @return this builder */ @@ -539,7 +537,7 @@ private SSLContext buildSSLContext() { if (useConscrypt) { - if (isNull(Security.getProvider(CONSCRYPT_PROVIDER))) { + if (Security.getProvider(CONSCRYPT_PROVIDER) == null) { Security.addProvider(new OpenSSLProvider()); } @@ -564,7 +562,7 @@ private SSLContext buildSSLContext() { /** * Builds a {@link ServerConnector} based on the {@link TLSServerConnectorBuilder} parameters - * + * * @return a {@link ServerConnector} */ public ServerConnector build() { @@ -637,7 +635,7 @@ private ALPNServerConnectionFactory createAlpnProtocolFactory( /** * Checks that file exists and is readable. - * + * * @param f the {@link File} to be checked * @param prefix A prefix string for the error message, in case the file does not exist and is not * readable diff --git a/src/main/java/org/italiangrid/storm/webdav/server/servlet/MiltonFilter.java b/src/main/java/org/italiangrid/storm/webdav/server/servlet/MiltonFilter.java index 251f6d54..54cd7762 100644 --- a/src/main/java/org/italiangrid/storm/webdav/server/servlet/MiltonFilter.java +++ b/src/main/java/org/italiangrid/storm/webdav/server/servlet/MiltonFilter.java @@ -15,8 +15,6 @@ */ package org.italiangrid.storm.webdav.server.servlet; -import static java.util.Objects.isNull; - import java.io.IOException; import java.util.Set; @@ -101,7 +99,7 @@ public void init(FilterConfig config) throws ServletException { servletContext = config.getServletContext(); - if (isNull(miltonHTTPManager)) { + if (miltonHTTPManager == null) { initMiltonHTTPManager(servletContext); } diff --git a/src/main/java/org/italiangrid/storm/webdav/spring/AppConfig.java b/src/main/java/org/italiangrid/storm/webdav/spring/AppConfig.java index 5c502f86..46dccccb 100644 --- a/src/main/java/org/italiangrid/storm/webdav/spring/AppConfig.java +++ b/src/main/java/org/italiangrid/storm/webdav/spring/AppConfig.java @@ -15,7 +15,6 @@ */ package org.italiangrid.storm.webdav.spring; -import static java.util.Objects.isNull; import static org.italiangrid.storm.webdav.server.TLSServerConnectorBuilder.CONSCRYPT_PROVIDER; import java.io.IOException; @@ -247,7 +246,7 @@ HttpClientConnectionManager tpcClientConnectionManager(ThirdPartyCopyProperties SSLContext ctx; if (props.isUseConscrypt()) { - if (isNull(Security.getProvider(CONSCRYPT_PROVIDER))) { + if (Security.getProvider(CONSCRYPT_PROVIDER) == null) { Security.addProvider(new OpenSSLProvider()); } ctx = SSLContext.getInstance(props.getTlsProtocol(), CONSCRYPT_PROVIDER); diff --git a/src/main/java/org/italiangrid/storm/webdav/tpc/StaticHostListLocalURLService.java b/src/main/java/org/italiangrid/storm/webdav/tpc/StaticHostListLocalURLService.java index 10240e45..d405041f 100644 --- a/src/main/java/org/italiangrid/storm/webdav/tpc/StaticHostListLocalURLService.java +++ b/src/main/java/org/italiangrid/storm/webdav/tpc/StaticHostListLocalURLService.java @@ -17,7 +17,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static java.util.Objects.isNull; import java.net.URI; import java.net.URISyntaxException; @@ -42,8 +41,7 @@ public boolean isLocalURL(String url) { URI uri = new URI(url); - if (isNull(uri.getScheme()) - || (!isNull(uri.getHost()) && uri.getHost().equals("localhost"))) { + if (uri.getScheme() == null || (uri.getHost() != null && uri.getHost().equals("localhost"))) { return true; } diff --git a/src/main/java/org/italiangrid/storm/webdav/tpc/TransferFilterSupport.java b/src/main/java/org/italiangrid/storm/webdav/tpc/TransferFilterSupport.java index 54046d8e..448f09d1 100644 --- a/src/main/java/org/italiangrid/storm/webdav/tpc/TransferFilterSupport.java +++ b/src/main/java/org/italiangrid/storm/webdav/tpc/TransferFilterSupport.java @@ -16,7 +16,6 @@ package org.italiangrid.storm.webdav.tpc; import static java.lang.String.format; -import static java.util.Objects.isNull; import static javax.servlet.http.HttpServletResponse.SC_PRECONDITION_FAILED; import static org.springframework.http.HttpStatus.BAD_REQUEST; @@ -131,7 +130,7 @@ protected boolean overwriteRequested(HttpServletRequest request) { protected boolean isSupportedTransferURI(URI uri) { - return SUPPORTED_PROTOCOLS.contains(uri.getScheme()) && !isNull(uri.getPath()); + return SUPPORTED_PROTOCOLS.contains(uri.getScheme()) && uri.getPath() != null; } protected boolean validTransferURI(String xferUri) { diff --git a/src/main/java/org/italiangrid/storm/webdav/tpc/http/GetResponseHandler.java b/src/main/java/org/italiangrid/storm/webdav/tpc/http/GetResponseHandler.java index 1a2941d6..98b16e66 100644 --- a/src/main/java/org/italiangrid/storm/webdav/tpc/http/GetResponseHandler.java +++ b/src/main/java/org/italiangrid/storm/webdav/tpc/http/GetResponseHandler.java @@ -15,8 +15,6 @@ */ package org.italiangrid.storm.webdav.tpc.http; -import static java.util.Objects.isNull; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -70,7 +68,7 @@ private void writeEntityToStream(HttpEntity entity, OutputStream os) final InputStream inStream = entity.getContent(); - if (!isNull(inStream)) { + if (inStream != null) { try { int l; final byte[] tmp = new byte[bufferSize]; diff --git a/src/main/java/org/italiangrid/storm/webdav/tpc/http/ResponseHandlerSupport.java b/src/main/java/org/italiangrid/storm/webdav/tpc/http/ResponseHandlerSupport.java index 759cd55d..7ef4bb7d 100644 --- a/src/main/java/org/italiangrid/storm/webdav/tpc/http/ResponseHandlerSupport.java +++ b/src/main/java/org/italiangrid/storm/webdav/tpc/http/ResponseHandlerSupport.java @@ -15,8 +15,6 @@ */ package org.italiangrid.storm.webdav.tpc.http; -import static java.util.Objects.isNull; - import java.util.Map; import org.apache.http.StatusLine; @@ -30,9 +28,9 @@ public abstract class ResponseHandlerSupport { protected ResponseHandlerSupport(Map mdcContextMap) { this.mdcContextMap = mdcContextMap; } - + protected void setupMDC() { - if (!isNull(mdcContextMap)) { + if (mdcContextMap != null) { MDC.setContextMap(mdcContextMap); } } diff --git a/src/main/java/org/italiangrid/storm/webdav/tpc/transfer/impl/TransferRequestImpl.java b/src/main/java/org/italiangrid/storm/webdav/tpc/transfer/impl/TransferRequestImpl.java index 737ac992..67100293 100644 --- a/src/main/java/org/italiangrid/storm/webdav/tpc/transfer/impl/TransferRequestImpl.java +++ b/src/main/java/org/italiangrid/storm/webdav/tpc/transfer/impl/TransferRequestImpl.java @@ -18,7 +18,6 @@ import java.net.URI; import java.time.Duration; import java.time.Instant; -import java.util.Objects; import java.util.Optional; import org.italiangrid.storm.webdav.scitag.SciTag; @@ -165,7 +164,7 @@ public long bytesTransferred() { @Override public Duration duration() { - if (Objects.isNull(startTime) || Objects.isNull(endTime)) { + if (startTime == null || endTime == null) { LOG.debug("Duration called before end of trasnfer, will return ZERO"); return Duration.ZERO; } diff --git a/src/test/java/org/italiangrid/storm/webdav/test/utils/voms/VOMSSecurityContextBuilder.java b/src/test/java/org/italiangrid/storm/webdav/test/utils/voms/VOMSSecurityContextBuilder.java index 892ee721..66fc1e19 100644 --- a/src/test/java/org/italiangrid/storm/webdav/test/utils/voms/VOMSSecurityContextBuilder.java +++ b/src/test/java/org/italiangrid/storm/webdav/test/utils/voms/VOMSSecurityContextBuilder.java @@ -15,7 +15,6 @@ */ package org.italiangrid.storm.webdav.test.utils.voms; -import static java.util.Objects.isNull; import static org.mockito.Mockito.when; import java.time.Clock; @@ -64,7 +63,7 @@ public VOMSSecurityContextBuilder subject(String s) { public VOMSSecurityContextBuilder vos(String... vos) { for (String vo : vos) { - if (!isNull(authorities)) { + if (authorities != null) { authorities.add(new VOMSVOAuthority(vo)); } else { @@ -76,7 +75,7 @@ public VOMSSecurityContextBuilder vos(String... vos) { public VOMSSecurityContextBuilder saReadPermissions(String... sas) { for (String sa : sas) { - if (!isNull(authorities)) { + if (authorities != null) { authorities.add(SAPermission.canRead(sa)); } else { authorities = Lists.newArrayList(SAPermission.canRead(sa)); @@ -87,7 +86,7 @@ public VOMSSecurityContextBuilder saReadPermissions(String... sas) { public VOMSSecurityContextBuilder saWritePermissions(String... sas) { for (String sa : sas) { - if (!isNull(authorities)) { + if (authorities != null) { authorities.add(SAPermission.canWrite(sa)); } else { authorities = Lists.newArrayList(SAPermission.canWrite(sa));