[java-support] branch master updated: Warnings, deprecations.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 13 14:24:04 EDT 2017
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-support.
View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=7802ed3dfa6e256d1551f0c9944c1c34c82611a6
The following commit(s) were added to refs/heads/master by this push:
new 7802ed3 Warnings, deprecations.
7802ed3 is described below
commit 7802ed3dfa6e256d1551f0c9944c1c34c82611a6
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 13 14:24:06 2017 -0400
Warnings, deprecations.
---
.../java/support/httpclient/HttpClientSupport.java | 13 ++++++++++++-
.../utilities/java/support/net/URISupport.java | 1 +
.../utilities/java/support/primitive/TimerSupport.java | 17 +++++++++++------
3 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
index b91e1c2..d58b364 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
@@ -47,6 +47,9 @@ import org.apache.http.entity.ContentType;
import org.apache.http.protocol.HTTP;
import org.apache.http.util.CharArrayBuffer;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+
/**
* Support class for using {@link org.apache.http.client.HttpClient} and related components.
*/
@@ -92,6 +95,10 @@ public final class HttpClientSupport {
*/
@Deprecated
@Nonnull public static SSLConnectionSocketFactory buildStrictSSLConnectionSocketFactory() {
+ DeprecationSupport.warnOnce(ObjectType.METHOD,
+ "net.shibboleth.utilities.java.support.httpclient.HttpClientSupport" +
+ ".buildStrictSSLConnectionSocketFactory", null, "buildStrictTLSSocketFactory");
+
return new SSLConnectionSocketFactory(
SSLContexts.createDefault(),
SSLConnectionSocketFactory.STRICT_HOSTNAME_VERIFIER);
@@ -107,6 +114,10 @@ public final class HttpClientSupport {
*/
@Deprecated
@Nonnull public static SSLConnectionSocketFactory buildNoTrustSSLConnectionSocketFactory() {
+ DeprecationSupport.warnOnce(ObjectType.METHOD,
+ "net.shibboleth.utilities.java.support.httpclient.HttpClientSupport" +
+ ".buildNoTrustSSLConnectionSocketFactory", null, "buildNoTrustTLSSocketFactory");
+
final X509TrustManager noTrustManager = buildNoTrustX509TrustManager();
try {
@@ -116,7 +127,7 @@ public final class HttpClientSupport {
} catch (final NoSuchAlgorithmException e) {
throw new RuntimeException("TLS SSLContext type is required to be supported by the JVM but is not", e);
} catch (final KeyManagementException e) {
- throw new RuntimeException("Some how the trust everything trust manager didn't trust everything", e);
+ throw new RuntimeException("Somehow the trust everything trust manager didn't trust everything", e);
}
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java b/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
index 3b94ecf..946239e 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
@@ -394,6 +394,7 @@ public final class URISupport {
*
* @deprecated
*/
+ @Deprecated
public static String doURLEncode(final String value) {
if (value == null) {
return null;
diff --git a/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java b/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
index b27b847..138c927 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
@@ -37,7 +37,8 @@ public final class TimerSupport {
*
* <p>The base name will constructed as follows:
* <ul>
- * <li>if target is instance of {@link IdentifiedComponent}, use {@link IdentifiedComponent#getId()} if non-empty</li>
+ * <li>if target is instance of {@link IdentifiedComponent},
+ * use {@link IdentifiedComponent#getId()} if non-empty</li>
* <li>use {@link #toString()} if non-empty</li>
* <li>use serialized class name</li>
* </ul>
@@ -46,7 +47,7 @@ public final class TimerSupport {
* @param obj the target object instance to evaluate
* @return an appropriate name for a Timer owned by the specified object
*/
- @Nonnull @NotEmpty public static String getTimerName(final @Nonnull Object obj) {
+ @Nonnull @NotEmpty public static String getTimerName(@Nonnull final Object obj) {
return getTimerName(obj, null);
}
@@ -55,7 +56,8 @@ public final class TimerSupport {
*
* <p>The base name will constructed as follows:
* <ul>
- * <li>if target is instance of {@link IdentifiedComponent}, use {@link IdentifiedComponent#getId()} if non-empty</li>
+ * <li>if target is instance of {@link IdentifiedComponent},
+ * use {@link IdentifiedComponent#getId()} if non-empty</li>
* <li>use {@link #toString()} if non-empty</li>
* <li>use serialized class name</li>
* </ul>
@@ -65,11 +67,13 @@ public final class TimerSupport {
* @param additionalData additional qualifying data to include in the name
* @return an appropriate name for a Timer owned by the specified object
*/
- @Nonnull @NotEmpty public static String getTimerName(final @Nonnull Object obj, final @Nullable String additionalData) {
+ @Nonnull @NotEmpty public static String getTimerName(@Nonnull final Object obj,
+ @Nullable final String additionalData) {
Constraint.isNotNull(obj, "Target object for Timer was null");
String baseName = null;
- if (obj instanceof IdentifiedComponent && StringSupport.trimOrNull(((IdentifiedComponent)obj).getId()) != null) {
+ if (obj instanceof IdentifiedComponent
+ && StringSupport.trimOrNull(((IdentifiedComponent)obj).getId()) != null) {
baseName = StringSupport.trimOrNull(((IdentifiedComponent)obj).getId());
} else if (StringSupport.trimOrNull(obj.toString()) != null){
baseName = StringSupport.trimOrNull(obj.toString());
@@ -87,7 +91,8 @@ public final class TimerSupport {
* @param additionalData additional qualifying data to include in the name
* @return an appropriate name for a Timer based on the specified base name
*/
- @Nonnull @NotEmpty public static String getTimerName(final @Nonnull String baseName, final @Nullable String additionalData) {
+ @Nonnull @NotEmpty public static String getTimerName(@Nonnull final String baseName,
+ @Nullable final String additionalData) {
Constraint.isNotNull(baseName, "Base name for Timer was null");
if (additionalData != null) {
return String.format("Timer for %s (%s)", baseName, additionalData);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list