[java-identity-provider] branch master updated: IDP-1244 Clean up Derecation warning.
Rod Widdowson
rdw at steadingsoftware.com
Sat May 12 06:59:21 EDT 2018
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=0384f1045dd3cc8cd557fa5fdfdcb7b5e0fa4ec4
The following commit(s) were added to refs/heads/master by this push:
new 0384f10 IDP-1244 Clean up Derecation warning.
0384f10 is described below
commit 0384f1045dd3cc8cd557fa5fdfdcb7b5e0fa4ec4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat May 12 11:58:18 2018 +0100
IDP-1244 Clean up Derecation warning.
https://issues.shibboleth.net/jira/browse/IDP-1244
---
.../dc/ldap/impl/ConnectionFactoryValidator.java | 18 +++++++++---------
.../ParameterizedExecutableSearchFilterBuilder.java | 8 ++++----
.../resolver/dc/rdbms/impl/DataSourceValidator.java | 15 ++++++++-------
.../idp/cas/ticket/ProxyGrantingTicket.java | 11 ++++++++---
.../net/shibboleth/idp/cas/ticket/ProxyTicket.java | 11 ++++++++---
.../net/shibboleth/idp/cas/ticket/ServiceTicket.java | 9 +++++++--
.../java/net/shibboleth/idp/cas/ticket/Ticket.java | 12 +++++++++---
.../metadata/AbstractMetadataProviderParser.java | 20 +++++++++++---------
8 files changed, 64 insertions(+), 40 deletions(-)
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java
index 347f70d..48cb8a8 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java
@@ -19,6 +19,12 @@ package net.shibboleth.idp.attribute.resolver.dc.ldap.impl;
import javax.annotation.Nonnull;
+import org.ldaptive.Connection;
+import org.ldaptive.ConnectionFactory;
+import org.ldaptive.LdapException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.shibboleth.idp.attribute.resolver.dc.ValidationException;
import net.shibboleth.idp.attribute.resolver.dc.Validator;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
@@ -28,12 +34,6 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import org.ldaptive.Connection;
-import org.ldaptive.ConnectionFactory;
-import org.ldaptive.LdapException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Validator implementation that invokes {@link Connection#open()} to determine if the ConnectionFactory is properly
* configured.
@@ -56,8 +56,8 @@ public class ConnectionFactoryValidator extends AbstractInitializableComponent i
* @deprecated - use the property setters
*/
@Deprecated public ConnectionFactoryValidator(@Nonnull final ConnectionFactory factory) {
- DeprecationSupport.warn(ObjectType.METHOD, "ConnectionFactoryValidator(ConnectionFactory)", null, null);
- LoggerFactory.getLogger(ConnectionFactoryValidator.class).warn("Using Deprecated Constructor");
+ DeprecationSupport.warn(ObjectType.METHOD, "ConnectionFactoryValidator(ConnectionFactory)",
+ null, "ConnectionFactoryValidator()");
setConnectionFactory(factory);
setThrowValidateError(true);
try {
@@ -77,7 +77,7 @@ public class ConnectionFactoryValidator extends AbstractInitializableComponent i
@Deprecated public ConnectionFactoryValidator(@Nonnull final ConnectionFactory factory,
final boolean throwOnError) {
DeprecationSupport.warn(ObjectType.METHOD, "ConnectionFactoryValidator(ConnectionFactory, boolean)",
- null, null);
+ null, "ConnectionFactoryValidator()");
setConnectionFactory(factory);
setThrowValidateError(throwOnError);
try {
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
index b285ed7..f5efc3d 100644
--- 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
@@ -22,6 +22,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
+import org.ldaptive.SearchFilter;
+
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
@@ -33,8 +35,6 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import org.ldaptive.SearchFilter;
-
/**
* An {@link net.shibboleth.idp.attribute.resolver.dc.impl.ExecutableSearchBuilder} that generates the search filter to
* be executed by evaluating a parameterized filter string against the currently resolved attributes within a
@@ -53,12 +53,12 @@ public class ParameterizedExecutableSearchFilterBuilder extends AbstractExecutab
*/
@Deprecated public ParameterizedExecutableSearchFilterBuilder(@Nonnull final String filter) {
DeprecationSupport.warn(ObjectType.METHOD, "ParameterizedExecutableSearchFilterBuilder(String)",
- null, null);
+ null, "ParameterizedExecutableSearchFilterBuilder()");
setSearchFilter(filter);
try {
initialize();
} catch (final ComponentInitializationException e) {
- throw new ConstraintViolationException("Invalid parameterization to deprecated structure");
+ throw new ConstraintViolationException("Invalid parameterization.");
}
}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/DataSourceValidator.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/DataSourceValidator.java
index f13e065..b591f91 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/DataSourceValidator.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/DataSourceValidator.java
@@ -23,6 +23,9 @@ import java.sql.SQLException;
import javax.annotation.Nonnull;
import javax.sql.DataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.shibboleth.idp.attribute.resolver.dc.ValidationException;
import net.shibboleth.idp.attribute.resolver.dc.Validator;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
@@ -34,9 +37,6 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Validator implementation that invokes {@link DataSource#getConnection()} to determine if the DataSource is properly
* configured.
@@ -59,12 +59,12 @@ public class DataSourceValidator extends AbstractInitializableComponent implemen
* @deprecated - use the property setters
*/
@Deprecated public DataSourceValidator(final DataSource source) {
- DeprecationSupport.warn(ObjectType.METHOD, "DataSourceValidator(DataSource)", null, null);
+ DeprecationSupport.warn(ObjectType.METHOD, "DataSourceValidator(DataSource)", null, "DataSourceValidator()");
dataSource = source;
try {
initialize();
} catch (final ComponentInitializationException e) {
- throw new ConstraintViolationException("Invalid parameterization to deprecated structure");
+ throw new ConstraintViolationException("Invalid parameterization.");
}
}
@@ -76,13 +76,14 @@ public class DataSourceValidator extends AbstractInitializableComponent implemen
* @deprecated - use the property setters
*/
@Deprecated public DataSourceValidator(final DataSource source, final boolean throwOnError) {
- DeprecationSupport.warn(ObjectType.METHOD, "DataSourceValidator(DataSource, boolean)", null, null);
+ DeprecationSupport.warn(ObjectType.METHOD, "DataSourceValidator(DataSource, boolean)",
+ null, "DataSourceValidator()");
dataSource = source;
throwOnValidateError = throwOnError;
try {
initialize();
} catch (final ComponentInitializationException e) {
- throw new ConstraintViolationException("Invalid parameterization to deprecated structure");
+ throw new ConstraintViolationException("Invalid parameterization.");
}
}
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java
index 6ab2159..95718de 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java
@@ -17,12 +17,15 @@
package net.shibboleth.idp.cas.ticket;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import org.joda.time.Instant;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.joda.time.Instant;
+
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
/**
* CAS proxy-granting ticket.
*
@@ -53,6 +56,8 @@ public class ProxyGrantingTicket extends Ticket {
@Nullable final String parentId) {
super(id, sessionId, service, expiration);
parentPgTicketId = StringSupport.trimOrNull(parentId);
+ DeprecationSupport.warnOnce(ObjectType.METHOD, "ProxyGrantingTicket constructor with sessionID",
+ null, "TicketState#setSessionId(String)");
}
/**
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java
index c1c91c9..2c46229 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java
@@ -17,12 +17,15 @@
package net.shibboleth.idp.cas.ticket;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import org.joda.time.Instant;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.joda.time.Instant;
+
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+
/**
* CAS proxy ticket.
*
@@ -53,6 +56,8 @@ public class ProxyTicket extends Ticket {
@Nonnull final String pgtId) {
super(id, sessionId, service, expiration);
pgTicketId = Constraint.isNotNull(pgtId, "PgtId cannot be null");
+ DeprecationSupport.warnOnce(ObjectType.METHOD, "ProxyTicket constructor with sessionID",
+ null, "TicketState#setSessionId(String)");
}
/**
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java
index 6082642..1a66ca1 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java
@@ -17,11 +17,14 @@
package net.shibboleth.idp.cas.ticket;
-import org.joda.time.Instant;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.joda.time.Instant;
+
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+
/**
* CAS service ticket.
*
@@ -51,6 +54,8 @@ public class ServiceTicket extends Ticket {
final boolean renew) {
super(id, sessionId, service, expiration);
forceAuthn = renew;
+ DeprecationSupport.warnOnce(ObjectType.METHOD, "ServiceTicket constructor with sessionID",
+ null, "TicketState#setSessionId(String)");
}
/**
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java
index c241a95..f3ba743 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java
@@ -17,12 +17,15 @@
package net.shibboleth.idp.cas.ticket;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import org.joda.time.Instant;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.joda.time.Instant;
+
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+
/**
* Generic CAS ticket that has a natural identifier and expiration. All CAS tickets are bound to an IdP session ID
* that indicates the IdP session in which they were created.
@@ -65,6 +68,9 @@ public class Ticket {
ticketId = Constraint.isNotNull(id, "Id cannot be null");
ticketService = Constraint.isNotNull(service, "Service cannot be null");
expirationInstant = Constraint.isNotNull(expiration, "Expiration cannot be null");
+ DeprecationSupport.warnOnce(ObjectType.METHOD, "Ticket constructor with sessionID",
+ null, "TicketState#setSessionId(String)");
+
}
/**
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
index 9a662f8..d84d150 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
@@ -22,12 +22,6 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.ext.spring.util.SpringSupport;
-import net.shibboleth.idp.saml.metadata.RelyingPartyMetadataProvider;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.opensaml.saml.metadata.resolver.filter.MetadataFilterChain;
import org.slf4j.Logger;
@@ -38,6 +32,14 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.idp.saml.metadata.RelyingPartyMetadataProvider;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+
/**
* Parser for the MetadataProviderType in the <code>urn:mace:shibboleth:2.0:metadata</code> namespace.
*
@@ -208,9 +210,9 @@ public abstract class AbstractMetadataProviderParser extends AbstractSingleBeanD
final List<Element> trustEngines =
ElementSupport.getChildElements(element, TRUST_ENGINE_ELEMENT_NAME);
if (trustEngines != null && !trustEngines.isEmpty()) {
- log.warn("{} Deprecated placement of <TrustEngine> inside <MetadataProvider>. "
- + "Place inside the relevant filter", parserContext.getReaderContext().getResource()
- .getDescription());
+ DeprecationSupport.warn(ObjectType.ELEMENT, "<TrustEngine> inside <MetadataProvider>",
+ parserContext.getReaderContext().getResource().getDescription(),
+ "Inside <Filter>");
SpringSupport.parseCustomElements(trustEngines, parserContext);
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list