[java-shib-attribute] branch main updated: JSATTR-4 Remove springResources from data connector
Rod Widdowson
rdw at steadingsoftware.com
Thu Oct 27 12:30:18 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw 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=964a6e076fde6a825f92ba8ffd26a976032bc2a0
The following commit(s) were added to refs/heads/main by this push:
new 964a6e076 JSATTR-4 Remove springResources from data connector
964a6e076 is described below
commit 964a6e076fde6a825f92ba8ffd26a976032bc2a0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Oct 27 11:16:02 2022 +0100
JSATTR-4 Remove springResources from data connector
https://shibboleth.atlassian.net/browse/JSATTR-4
Remove the getNativeClass Apis..
---
.../resolver/spring/dc/AbstractDataConnectorParser.java | 13 -------------
.../spring/dc/http/impl/HTTPDataConnectorParser.java | 2 +-
.../spring/dc/impl/ContextDerivedDataConnectorParser.java | 2 +-
.../spring/dc/impl/ScriptedDataConnectorParser.java | 2 +-
.../resolver/spring/dc/impl/StaticDataConnectorParser.java | 2 +-
.../resolver/spring/dc/impl/SubjectDataConnectorParser.java | 2 +-
.../spring/dc/ldap/impl/LDAPDataConnectorParser.java | 2 +-
.../spring/dc/rdbms/impl/RDBMSDataConnectorParser.java | 2 +-
.../dc/storage/impl/StorageServiceDataConnectorParser.java | 2 +-
9 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
index a5c997409..497fb042e 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
@@ -28,7 +28,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.idp.attribute.resolver.AbstractDataConnector;
import net.shibboleth.idp.attribute.resolver.spring.BaseResolverPluginParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
@@ -76,18 +75,6 @@ public abstract class AbstractDataConnectorParser extends BaseResolverPluginPars
/** Log4j logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(AbstractDataConnectorParser.class);
- /** {@inheritDoc} */
- @Override protected final Class<?> getBeanClass(final Element element) {
- return getNativeBeanClass();
- }
-
- /**
- * Per parser indication of what we are building.
- *
- * @return the class
- */
- protected abstract Class<? extends AbstractDataConnector> getNativeBeanClass();
-
/** {@inheritDoc} */
@Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
@Nonnull final BeanDefinitionBuilder builder) {
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
index eed9984ce..80e427f62 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
@@ -60,7 +60,7 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
@Nonnull private final Logger log = LoggerFactory.getLogger(HTTPDataConnectorParser.class);
/** {@inheritDoc} */
- @Override protected Class<HTTPDataConnector> getNativeBeanClass() {
+ @Override protected Class<HTTPDataConnector> getBeanClass(final Element element) {
return HTTPDataConnector.class;
}
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ContextDerivedDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ContextDerivedDataConnectorParser.java
index 7cac3e505..5be41f732 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ContextDerivedDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ContextDerivedDataConnectorParser.java
@@ -42,7 +42,7 @@ public class ContextDerivedDataConnectorParser extends AbstractDataConnectorPars
/** {@inheritDoc} */
@Override
- @Nonnull protected Class<? extends AbstractDataConnector> getNativeBeanClass() {
+ @Nonnull protected Class<? extends AbstractDataConnector> getBeanClass(final Element element) {
return ContextDerivedDataConnector.class;
}
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
index 2daf43568..c17a2a73d 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
@@ -55,7 +55,7 @@ public class ScriptedDataConnectorParser extends AbstractDataConnectorParser {
@Nonnull private final Logger log = LoggerFactory.getLogger(ScriptedDataConnectorParser.class);
/** {@inheritDoc} */
- @Override protected Class<ScriptedDataConnector> getNativeBeanClass() {
+ @Override protected Class<ScriptedDataConnector> getBeanClass(final Element element) {
return ScriptedDataConnector.class;
}
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
index 92d5b4873..88290be34 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
@@ -53,7 +53,7 @@ public class StaticDataConnectorParser extends AbstractDataConnectorParser {
@Nonnull private final Logger log = LoggerFactory.getLogger(StaticDataConnectorParser.class);
/** {@inheritDoc} */
- @Override protected Class<StaticDataConnector> getNativeBeanClass() {
+ @Override protected final Class<StaticDataConnector> getBeanClass(final Element element) {
return StaticDataConnector.class;
}
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
index a9408a1bd..834382d4e 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
@@ -57,7 +57,7 @@ public class SubjectDataConnectorParser extends AbstractDataConnectorParser {
/** {@inheritDoc} */
@Override
- @Nonnull protected Class<? extends AbstractDataConnector> getNativeBeanClass() {
+ @Nonnull protected Class<? extends AbstractDataConnector> getBeanClass(final Element element) {
return ContextDerivedDataConnector.class;
}
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index c4e68d7dc..bf0546e28 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -90,7 +90,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
@Nonnull private final Logger log = LoggerFactory.getLogger(LDAPDataConnectorParser.class);
/** {@inheritDoc} */
- @Override protected Class<LDAPDataConnector> getNativeBeanClass() {
+ @Override protected Class<LDAPDataConnector> getBeanClass(final Element element) {
return LDAPDataConnector.class;
}
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
index e2d7e68e1..d7e62ad92 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
@@ -59,7 +59,7 @@ public class RDBMSDataConnectorParser extends AbstractDataConnectorParser {
@Nonnull private final Logger log = LoggerFactory.getLogger(RDBMSDataConnectorParser.class);
/** {@inheritDoc} */
- @Override protected Class<RDBMSDataConnector> getNativeBeanClass() {
+ @Override protected Class<RDBMSDataConnector> getBeanClass(final Element element) {
return RDBMSDataConnector.class;
}
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java
index cd2057a2c..592cf64eb 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java
@@ -55,7 +55,7 @@ public class StorageServiceDataConnectorParser extends AbstractDataConnectorPars
@Nonnull private final Logger log = LoggerFactory.getLogger(StorageServiceDataConnectorParser.class);
/** {@inheritDoc} */
- @Override protected Class<StorageServiceDataConnector> getNativeBeanClass() {
+ @Override protected Class<StorageServiceDataConnector> getBeanClass(final Element element) {
return StorageServiceDataConnector.class;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list