[java-identity-provider] branch master updated: IDP-1563 - New deprecations in 4.0.0-beta2 firing when they shouldn't
Scott Cantor
cantor.2 at osu.edu
Thu Feb 27 09:45:10 EST 2020
This is an automated email from the git hooks/post-receive script.
scantor 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=0430f5d93aa778a638e9befbeb6da6b90cd0e762
The following commit(s) were added to refs/heads/master by this push:
new 0430f5d IDP-1563 - New deprecations in 4.0.0-beta2 firing when they shouldn't
0430f5d is described below
commit 0430f5d93aa778a638e9befbeb6da6b90cd0e762
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Feb 27 09:45:07 2020 -0500
IDP-1563 - New deprecations in 4.0.0-beta2 firing when they shouldn't
https://issues.shibboleth.net/jira/browse/IDP-1563
---
.../metadata/FileCachingHttpClientFactoryBean.java | 1 -
.../relyingparty/metadata/HttpClientFactoryBean.java | 1 -
.../metadata/InMemoryCachingHttpClientFactoryBean.java | 1 -
.../metadata/impl/FileCachingHttpClientFactoryBean.java | 14 +++++++-------
.../metadata/impl/HttpClientFactoryBean.java | 15 ++++++++-------
.../impl/InMemoryCachingHttpClientFactoryBean.java | 17 +++++++++--------
6 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileCachingHttpClientFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileCachingHttpClientFactoryBean.java
index 7cf35c1..03c7b3c 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileCachingHttpClientFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileCachingHttpClientFactoryBean.java
@@ -30,7 +30,6 @@ public class FileCachingHttpClientFactoryBean
*
*/
public FileCachingHttpClientFactoryBean() {
- super();
final StringBuilder stringBuilder = new StringBuilder("ShibbolethIdp/");
stringBuilder.append(Version.getVersion()).append(" OpenSAML/").append(org.opensaml.core.Version.getVersion());
setUserAgent(stringBuilder.toString());
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java
index 76a4c43..a0a5cf1 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java
@@ -29,7 +29,6 @@ public class HttpClientFactoryBean extends net.shibboleth.ext.spring.factory.Htt
*
*/
public HttpClientFactoryBean() {
- super();
final StringBuilder stringBuilder = new StringBuilder("ShibbolethIdp/");
stringBuilder.append(Version.getVersion()).append(" OpenSAML/").append(org.opensaml.core.Version.getVersion());
setUserAgent(stringBuilder.toString());
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InMemoryCachingHttpClientFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InMemoryCachingHttpClientFactoryBean.java
index 36ce7ac..63fc300 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InMemoryCachingHttpClientFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InMemoryCachingHttpClientFactoryBean.java
@@ -30,7 +30,6 @@ public class InMemoryCachingHttpClientFactoryBean
*
*/
public InMemoryCachingHttpClientFactoryBean() {
- super();
final StringBuilder stringBuilder = new StringBuilder("ShibbolethIdp/");
stringBuilder.append(Version.getVersion()).append(" OpenSAML/").append(org.opensaml.core.Version.getVersion());
setUserAgent(stringBuilder.toString());
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FileCachingHttpClientFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FileCachingHttpClientFactoryBean.java
index 987504e..a125db1 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FileCachingHttpClientFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FileCachingHttpClientFactoryBean.java
@@ -17,6 +17,8 @@
package net.shibboleth.idp.profile.spring.relyingparty.metadata.impl;
+import org.apache.http.client.HttpClient;
+
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
@@ -28,14 +30,12 @@ import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.Object
@Deprecated(forRemoval=true, since="4.0.0")
public class FileCachingHttpClientFactoryBean
extends net.shibboleth.ext.spring.factory.FileCachingHttpClientFactoryBean {
-
- /**
- * Constructor.
- *
- */
- public FileCachingHttpClientFactoryBean() {
- DeprecationSupport.warn(ObjectType.BEAN, "shibboleth.FileCachingHttpClient", null,
+
+ /** {@inheritDoc} */
+ public synchronized HttpClient getObject() throws Exception {
+ DeprecationSupport.warnOnce(ObjectType.BEAN, "shibboleth.FileCachingHttpClient", null,
"shibboleth.FileCachingHttpClientFactory");
+ return super.getObject();
}
}
\ No newline at end of file
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HttpClientFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HttpClientFactoryBean.java
index 41f2ca2..f74ec52 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HttpClientFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HttpClientFactoryBean.java
@@ -17,6 +17,8 @@
package net.shibboleth.idp.profile.spring.relyingparty.metadata.impl;
+import org.apache.http.client.HttpClient;
+
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
@@ -28,13 +30,12 @@ import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.Object
@Deprecated(forRemoval=true, since="4.0.0")
public class HttpClientFactoryBean
extends net.shibboleth.idp.profile.spring.relyingparty.metadata.HttpClientFactoryBean {
-
- /**
- * Constructor.
- */
- public HttpClientFactoryBean() {
- DeprecationSupport.warn(ObjectType.BEAN, "shibboleth.NonCachingHttpClient", null,
+
+ /** {@inheritDoc} */
+ public synchronized HttpClient getObject() throws Exception {
+ DeprecationSupport.warnOnce(ObjectType.BEAN, "shibboleth.NonCachingHttpClient", null,
"shibboleth.HttpClientFactory");
+ return super.getObject();
}
-
+
}
\ No newline at end of file
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/InMemoryCachingHttpClientFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/InMemoryCachingHttpClientFactoryBean.java
index d1b2b4b..b7d363f 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/InMemoryCachingHttpClientFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/InMemoryCachingHttpClientFactoryBean.java
@@ -17,6 +17,8 @@
package net.shibboleth.idp.profile.spring.relyingparty.metadata.impl;
+import org.apache.http.client.HttpClient;
+
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
@@ -28,13 +30,12 @@ import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.Object
@Deprecated(forRemoval=true, since="4.0.0")
public class InMemoryCachingHttpClientFactoryBean
extends net.shibboleth.idp.profile.spring.relyingparty.metadata.InMemoryCachingHttpClientFactoryBean {
-
- /**
- * Constructor.
- */
- public InMemoryCachingHttpClientFactoryBean() {
- DeprecationSupport.warn(ObjectType.BEAN, "shibboleth.MemoryCachingHttpClient", null,
+
+ /** {@inheritDoc} */
+ public synchronized HttpClient getObject() throws Exception {
+ DeprecationSupport.warnOnce(ObjectType.BEAN, "shibboleth.MemoryCachingHttpClient", null,
"shibboleth.MemoryCachingHttpClientFactory");
+ return super.getObject();
}
-
-}
+
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list