[java-identity-provider] branch main updated: Remove inappropriate nullability constraints on primitive types
Ian Young
ian at iay.org.uk
Thu Dec 1 09:46:56 UTC 2022
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=61efe5c28fb17d2cc0eb334e03674b1a09f5b3c5
The following commit(s) were added to refs/heads/main by this push:
new 61efe5c28 Remove inappropriate nullability constraints on primitive types
61efe5c28 is described below
commit 61efe5c28fb17d2cc0eb334e03674b1a09f5b3c5
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Dec 1 09:46:53 2022 +0000
Remove inappropriate nullability constraints on primitive types
---
.../src/main/java/net/shibboleth/idp/authn/duo/impl/DuoSupport.java | 2 +-
.../net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java | 4 ++--
.../idp/authn/proxy/impl/InitializeProxyProfileRequestContext.java | 2 +-
.../src/main/java/net/shibboleth/idp/cli/impl/JarCheckArguments.java | 4 ++--
.../main/java/net/shibboleth/idp/cli/impl/ModuleManagerArguments.java | 4 ++--
.../idp/consent/logic/impl/CounterStorageKeyFunctionTest.java | 2 +-
.../src/main/java/net/shibboleth/idp/profile/ScriptedAction.java | 2 +-
.../idp/profile/config/AttributeResolvingProfileConfiguration.java | 4 +---
.../idp/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java | 2 +-
.../shibboleth/idp/saml/saml2/profile/impl/SAMLAuthnController.java | 4 ++--
.../main/java/net/shibboleth/idp/ui/csrf/BaseCSRFTokenPredicate.java | 4 ++--
.../shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListener.java | 4 ++--
12 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/duo/impl/DuoSupport.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/duo/impl/DuoSupport.java
index 8c7d69ab6..b2f958d71 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/duo/impl/DuoSupport.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/duo/impl/DuoSupport.java
@@ -129,7 +129,7 @@ public final class DuoSupport {
*
* @since 3.4.0
*/
- @Nonnull @NotEmpty public static void signRequest(@Nonnull final RequestBuilder request,
+ @NotEmpty public static void signRequest(@Nonnull final RequestBuilder request,
@Nonnull final DuoIntegration duo)
throws InvalidKeyException, NoSuchAlgorithmException, UnsupportedEncodingException {
final String ikey = duo.getIntegrationKey();
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java
index bae0eea31..def7a4635 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java
@@ -72,7 +72,7 @@ public class HTPasswdCredentialValidator extends AbstractUsernamePasswordCredent
@Nullable private Resource htPasswdResource;
/** File timestamp. */
- @Nullable private long lastModified;
+ private long lastModified;
/** In-memory copy of entries. */
@Nonnull @NonnullElements private final Map<String,String> credentialMap;
@@ -169,7 +169,7 @@ public class HTPasswdCredentialValidator extends AbstractUsernamePasswordCredent
*
* @return true iff the password matches
*/
- @Nonnull private boolean authenticate(@Nonnull final UsernamePasswordContext usernamePasswordContext,
+ private boolean authenticate(@Nonnull final UsernamePasswordContext usernamePasswordContext,
@Nonnull final String storedPassword) {
refreshCredentials();
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContext.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContext.java
index 0eb8f84c2..56eeb7e1b 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContext.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContext.java
@@ -109,7 +109,7 @@ public final class InitializeProxyProfileRequestContext extends AbstractProfileA
/** {@inheritDoc} */
@Override
- @Nonnull public void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
+ public void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
final ProfileRequestContext prc = profileRequestContextCreationStrategy.apply(profileRequestContext);
if (prc == null) {
diff --git a/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/JarCheckArguments.java b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/JarCheckArguments.java
index 94e8b14ca..86d44d657 100644
--- a/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/JarCheckArguments.java
+++ b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/JarCheckArguments.java
@@ -39,11 +39,11 @@ public class JarCheckArguments extends AbstractIdPHomeAwareCommandLineArguments
/** look inside the jars. */
@Parameter(names= {"-d", "--detailed"})
- @Nullable private boolean detailed;
+ private boolean detailed;
/** provide a sorted list. */
@Parameter(names= {"-l", "--list"})
- @Nullable private boolean list;
+ private boolean list;
/** {@inheritDoc} */
@Nonnull public Logger getLog() {
diff --git a/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerArguments.java b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerArguments.java
index aaf14d4fb..31864cdcc 100644
--- a/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerArguments.java
+++ b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerArguments.java
@@ -47,7 +47,7 @@ public class ModuleManagerArguments extends AbstractIdPHomeAwareCommandLineArgum
/** Brief info about installed modules. */
@Parameter(names= {"-l", "--list"})
- @Nullable private boolean list;
+ private boolean list;
/** Detailed info about installed module(s). */
@Parameter(names= {"-i", "--info"})
@@ -67,7 +67,7 @@ public class ModuleManagerArguments extends AbstractIdPHomeAwareCommandLineArgum
/** Clean when disabling. */
@Parameter(names= {"-f", "--clean"})
- @Nullable private boolean clean;
+ private boolean clean;
/** {@inheritDoc} */
@Nonnull public Logger getLog() {
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/CounterStorageKeyFunctionTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/CounterStorageKeyFunctionTest.java
index ba018d361..e3f7cd42e 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/CounterStorageKeyFunctionTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/CounterStorageKeyFunctionTest.java
@@ -66,7 +66,7 @@ public class CounterStorageKeyFunctionTest {
* @throws IOException if a storage service error occurs
* @throws InterruptedException if thread error occurs while sleeping
*/
- protected void createCounter(@Nonnull final String key, @Nonnull final int iterations) throws IOException,
+ protected void createCounter(@Nonnull final String key, final int iterations) throws IOException,
InterruptedException {
final String counterKey = key + ":" + UpdateCounter.COUNTER_KEY;
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java
index d15db7ec2..a7ddc3113 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java
@@ -94,7 +94,7 @@ public class ScriptedAction extends AbstractProfileAction {
*
* @param object the custom object
*/
- @Nullable public void setCustomObject(@Nullable final Object object) {
+ public void setCustomObject(@Nullable final Object object) {
checkSetterPreconditions();
scriptEvaluator.setCustomObject(object);
}
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AttributeResolvingProfileConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AttributeResolvingProfileConfiguration.java
index c2e404821..267d66cd4 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AttributeResolvingProfileConfiguration.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AttributeResolvingProfileConfiguration.java
@@ -21,8 +21,6 @@ import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
-import net.shibboleth.shared.annotation.constraint.NotEmpty;
-
/**
* {@link ProfileConfiguration} with optional resolution of attributes.
*
@@ -37,6 +35,6 @@ public interface AttributeResolvingProfileConfiguration extends ProfileConfigura
*
* @return true iff resolution should be done
*/
- @Nullable @NotEmpty boolean isResolveAttributes(@Nullable final ProfileRequestContext profileRequestContext);
+ boolean isResolveAttributes(@Nullable final ProfileRequestContext profileRequestContext);
}
\ No newline at end of file
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java
index d6df26320..21b076148 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java
@@ -568,7 +568,7 @@ public class BrowserSSOProfileConfiguration extends AbstractSAML2ArtifactAwarePr
*
* @return predicate used to determine if produced assertions may be delegated
*/
- @Nonnull public boolean isAllowDelegation(@Nullable final ProfileRequestContext profileRequestContext) {
+ public boolean isAllowDelegation(@Nullable final ProfileRequestContext profileRequestContext) {
return allowDelegationPredicate.test(profileRequestContext);
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/SAMLAuthnController.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/SAMLAuthnController.java
index 03774bd9c..6cbd8d42d 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/SAMLAuthnController.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/SAMLAuthnController.java
@@ -146,7 +146,7 @@ public class SAMLAuthnController extends AbstractInitializableComponent {
* @throws IOException if an I/O error occurs
*/
@GetMapping("/{binding}/SSO/start")
- @Nullable public void startSAML(@Nonnull final HttpServletRequest httpRequest,
+ public void startSAML(@Nonnull final HttpServletRequest httpRequest,
@Nonnull final HttpServletResponse httpResponse, @PathVariable @Nonnull @NotEmpty final String binding)
throws ExternalAuthenticationException, IOException {
@@ -221,7 +221,7 @@ public class SAMLAuthnController extends AbstractInitializableComponent {
* @throws IOException if an I/O error occurs
*/
@RequestMapping("/{binding}/SSO")
- @Nullable public void finishSAML(@Nonnull final HttpServletRequest httpRequest,
+ public void finishSAML(@Nonnull final HttpServletRequest httpRequest,
@Nonnull final HttpServletResponse httpResponse, @PathVariable @Nonnull @NotEmpty final String binding)
throws ExternalAuthenticationException, IOException {
diff --git a/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/BaseCSRFTokenPredicate.java b/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/BaseCSRFTokenPredicate.java
index 5d4a02e79..3f32c15b6 100644
--- a/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/BaseCSRFTokenPredicate.java
+++ b/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/BaseCSRFTokenPredicate.java
@@ -51,8 +51,8 @@ public abstract class BaseCSRFTokenPredicate {
* @param defaultValue a default value.
* @return the boolean value of the attribute on the state definition.
*/
- @Nonnull protected boolean safeGetBooleanStateAttribute(@Nullable final StateDefinition state,
- @Nullable final String attributeName, @Nonnull final boolean defaultValue) {
+ protected boolean safeGetBooleanStateAttribute(@Nullable final StateDefinition state,
+ @Nullable final String attributeName, final boolean defaultValue) {
//catch no state exists. Return default.
if (state==null) {
diff --git a/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListener.java b/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListener.java
index d58078e4d..5c41e945e 100644
--- a/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListener.java
+++ b/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListener.java
@@ -62,7 +62,7 @@ public class CSRFTokenFlowExecutionListener extends AbstractInitializableCompone
@NonnullAfterInit private Predicate<RequestContext> viewRequiresCSRFTokenPredicate;
/** Is this listener enabled? */
- @Nonnull private boolean enabled;
+ private boolean enabled;
/** The CSRF token manager for getting and validating tokens. */
@NonnullAfterInit private CSRFTokenManager csrfTokenManager;
@@ -78,7 +78,7 @@ public class CSRFTokenFlowExecutionListener extends AbstractInitializableCompone
*
* @param enable enabled/disable CSRF protection (default is {@literal false}).
*/
- public void setEnabled(@Nonnull final boolean enable) {
+ public void setEnabled(final boolean enable) {
checkSetterPreconditions();
enabled = enable;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list