From 4c352f2d461a4248721fc710f2ae0dc9dd120538 Mon Sep 17 00:00:00 2001 From: Xue-Lei Andrew Fan Date: Wed, 27 Jul 2016 02:47:04 +0000 Subject: [PATCH] 8161898: Mark the use of deprecated javax.security.cert APIs with forRemoval=true Reviewed-by: vinnie, mullan --- .../classes/javax/net/ssl/HandshakeCompletedEvent.java | 7 ++++--- .../java.base/share/classes/javax/net/ssl/SSLSession.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java b/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java index fb5b8ed704d..1317f0021f4 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java @@ -153,10 +153,11 @@ public class HandshakeCompletedEvent extends EventObject * @exception SSLPeerUnverifiedException if the peer is not verified. * @see #getPeerPrincipal() * @deprecated The {@link #getPeerCertificates()} method that returns an - * array of {@code java.security.cert.Certificate} should - * be used instead. + * array of {@code java.security.cert.Certificate} should + * be used instead. This method is subject to removal in + * a future version of Java SE. */ - @Deprecated + @Deprecated(since="9", forRemoval=true) public javax.security.cert.X509Certificate [] getPeerCertificateChain() throws SSLPeerUnverifiedException { diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java index 7f6b0efa3dc..2a04e159728 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java @@ -273,10 +273,11 @@ public interface SSLSession { * has not been verified * @see #getPeerPrincipal() * @deprecated The {@link #getPeerCertificates()} method that returns an - * array of {@code java.security.cert.Certificate} should - * be used instead. + * array of {@code java.security.cert.Certificate} should + * be used instead. This method is subject to removal in + * a future version of Java SE. */ - @Deprecated + @Deprecated(since="9", forRemoval=true) public javax.security.cert.X509Certificate [] getPeerCertificateChain() throws SSLPeerUnverifiedException;