[java-shib-attribute] branch main updated: Add NonnullFunction and convert reloadable service strategies to it.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor 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=5a8282d03035b56587db08a5fb962db957d32040

The following commit(s) were added to refs/heads/main by this push:
     new 5a8282d03 Add NonnullFunction and convert reloadable service strategies to it.
5a8282d03 is described below

commit 5a8282d03035b56587db08a5fb962db957d32040
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 28 15:53:54 2022 -0500

    Add NonnullFunction and convert reloadable service strategies to it.
---
 .../attribute/filter/spring/impl/AttributeFilterServiceStrategy.java  | 4 ++--
 .../attribute/transcoding/impl/AttributeRegistryServiceStrategy.java  | 3 ++-
 .../resolver/spring/impl/AttributeResolverServiceStrategy.java        | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterServiceStrategy.java b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterServiceStrategy.java
index 194ae3f09..42ba7362b 100644
--- a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterServiceStrategy.java
+++ b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterServiceStrategy.java
@@ -18,7 +18,6 @@
 package net.shibboleth.idp.attribute.filter.spring.impl;
 
 import java.util.Collection;
-import java.util.function.Function;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -32,6 +31,7 @@ import net.shibboleth.idp.attribute.filter.AttributeFilterPolicy;
 import net.shibboleth.idp.attribute.filter.impl.AttributeFilterImpl;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.NonnullFunction;
 import net.shibboleth.shared.service.ServiceException;
 import net.shibboleth.shared.service.ServiceableComponent;
 import net.shibboleth.shared.spring.service.impl.SpringServiceableComponent;
@@ -43,7 +43,7 @@ import net.shibboleth.shared.spring.service.impl.SpringServiceableComponent;
  * then initialize.
  */
 public class AttributeFilterServiceStrategy extends AbstractIdentifiableInitializableComponent implements
-        Function<ApplicationContext, ServiceableComponent<AttributeFilter>> {
+    NonnullFunction<ApplicationContext, ServiceableComponent<AttributeFilter>> {
 
     /** log. */
     private final Logger log = LoggerFactory.getLogger(AttributeFilterServiceStrategy.class);
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java
index 993a378fe..53e3846f3 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java
@@ -38,6 +38,7 @@ import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.NonnullFunction;
 import net.shibboleth.shared.service.ServiceException;
 import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
 import net.shibboleth.shared.spring.service.impl.SpringServiceableComponent;
@@ -46,7 +47,7 @@ import net.shibboleth.shared.spring.service.impl.SpringServiceableComponent;
  * Strategy for summoning up an {@link AttributeTranscoderRegistryImpl} from a populated {@link ApplicationContext}.
  */
 public class AttributeRegistryServiceStrategy extends AbstractIdentifiableInitializableComponent implements
-        Function<ApplicationContext,AbstractServiceableComponent<AttributeTranscoderRegistry>> {
+        NonnullFunction<ApplicationContext,AbstractServiceableComponent<AttributeTranscoderRegistry>> {
 
     /** Name of bean to supply naming function registry property. */
     @Nullable @NonnullElements private Collection<NamingFunction<?>> namingRegistry;
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java
index dabf99b55..ee7f4edca 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java
@@ -18,7 +18,6 @@
 package net.shibboleth.idp.attribute.resolver.spring.impl;
 
 import java.util.Collection;
-import java.util.function.Function;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -33,6 +32,7 @@ import net.shibboleth.idp.attribute.resolver.DataConnector;
 import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.NonnullFunction;
 import net.shibboleth.shared.service.ServiceException;
 import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
 import net.shibboleth.shared.spring.service.impl.SpringServiceableComponent;
@@ -43,7 +43,7 @@ import net.shibboleth.shared.spring.service.impl.SpringServiceableComponent;
  * Attribute Resolver which we then initialize.
  */
 public class AttributeResolverServiceStrategy extends AbstractIdentifiableInitializableComponent implements
-        Function<ApplicationContext,AbstractServiceableComponent<AttributeResolver>> {
+    NonnullFunction<ApplicationContext,AbstractServiceableComponent<AttributeResolver>> {
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(AttributeResolverServiceStrategy.class);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.