[java-identity-provider] 02/06: IDP-1457 Remove Legacy (V2) scripting support for attribute resolver.
Rod Widdowson
rdw at steadingsoftware.com
Wed Jun 1 13:51:35 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw 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=3d0647beb2139b713502fb4f49faabbea2242376
commit 3d0647beb2139b713502fb4f49faabbea2242376
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jun 1 14:02:15 2022 +0100
IDP-1457 Remove Legacy (V2) scripting support for attribute resolver.
https://shibboleth.atlassian.net/browse/IDP-1457
Initial tidy. Remove 6 deprecated classes from the jdbc and rdbms connectors.
All these classes are not over in API
---
...ParameterizedExecutableSearchFilterBuilder.java | 43 ----------------------
.../impl/StringAttributeValueMappingStrategy.java | 42 ---------------------
.../TemplatedExecutableSearchFilterBuilder.java | 42 ---------------------
.../impl/FormatExecutableStatementBuilder.java | 39 --------------------
.../dc/rdbms/impl/StringResultMappingStrategy.java | 39 --------------------
.../impl/TemplatedExecutableStatementBuilder.java | 40 --------------------
6 files changed, 245 deletions(-)
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ParameterizedExecutableSearchFilterBuilder.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ParameterizedExecutableSearchFilterBuilder.java
deleted file mode 100644
index f00f2898b..000000000
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ParameterizedExecutableSearchFilterBuilder.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.attribute.resolver.dc.ldap.impl;
-
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
-/**
- * Classpath placeholder for legacy configuration.
- * @deprecated Replaced by api class. Remove in V5.
- */
- at Deprecated public class ParameterizedExecutableSearchFilterBuilder
- extends net.shibboleth.idp.attribute.resolver.dc.ldap.ParameterizedExecutableSearchFilterBuilder {
-
- /**
- * Constructor.
- *
- */
- public ParameterizedExecutableSearchFilterBuilder() {
- super();
- // V4 deprecation
- DeprecationSupport.warnOnce(ObjectType.CLASS,
- "net.shibboleth.idp.attribute.resolver.dc.ldap.impl.ParameterizedExecutableSearchFilterBuilder",
- null,
- "net.shibboleth.idp.attribute.resolver.dc.ldap.ParameterizedExecutableSearchFilterBuilder");
- }
-
-}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/StringAttributeValueMappingStrategy.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/StringAttributeValueMappingStrategy.java
deleted file mode 100644
index 56198735e..000000000
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/StringAttributeValueMappingStrategy.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.attribute.resolver.dc.ldap.impl;
-
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
-/**
-* Classpath placeholder for legacy configurations.
- * @deprecated Replaced by api class. Remove in V5.
-*/
- at Deprecated public class StringAttributeValueMappingStrategy
- extends net.shibboleth.idp.attribute.resolver.dc.ldap.StringAttributeValueMappingStrategy {
-
- /**
- * Constructor.
- */
- public StringAttributeValueMappingStrategy() {
- super();
- // V4 deprecation
- DeprecationSupport.warnOnce(ObjectType.CLASS,
- "net.shibboleth.idp.attribute.resolver.dc.ldap.impl.StringAttributeValueMappingStrategy",
- null,
- "net.shibboleth.idp.attribute.resolver.dc.ldap.StringAttributeValueMappingStrategy");
- }
-
-}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/TemplatedExecutableSearchFilterBuilder.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/TemplatedExecutableSearchFilterBuilder.java
deleted file mode 100644
index 602712516..000000000
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/TemplatedExecutableSearchFilterBuilder.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.attribute.resolver.dc.ldap.impl;
-
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
-/**
-* Classpath placeholder for legacy configurations.
- * @deprecated Replaced by api class. Remove in V5.
-*/
- at Deprecated public class TemplatedExecutableSearchFilterBuilder extends
- V2CompatibleTemplatedExecutableSearchFilterBuilder {
-
- /**
- * Constructor.
- */
- public TemplatedExecutableSearchFilterBuilder() {
- super();
- // V4 deprecation
- DeprecationSupport.warnOnce(ObjectType.CLASS,
- "net.shibboleth.idp.attribute.resolver.dc.ldap.impl.TemplatedExecutableSearchFilterBuilder",
- null,
- "net.shibboleth.idp.attribute.resolver.dc.ldap.TemplatedExecutableSearchFilterBuilder");
- }
-
-}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/FormatExecutableStatementBuilder.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/FormatExecutableStatementBuilder.java
deleted file mode 100644
index 10d087a45..000000000
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/FormatExecutableStatementBuilder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.attribute.resolver.dc.rdbms.impl;
-
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
-/**
- * Classpath placeholder for legacy configurations.
- * @deprecated Replaced by api class. Remove in V5.
- */
- at Deprecated public class FormatExecutableStatementBuilder
- extends net.shibboleth.idp.attribute.resolver.dc.rdbms.FormatExecutableStatementBuilder {
-
- /** Constructor. */
- public FormatExecutableStatementBuilder() {
- super();
- // V4 deprecation
- DeprecationSupport.warnOnce(ObjectType.CLASS,
- "net.shibboleth.idp.attribute.resolver.dc.rdbms.impl.FormatExecutableStatementBuilder",
- null,
- "net.shibboleth.idp.attribute.resolver.dc.rdbms.FormatExecutableStatementBuilder");
- }
-}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/StringResultMappingStrategy.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/StringResultMappingStrategy.java
deleted file mode 100644
index 0231a0dcf..000000000
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/StringResultMappingStrategy.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.attribute.resolver.dc.rdbms.impl;
-
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
-/**
- * Classpath placeholder for legacy configurations using undocumented classes.
- * @deprecated Replaced by api class. Remove in V5.
- */
- at Deprecated public class StringResultMappingStrategy
- extends net.shibboleth.idp.attribute.resolver.dc.rdbms.StringResultMappingStrategy {
-
- /** Constructor. */
- public StringResultMappingStrategy() {
- super();
- // V4 deprecation
- DeprecationSupport.warnOnce(ObjectType.CLASS,
- "net.shibboleth.idp.attribute.resolver.dc.rdbms.impl.StringResultMappingStrategy",
- null,
- "net.shibboleth.idp.attribute.resolver.dc.rdbms.StringResultMappingStrategy");
- }
-}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/TemplatedExecutableStatementBuilder.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/TemplatedExecutableStatementBuilder.java
deleted file mode 100644
index 8a85dab20..000000000
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/TemplatedExecutableStatementBuilder.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.attribute.resolver.dc.rdbms.impl;
-
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
-/**
-* Classpath placeholder for legacy configurations.
- * @deprecated Replaced by api class. Remove in V5.
-*/
- at Deprecated public class TemplatedExecutableStatementBuilder extends V2CompatibleTemplatedExecutableStatementBuilder {
-
- /** Constructor.
- * This is purely there to move people away from the V3 impl class.
- */
- public TemplatedExecutableStatementBuilder() {
- super();
- // V4 deprecation
- DeprecationSupport.warnOnce(ObjectType.CLASS,
- "net.shibboleth.idp.attribute.resolver.dc.rdbms.impl.TemplatedExecutableStatementBuilder",
- null,
- "net.shibboleth.idp.attribute.resolver.dc.rdbms.TemplatedExecutableStatementBuilder");
- }
-}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list