[java-opensaml] branch master updated: IDP-1177 - Centralize deprecation warnings through dedicated function
Scott Cantor
cantor.2 at osu.edu
Thu Jun 8 22:08:52 EDT 2017
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=8ce5bdaa753b46ef4829272b60b776201abe8a71
The following commit(s) were added to refs/heads/master by this push:
new 8ce5bda IDP-1177 - Centralize deprecation warnings through dedicated function
8ce5bda is described below
commit 8ce5bdaa753b46ef4829272b60b776201abe8a71
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jun 8 22:08:49 2017 -0400
IDP-1177 - Centralize deprecation warnings through dedicated function
https://issues.shibboleth.net/jira/browse/IDP-1177
Sweep for deprecation warnings.
---
.../src/main/java/org/opensaml/profile/logic/IPRangePredicate.java | 5 +++++
.../saml/metadata/resolver/filter/impl/SchemaValidationFilter.java | 7 ++++++-
.../resolver/impl/AbstractDynamicHTTPMetadataResolver.java | 3 +++
.../opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java | 4 +++-
.../security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java | 4 ++++
5 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java
index 0161ce4..43e8f38 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java
@@ -28,6 +28,8 @@ import javax.servlet.http.HttpServletRequest;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.net.IPRange;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
import org.opensaml.messaging.context.BaseContext;
@@ -64,6 +66,9 @@ public class IPRangePredicate implements Predicate<BaseContext> {
* @deprecated
*/
public void setAddressRanges(@Nonnull @NonnullElements Iterable<IPRange> ranges) {
+ DeprecationSupport.warn(ObjectType.METHOD, getClass().getName() + ".setAddressRanges(Iterable)", null,
+ "setAddressRanges(Collection)");
+
Constraint.isNotNull(ranges, "Address range collection cannot be null");
addressRanges = new ArrayList<>();
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilter.java
index 8aa9fb8..9f21093 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilter.java
@@ -26,6 +26,8 @@ import javax.xml.validation.Validator;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
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;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.ClasspathResolver;
import net.shibboleth.utilities.java.support.xml.SchemaBuilder;
@@ -81,7 +83,10 @@ public class SchemaValidationFilter implements MetadataFilter {
if (extensionSchemas != null) {
log.info("Overriding SchemaBuilder used to construct schemas to accomodate extension schemas");
- log.warn("Supplying extension schemas directly to metadata filter is deprecated");
+
+ DeprecationSupport.warn(ObjectType.METHOD,
+ getClass().getName() + ".SchemaValidationFilter(SAMLSchemaBuilder, String[])", null,
+ "SchemaValidationFilter(SAMLSchemaBuilder)");
final SchemaBuilder overriddenSchemaBuilder = new SchemaBuilder();
overriddenSchemaBuilder.setResourceResolver(new ClasspathResolver());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
index 7bc4866..7af1fa2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
@@ -69,6 +69,8 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.net.MediaTypeSupport;
+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.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -442,6 +444,7 @@ public abstract class AbstractDynamicHTTPMetadataResolver extends AbstractDynami
*/
protected HttpClientContext buildHttpClientContext() {
//TODO when we remove this deprecated method, change called method to @Nonnull for request
+ DeprecationSupport.warn(ObjectType.METHOD, getClass().getName() + ".buildHttpClientContext()", null, null);
return buildHttpClientContext(null);
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
index fc825f5..cea9ef7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
@@ -23,11 +23,12 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.Timer;
-import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.net.ssl.SSLPeerUnverifiedException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.apache.http.Header;
@@ -365,6 +366,7 @@ public class HTTPMetadataResolver extends AbstractReloadingMetadataResolver {
*/
protected HttpClientContext buildHttpClientContext() {
//TODO when we remove this deprecated method, change called method to @Nonnull for request
+ DeprecationSupport.warn(ObjectType.METHOD, getClass().getName() + ".buildHttpClientContext()", null, null);
return buildHttpClientContext(null);
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
index d2c31c9..b68864e 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
@@ -32,6 +32,8 @@ import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
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;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.apache.http.HttpHost;
@@ -229,6 +231,8 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
protected void performTrustEval(@Nonnull final Socket socket, @Nonnull final HttpContext context)
throws IOException {
//TODO when we remove this deprecated method, change called method to @Nonnull for hostname
+ DeprecationSupport.warn(ObjectType.METHOD, getClass().getName() + ".performTrustEval(Socket, HttpContext)",
+ null, null);
performTrustEval(socket, null, context);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list