[java-identity-provider] branch main updated: Add back deprecated stub for tag Predicate and add new parent beans.
Scott Cantor
cantor.2 at osu.edu
Thu Apr 27 20:12:19 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor 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=04b5b9c454fdc7ebf19166e1dd37527c79e8d143
The following commit(s) were added to refs/heads/main by this push:
new 04b5b9c45 Add back deprecated stub for tag Predicate and add new parent beans.
04b5b9c45 is described below
commit 04b5b9c454fdc7ebf19166e1dd37527c79e8d143
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Apr 27 16:12:16 2023 -0400
Add back deprecated stub for tag Predicate and add new parent beans.
---
.../net/shibboleth/idp/conf/conditions.xml | 9 +++
.../net/shibboleth/idp/conf/global-system.xml | 3 +
.../logic/MappedEntityAttributesPredicate.java | 85 ++++++++++++++++++++++
.../idp/saml/profile/logic/package-info.java | 24 ++++++
4 files changed, 121 insertions(+)
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml
index 2fb9ea78e..73e223b56 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml
@@ -51,6 +51,15 @@
class="net.shibboleth.shared.logic.StrategyIndirectedPredicate"
c:objectStrategy-ref="shibboleth.EntityDescriptorLookup.RelyingParty" />
+ <!-- Parent beans for EntityAttribute predicates. -->
+ <bean id="shibboleth.Conditions.MappedEntityAttributes" abstract="true"
+ class="net.shibboleth.saml.profile.context.logic.MappedEntityAttributesPredicate" />
+ <bean id="shibboleth.Conditions.EntityAttributes" abstract="true"
+ class="org.opensaml.saml.common.profile.logic.EntityAttributesPredicate" />
+ <bean id="shibboleth.TagCandidate" abstract="true"
+ class="org.opensaml.saml.common.profile.logic.EntityAttributesPredicate.Candidate" />
+
+
<!-- IdPAttribute conditions. -->
<bean id="shibboleth.Conditions.SimpleAttribute"
class="net.shibboleth.idp.profile.logic.SimpleAttributePredicate" abstract="true" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index 6e5c56852..e641e05eb 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -121,6 +121,9 @@
value="net.shibboleth.shared.spring.resource.ConditionalResource" />
<entry key="net.shibboleth.ext.spring.resource.RunnableFileSystemResource"
value="net.shibboleth.shared.spring.resource.RunnableFileSystemResource" />
+
+ <entry key="net.shibboleth.idp.saml.profile.logic.MappedEntityAttributesPredicate"
+ value="net.shibboleth.saml.profile.context.logic.MappedEntityAttributesPredicate" />
</util:map>
<!-- This extends the original user-space resource list with the classpath-embedded message tree. -->
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/logic/MappedEntityAttributesPredicate.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/logic/MappedEntityAttributesPredicate.java
new file mode 100644
index 000000000..fe425668b
--- /dev/null
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/logic/MappedEntityAttributesPredicate.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.shibboleth.idp.saml.profile.logic;
+
+import java.util.Collection;
+
+import javax.annotation.Nonnull;
+
+import org.opensaml.saml.common.profile.logic.EntityAttributesPredicate.Candidate;
+
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
+
+/**
+ * Deprecated stub for compatibility.
+ *
+ * @deprecated
+ */
+ at Deprecated(since="5.0.0", forRemoval=true)
+ at SuppressWarnings("null")
+public class MappedEntityAttributesPredicate
+ extends net.shibboleth.saml.profile.context.logic.MappedEntityAttributesPredicate {
+
+ /**
+ * Constructor.
+ *
+ * @param candidates the {@link Candidate} criteria to check for
+ */
+ public MappedEntityAttributesPredicate(
+ @Nonnull @ParameterName(name="candidates") final Collection<Candidate> candidates) {
+ super(candidates);
+
+ DeprecationSupport.warn(ObjectType.CLASS, getClass().getName(), null,
+ net.shibboleth.saml.profile.context.logic.MappedEntityAttributesPredicate.class.getName());
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param candidates the {@link Candidate} criteria to check for
+ * @param trim true iff the values found in the metadata should be trimmed before comparison
+ */
+ public MappedEntityAttributesPredicate(
+ @Nonnull @ParameterName(name="candidates") final Collection<Candidate> candidates,
+ @ParameterName(name="trim") final boolean trim) {
+ super(candidates, trim);
+
+ DeprecationSupport.warn(ObjectType.CLASS, getClass().getName(), null,
+ net.shibboleth.saml.profile.context.logic.MappedEntityAttributesPredicate.class.getName());
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param candidates the {@link Candidate} criteria to check for
+ * @param trim true iff the values found in the metadata should be trimmed before comparison
+ * @param all true iff all the criteria must match to be a successful test
+ */
+ public MappedEntityAttributesPredicate(
+ @Nonnull @ParameterName(name="candidates") final Collection<Candidate> candidates,
+ @ParameterName(name="trim") final boolean trim,
+ @ParameterName(name="all") final boolean all) {
+ super(candidates, trim, all);
+
+ DeprecationSupport.warn(ObjectType.CLASS, getClass().getName(), null,
+ net.shibboleth.saml.profile.context.logic.MappedEntityAttributesPredicate.class.getName());
+ }
+
+}
\ No newline at end of file
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/logic/package-info.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/logic/package-info.java
new file mode 100644
index 000000000..e2f7c3a11
--- /dev/null
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/logic/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Legacy package for compatibility.
+ */
+ at NonnullElements
+package net.shibboleth.idp.saml.profile.logic;
+
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list