[java-identity-provider] 01/01: IDP-1419 remove marker interfaces.
Daniel Fisher
dfisher at vt.edu
Mon Apr 15 00:34:13 EDT 2019
This is an automated email from the git hooks/post-receive script.
dfisher pushed a commit to branch idp-1419-mapping-strategy
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5414f0cb05860c5bc1513c88461bad8125384b50
commit 5414f0cb05860c5bc1513c88461bad8125384b50
Author: Daniel Fisher <dfisher at vt.edu>
AuthorDate: Mon Apr 15 00:29:13 2019 -0400
IDP-1419 remove marker interfaces.
---
.../resolver/dc/ldap/impl/LDAPDataConnector.java | 6 +++--
.../dc/ldap/impl/SearchResultMappingStrategy.java | 29 ----------------------
.../impl/StringAttributeValueMappingStrategy.java | 7 +++---
.../resolver/dc/rdbms/impl/RDBMSDataConnector.java | 5 ++--
.../dc/rdbms/impl/ResultMappingStrategy.java | 29 ----------------------
.../dc/rdbms/impl/StringResultMappingStrategy.java | 6 +++--
.../dc/ldap/impl/LDAPDataConnectorTest.java | 6 +++--
.../resolver/dc/ldap/impl/Regressions.java | 4 ++-
.../dc/rdbms/impl/RDBMSDataConnectorTest.java | 6 +++--
9 files changed, 26 insertions(+), 72 deletions(-)
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
index 4ad038a..1b7a828 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
@@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
+import net.shibboleth.idp.attribute.resolver.dc.MappingStrategy;
import net.shibboleth.idp.attribute.resolver.dc.ValidationException;
import net.shibboleth.idp.attribute.resolver.dc.Validator;
import net.shibboleth.idp.attribute.resolver.dc.impl.AbstractSearchDataConnector;
@@ -47,7 +48,8 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
* A {@link net.shibboleth.idp.attribute.resolver.DataConnector} that queries an LDAP in order to retrieve attribute
* data.
*/
-public class LDAPDataConnector extends AbstractSearchDataConnector<ExecutableSearchFilter,SearchResultMappingStrategy> {
+public class LDAPDataConnector extends
+ AbstractSearchDataConnector<ExecutableSearchFilter, MappingStrategy<SearchResult>> {
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(LDAPDataConnector.class);
@@ -119,7 +121,7 @@ public class LDAPDataConnector extends AbstractSearchDataConnector<ExecutableSea
}
/** {@inheritDoc} */
- @Override public void setMappingStrategy(@Nonnull final SearchResultMappingStrategy strategy) {
+ @Override public void setMappingStrategy(@Nonnull final MappingStrategy<SearchResult> strategy) {
super.setMappingStrategy(strategy);
defaultMappingStrategy = false;
}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/SearchResultMappingStrategy.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/SearchResultMappingStrategy.java
deleted file mode 100644
index 92fc2d1..0000000
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/SearchResultMappingStrategy.java
+++ /dev/null
@@ -1,29 +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 org.ldaptive.SearchResult;
-
-import net.shibboleth.idp.attribute.resolver.dc.MappingStrategy;
-
-/**
- * Strategy for mapping from a {@link SearchResult} to a collection of
- * {@link net.shibboleth.idp.attribute.IdPAttribute}s.
- */
-public interface SearchResultMappingStrategy extends MappingStrategy<SearchResult> {
-}
\ No newline at end of file
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
index cb65145..c119048 100644
--- 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
@@ -32,6 +32,7 @@ import net.shibboleth.idp.attribute.resolver.MultipleResultAnErrorResolutionExce
import net.shibboleth.idp.attribute.resolver.NoResultAnErrorResolutionException;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.dc.AbstractMappingStrategy;
+import net.shibboleth.idp.attribute.resolver.dc.MappingStrategy;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.ldaptive.LdapAttribute;
@@ -41,11 +42,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A simple {@link SearchResultMappingStrategy} that iterates over all result entries and includes all attribute values
- * as strings.
+ * A simple {@link MappingStrategy<SearchResult>} that iterates over all result entries and includes all attribute
+ * values as strings.
*/
public class StringAttributeValueMappingStrategy extends AbstractMappingStrategy<SearchResult>
- implements SearchResultMappingStrategy {
+ implements MappingStrategy<SearchResult> {
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(StringAttributeValueMappingStrategy.class);
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnector.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnector.java
index 8213264..fb68e87 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnector.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnector.java
@@ -28,6 +28,7 @@ import javax.sql.DataSource;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
+import net.shibboleth.idp.attribute.resolver.dc.MappingStrategy;
import net.shibboleth.idp.attribute.resolver.dc.ValidationException;
import net.shibboleth.idp.attribute.resolver.dc.Validator;
import net.shibboleth.idp.attribute.resolver.dc.impl.AbstractSearchDataConnector;
@@ -42,7 +43,7 @@ import org.slf4j.LoggerFactory;
* A {@link net.shibboleth.idp.attribute.resolver.DataConnector} that queries a relation database in order to retrieve
* attribute data.
*/
-public class RDBMSDataConnector extends AbstractSearchDataConnector<ExecutableStatement,ResultMappingStrategy> {
+public class RDBMSDataConnector extends AbstractSearchDataConnector<ExecutableStatement, MappingStrategy<ResultSet>> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(RDBMSDataConnector.class);
@@ -111,7 +112,7 @@ public class RDBMSDataConnector extends AbstractSearchDataConnector<ExecutableSt
}
/** {@inheritDoc} */
- @Override public void setMappingStrategy(@Nonnull final ResultMappingStrategy strategy) {
+ @Override public void setMappingStrategy(@Nonnull final MappingStrategy<ResultSet> strategy) {
super.setMappingStrategy(strategy);
defaultMappingStrategy = false;
}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/ResultMappingStrategy.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/ResultMappingStrategy.java
deleted file mode 100644
index 0e695cb..0000000
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/ResultMappingStrategy.java
+++ /dev/null
@@ -1,29 +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 java.sql.ResultSet;
-
-import net.shibboleth.idp.attribute.resolver.dc.MappingStrategy;
-
-/**
- * Strategy for mapping from a {@link ResultSet} to a collection of {@link
- * net.shibboleth.idp.attribute.IdPAttribute}s.
- */
-public interface ResultMappingStrategy extends MappingStrategy<ResultSet> {
-}
\ No newline at end of file
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
index 1c918aa..99b2429 100644
--- 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
@@ -36,16 +36,18 @@ import net.shibboleth.idp.attribute.resolver.MultipleResultAnErrorResolutionExce
import net.shibboleth.idp.attribute.resolver.NoResultAnErrorResolutionException;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.dc.AbstractMappingStrategy;
+import net.shibboleth.idp.attribute.resolver.dc.MappingStrategy;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A simple {@link ResultMappingStrategy} that assumes all columns in the result set should be mapped and that all
+ * A simple {@link MappingStrategy<ResultSet>} that assumes all columns in the result set should be mapped and that all
* values are strings.
*/
-public class StringResultMappingStrategy extends AbstractMappingStrategy<ResultSet> implements ResultMappingStrategy {
+public class StringResultMappingStrategy extends AbstractMappingStrategy<ResultSet>
+ implements MappingStrategy<ResultSet> {
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(StringResultMappingStrategy.class);
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
index 0fb126f..05ddbd4 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
@@ -34,6 +34,7 @@ import javax.annotation.Nonnull;
import org.ldaptive.ConnectionFactory;
import org.ldaptive.DefaultConnectionFactory;
import org.ldaptive.SearchExecutor;
+import org.ldaptive.SearchResult;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
@@ -51,6 +52,7 @@ import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.resolver.DataConnector;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
+import net.shibboleth.idp.attribute.resolver.dc.MappingStrategy;
import net.shibboleth.idp.attribute.resolver.dc.impl.ExecutableSearchBuilder;
import net.shibboleth.idp.attribute.resolver.dc.impl.TestCache;
import net.shibboleth.idp.saml.impl.TestSources;
@@ -110,7 +112,7 @@ public class LDAPDataConnectorTest {
* @throws ComponentInitializationException
*/
protected LDAPDataConnector createLdapDataConnector(final ExecutableSearchBuilder builder,
- final SearchResultMappingStrategy strategy) throws ComponentInitializationException {
+ final MappingStrategy<SearchResult> strategy) throws ComponentInitializationException {
final LDAPDataConnector connector = new LDAPDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
final ConnectionFactory connectionFactory = new DefaultConnectionFactory("ldap://localhost:10389");
@@ -170,7 +172,7 @@ public class LDAPDataConnectorTest {
final ConnectionFactory connectionFactory = new DefaultConnectionFactory("ldap://localhost:10389");
connector.setConnectionFactory(connectionFactory);
- final SearchResultMappingStrategy mappingStrategy = new StringAttributeValueMappingStrategy();
+ final MappingStrategy<SearchResult> mappingStrategy = new StringAttributeValueMappingStrategy();
connector.setMappingStrategy(mappingStrategy);
try {
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
index 9bc3224..6d33752 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
@@ -26,6 +26,7 @@ import java.util.Map;
import org.ldaptive.ConnectionFactory;
import org.ldaptive.DefaultConnectionFactory;
import org.ldaptive.SearchExecutor;
+import org.ldaptive.SearchResult;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
@@ -42,6 +43,7 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.resolver.DataConnector;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
+import net.shibboleth.idp.attribute.resolver.dc.MappingStrategy;
import net.shibboleth.idp.attribute.resolver.dc.impl.ExecutableSearchBuilder;
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -99,7 +101,7 @@ public class Regressions {
* @throws ComponentInitializationException
*/
protected LDAPDataConnector createLdapDataConnector(final ExecutableSearchBuilder builder,
- final SearchResultMappingStrategy strategy) throws ComponentInitializationException {
+ final MappingStrategy<SearchResult> strategy) throws ComponentInitializationException {
final LDAPDataConnector connector = new LDAPDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
final ConnectionFactory connectionFactory = new DefaultConnectionFactory("ldap://localhost:10390");
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
index afba0f6..5bbabe5 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
@@ -23,6 +23,7 @@ import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.Duration;
import java.util.ArrayList;
@@ -43,6 +44,7 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
+import net.shibboleth.idp.attribute.resolver.dc.MappingStrategy;
import net.shibboleth.idp.attribute.resolver.dc.impl.ExecutableSearchBuilder;
import net.shibboleth.idp.attribute.resolver.dc.impl.TestCache;
import net.shibboleth.idp.saml.impl.TestSources;
@@ -91,7 +93,7 @@ public class RDBMSDataConnectorTest {
* @return rdbms data connector
*/
protected RDBMSDataConnector createUserRdbmsDataConnector(final ExecutableSearchBuilder builder,
- final ResultMappingStrategy strategy) {
+ final MappingStrategy<ResultSet> strategy) {
final RDBMSDataConnector connector = new RDBMSDataConnector();
connector.setId(TEST_CONNECTOR_NAME);
connector.setDataSource(datasource);
@@ -109,7 +111,7 @@ public class RDBMSDataConnectorTest {
* @return rdbms data connector
*/
protected RDBMSDataConnector createGroupRdbmsDataConnector(final ExecutableSearchBuilder builder,
- final ResultMappingStrategy strategy) {
+ final MappingStrategy<ResultSet> strategy) {
final RDBMSDataConnector connector = new RDBMSDataConnector();
connector.setId(TEST_CONNECTOR_NAME + "ForGroups");
connector.setDataSource(datasource);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list