[java-shib-attribute] branch main updated: Remove inapplicable nullability annotations
Ian Young
ian at iay.org.uk
Thu Nov 10 11:45:26 UTC 2022
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=22b855eff2f539275e0d8b9b7aa66a3c3e865533
The following commit(s) were added to refs/heads/main by this push:
new 22b855eff Remove inapplicable nullability annotations
22b855eff is described below
commit 22b855eff2f539275e0d8b9b7aa66a3c3e865533
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Nov 10 11:45:23 2022 +0000
Remove inapplicable nullability annotations
---
.../idp/attribute/filter/matcher/impl/ScriptedMatcher.java | 2 +-
.../idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java | 2 +-
.../shibboleth/idp/attribute/resolver/PluginDependencySupport.java | 6 +++---
.../shibboleth/idp/attribute/resolver/ResolvedDataConnector.java | 2 +-
.../idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java | 4 ++--
.../idp/attribute/resolver/dc/impl/ScriptedDataConnector.java | 4 ++--
.../attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java | 2 +-
.../resolver/spring/impl/AbstractResolverPluginFactoryBean.java | 2 +-
.../resolver/impl/SAML1NameIdentifierAttributeDefinition.java | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
index 0ef3911d6..93c102e50 100644
--- a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
+++ b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
@@ -125,7 +125,7 @@ public class ScriptedMatcher extends AbstractIdentifiableInitializableComponent
*
* @since 5.0.0
*/
- @Nullable public void setScriptContextExtenders(
+ public void setScriptContextExtenders(
@Nullable @NonnullElements final Collection<FilterScriptContextExtender> extenders) {
checkSetterPreconditions();
diff --git a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
index 8363c030b..6502eefbb 100644
--- a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
+++ b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
@@ -119,7 +119,7 @@ public class ScriptedPolicyRule extends AbstractIdentifiableInitializableCompone
*
* @since 5.0.0
*/
- @Nullable public void setScriptContextExtenders(
+ public void setScriptContextExtenders(
@Nullable @NonnullElements final Collection<FilterScriptContextExtender> extenders) {
checkSetterPreconditions();
if (extenders != null) {
diff --git a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java
index 8ac12f29f..c18b10523 100644
--- a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java
+++ b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java
@@ -192,7 +192,7 @@ public final class PluginDependencySupport {
* @param sources the source attributes
* @param target current set attribute values
*/
- @Nonnull private static void mergeAttributes(@Nonnull final Map<String, IdPAttribute> sources,
+ private static void mergeAttributes(@Nonnull final Map<String, IdPAttribute> sources,
@Nullable final Map<String, List<IdPAttributeValue>> target) {
for (final IdPAttribute source : sources.values()) {
if (source == null) {
@@ -209,7 +209,7 @@ public final class PluginDependencySupport {
* @param source the source attribute
* @param target current set attribute values
*/
- @Nonnull private static void addAttribute(@Nullable final IdPAttribute source,
+ private static void addAttribute(@Nullable final IdPAttribute source,
@Nullable final Map<String, List<IdPAttributeValue>> target) {
if (source == null) {
return;
@@ -229,7 +229,7 @@ public final class PluginDependencySupport {
* @param source the source attribute
* @param target current set attribute values
*/
- @Nonnull private static void mergeAttributeValues(@Nullable final IdPAttribute source,
+ private static void mergeAttributeValues(@Nullable final IdPAttribute source,
@Nonnull final List<IdPAttributeValue> target) {
if (source != null) {
target.addAll(source.getValues());
diff --git a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnector.java b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnector.java
index 0a405c0ba..364748f0b 100644
--- a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnector.java
+++ b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnector.java
@@ -128,7 +128,7 @@ public final class ResolvedDataConnector extends AbstractDataConnector {
}
/** {@inheritDoc} */
- @Override public void setExportAllAttributes(@Nullable final boolean what) {
+ @Override public void setExportAllAttributes(final boolean what) {
checkSetterPreconditions();
}
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
index 4117172e3..f27fcf831 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
@@ -108,7 +108,7 @@ public class ScriptedAttributeDefinition extends AbstractAttributeDefinition {
*
* @param object the custom object
*/
- @Nullable public void setCustomObject(@Nullable final Object object) {
+ public void setCustomObject(@Nullable final Object object) {
checkSetterPreconditions();
customObject = object;
}
@@ -139,7 +139,7 @@ public class ScriptedAttributeDefinition extends AbstractAttributeDefinition {
*
* @since 5.0.0
*/
- @Nullable public void setScriptContextExtenders(
+ public void setScriptContextExtenders(
@Nullable @NonnullElements final Collection<ResolverScriptContextExtender> extenders) {
checkSetterPreconditions();
if (extenders != null) {
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
index be04d1b87..5a9c9fa21 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
@@ -93,7 +93,7 @@ public class ScriptedDataConnector extends AbstractDataConnector {
*
* @param object the custom object
*/
- @Nullable public void setCustomObject(final Object object) {
+ public void setCustomObject(final Object object) {
checkSetterPreconditions();
customObject = object;
}
@@ -124,7 +124,7 @@ public class ScriptedDataConnector extends AbstractDataConnector {
*
* @since 5.0.0
*/
- @Nullable public void setScriptContextExtenders(
+ public void setScriptContextExtenders(
@Nullable @NonnullElements final Collection<ResolverScriptContextExtender> extenders) {
checkSetterPreconditions();
if (extenders != null) {
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java
index 1f1e18ba9..9d2364e8a 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java
@@ -65,7 +65,7 @@ public class ConnectionFactoryValidator extends AbstractInitializableComponent i
*
* @param factory the connection factory
*/
- @Nonnull public void setConnectionFactory(@Nonnull final ConnectionFactory factory) {
+ public void setConnectionFactory(@Nonnull final ConnectionFactory factory) {
checkSetterPreconditions();
connectionFactory = Constraint.isNotNull(factory, "Connection factory must be non-null");
}
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AbstractResolverPluginFactoryBean.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AbstractResolverPluginFactoryBean.java
index f25417721..18b633343 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AbstractResolverPluginFactoryBean.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AbstractResolverPluginFactoryBean.java
@@ -63,7 +63,7 @@ public abstract class AbstractResolverPluginFactoryBean<T extends AbstractResolv
/** Set the component Id.
* @param id the id.
*/
- @Nullable public void setId(@Nullable final String id) {
+ public void setId(@Nullable final String id) {
componentId = id;
}
diff --git a/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java b/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java
index 056f9a4b9..6f4431233 100644
--- a/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java
+++ b/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java
@@ -90,7 +90,7 @@ public class SAML1NameIdentifierAttributeDefinition extends AbstractAttributeDef
*
* @param format format for the NameID used as an attribute value
*/
- @Nullable public void setNameIdFormat(@Nullable final String format) {
+ public void setNameIdFormat(@Nullable final String format) {
checkSetterPreconditions();
nameIdFormat = format;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list