[java-identity-provider] branch master updated: IDP-1287: Deprecate the HTTP Caching Attributes
Brent Putman
putmanb at georgetown.edu
Mon Oct 1 20:24:27 EDT 2018
This is an automated email from the git hooks/post-receive script.
putmanb 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=ca556552a2c22dbccd9dedc791dbd152d9b59d40
The following commit(s) were added to refs/heads/master by this push:
new ca55655 IDP-1287: Deprecate the HTTP Caching Attributes
ca55655 is described below
commit ca556552a2c22dbccd9dedc791dbd152d9b59d40
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Mon Oct 1 20:19:28 2018 -0400
IDP-1287: Deprecate the HTTP Caching Attributes
---
.../impl/HTTPMetadataProvidersParserSupport.java | 18 ++++++++++++++++++
.../main/resources/schema/shibboleth-metadata.xsd | 20 +++++++++++++++++---
2 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProvidersParserSupport.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProvidersParserSupport.java
index b3dca7b..488afa4 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProvidersParserSupport.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProvidersParserSupport.java
@@ -205,6 +205,9 @@ public final class HTTPMetadataProvidersParserSupport {
@Nullable final BeanDefinition httpClientSecurityParameters) {
final String caching;
if (element.hasAttributeNS(null, "httpCaching")) {
+ DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, "httpCaching",
+ parserContext.getReaderContext().getResource().getDescription(),
+ "HttpClient bean via httpClientRef");
caching = StringSupport.trimOrNull(element.getAttributeNS(null, "httpCaching"));
} else {
caching = defaultCaching;
@@ -218,14 +221,23 @@ public final class HTTPMetadataProvidersParserSupport {
case "file":
clientBuilder = BeanDefinitionBuilder.genericBeanDefinition(FileCachingHttpClientFactoryBean.class);
if (element.hasAttributeNS(null, "httpCacheDirectory")) {
+ DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, "httpCacheDirectory",
+ parserContext.getReaderContext().getResource().getDescription(),
+ "HttpClient bean via httpClientRef");
clientBuilder.addPropertyValue("cacheDirectory",
StringSupport.trimOrNull(element.getAttributeNS(null, "httpCacheDirectory")));
}
if (element.hasAttributeNS(null, "httpMaxCacheEntries")) {
+ DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, "httpMaxCacheEntries",
+ parserContext.getReaderContext().getResource().getDescription(),
+ "HttpClient bean via httpClientRef");
clientBuilder.addPropertyValue("maxCacheEntries",
StringSupport.trimOrNull(element.getAttributeNS(null, "httpMaxCacheEntries")));
}
if (element.hasAttributeNS(null, "httpMaxCacheEntrySize")) {
+ DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, "httpMaxCacheEntrySize",
+ parserContext.getReaderContext().getResource().getDescription(),
+ "HttpClient bean via httpClientRef");
clientBuilder.addPropertyValue("maxCacheEntrySize",
StringSupport.trimOrNull(element.getAttributeNS(null, "httpMaxCacheEntrySize")));
}
@@ -233,10 +245,16 @@ public final class HTTPMetadataProvidersParserSupport {
case "memory":
clientBuilder = BeanDefinitionBuilder.genericBeanDefinition(InMemoryCachingHttpClientFactoryBean.class);
if (element.hasAttributeNS(null, "httpMaxCacheEntries")) {
+ DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, "httpMaxCacheEntries",
+ parserContext.getReaderContext().getResource().getDescription(),
+ "HttpClient bean via httpClientRef");
clientBuilder.addPropertyValue("maxCacheEntries",
StringSupport.trimOrNull(element.getAttributeNS(null, "httpMaxCacheEntries")));
}
if (element.hasAttributeNS(null, "httpMaxCacheEntrySize")) {
+ DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, "httpMaxCacheEntrySize",
+ parserContext.getReaderContext().getResource().getDescription(),
+ "HttpClient bean via httpClientRef");
clientBuilder.addPropertyValue("maxCacheEntrySize",
StringSupport.trimOrNull(element.getAttributeNS(null, "httpMaxCacheEntrySize")));
}
diff --git a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
index 0e90671..1bb3adf 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
@@ -268,24 +268,34 @@
</attribute>
<attribute name="httpCaching" type="shibmd:HttpClientCachingType">
<annotation>
- <documentation>The type of HttpClient caching to perform. Defaults to 'none'.</documentation>
+ <documentation>
+ The type of HttpClient caching to perform. Defaults to 'none'.
+ Deprecated in favor of httpClientRef.
+ </documentation>
</annotation>
</attribute>
<attribute name="httpCacheDirectory" type="string">
<annotation>
<documentation>
The path to the HttpClient cache directory. Only used if caching type is 'file'.
+ Deprecated in favor of httpClientRef.
</documentation>
</annotation>
</attribute>
<attribute name="httpMaxCacheEntries" type="string">
<annotation>
- <documentation>The maximum number of responses to cache.</documentation>
+ <documentation>
+ The maximum number of responses to cache.
+ Deprecated in favor of httpClientRef.
+ </documentation>
</annotation>
</attribute>
<attribute name="httpMaxCacheEntrySize" type="string">
<annotation>
- <documentation>The maximum response body size which may be cached, in bytes.</documentation>
+ <documentation>
+ The maximum response body size which may be cached, in bytes.
+ Deprecated in favor of httpClientRef.
+ </documentation>
</annotation>
</attribute>
<attribute name="tlsTrustEngineRef" type="string">
@@ -610,6 +620,7 @@
<annotation>
<documentation>
The type of HttpClient caching to perform. Defaults to 'memory'.
+ Deprecated in favor of httpClientRef.
</documentation>
</annotation>
</attribute>
@@ -617,6 +628,7 @@
<annotation>
<documentation>
The path to the HttpClient cache directory. Only used if caching type is 'file'.
+ Deprecated in favor of httpClientRef.
</documentation>
</annotation>
</attribute>
@@ -624,6 +636,7 @@
<annotation>
<documentation>
The maximum number of responses to cache.
+ Deprecated in favor of httpClientRef.
</documentation>
</annotation>
</attribute>
@@ -631,6 +644,7 @@
<annotation>
<documentation>
The maximum response body size which may be cached, in bytes.
+ Deprecated in favor of httpClientRef.
</documentation>
</annotation>
</attribute>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list