8160247: Mark deprecated javax.security.cert APIs with forRemoval=true

Reviewed-by: weijun
This commit is contained in:
Xue-Lei Andrew Fan 2019-03-13 07:14:50 -07:00
parent d845c397ea
commit 42cb9bf51a
13 changed files with 36 additions and 24 deletions

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -51,7 +51,8 @@ import java.util.Vector;
*
* @author Jeff Nisewanger
*/
@Deprecated
@SuppressWarnings("removal")
@Deprecated(since="9", forRemoval=true)
public class X509V1CertImpl extends X509Certificate implements Serializable {
static final long serialVersionUID = -2048442350420423405L;
private java.security.cert.X509Certificate wrappedCert;

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -162,7 +162,8 @@ public class HandshakeCompletedEvent extends EventObject
* array of {@code java.security.cert.Certificate} should
* be used instead.
*/
@Deprecated(since="9")
@SuppressWarnings("removal")
@Deprecated(since="9", forRemoval=true)
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
throws SSLPeerUnverifiedException
{

View File

@ -282,7 +282,8 @@ public interface SSLSession {
* array of {@code java.security.cert.Certificate} should
* be used instead.
*/
@Deprecated(since="9")
@SuppressWarnings("removal")
@Deprecated(since="9", forRemoval=true)
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
throws SSLPeerUnverifiedException;

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -61,7 +61,8 @@ import java.security.SignatureException;
*
* @author Hemma Prafullchandra
*/
@Deprecated(since="9")
@SuppressWarnings("removal")
@Deprecated(since="9", forRemoval=true)
public abstract class Certificate {
/**

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,7 +40,8 @@ package javax.security.cert;
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
@Deprecated(since="9")
@SuppressWarnings("removal")
@Deprecated(since="9", forRemoval=true)
public class CertificateEncodingException extends CertificateException {
private static final long serialVersionUID = -8187642723048403470L;

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,7 +40,7 @@ package javax.security.cert;
* @see Certificate
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
@Deprecated(since="9")
@Deprecated(since="9", forRemoval=true)
public class CertificateException extends Exception {
private static final long serialVersionUID = -5757213374030785290L;

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,7 +42,8 @@ package javax.security.cert;
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
@Deprecated(since="9")
@SuppressWarnings("removal")
@Deprecated(since="9", forRemoval=true)
public class CertificateExpiredException extends CertificateException {
private static final long serialVersionUID = 5091601212177261883L;

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,7 +42,8 @@ package javax.security.cert;
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
@Deprecated(since="9")
@SuppressWarnings("removal")
@Deprecated(since="9", forRemoval=true)
public class CertificateNotYetValidException extends CertificateException {
private static final long serialVersionUID = -8976172474266822818L;

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,7 +41,8 @@ package javax.security.cert;
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
@Deprecated(since="9")
@SuppressWarnings("removal")
@Deprecated(since="9", forRemoval=true)
public class CertificateParsingException extends CertificateException {
private static final long serialVersionUID = -8449352422951136229L;

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -126,7 +126,8 @@ import java.util.Date;
* @see java.security.Security security properties
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
@Deprecated(since="9")
@SuppressWarnings("removal")
@Deprecated(since="9", forRemoval=true)
public abstract class X509Certificate extends Certificate {
/*

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -597,7 +597,8 @@ final class SSLSessionImpl extends ExtendedSSLSession {
* Use {@code getPeerCertificates()} instead.
*/
@Override
@Deprecated
@SuppressWarnings("removal")
@Deprecated(since="9", forRemoval=true)
public javax.security.cert.X509Certificate[] getPeerCertificateChain()
throws SSLPeerUnverifiedException {
//

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -92,7 +92,8 @@ public class ImmutableExtendedSSLSession extends ExtendedSSLSession {
return delegate.getLocalCertificates();
}
@Deprecated
@SuppressWarnings("removal")
@Deprecated(since="11", forRemoval=true)
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
throws SSLPeerUnverifiedException {
return delegate.getPeerCertificateChain();

View File

@ -91,7 +91,8 @@ public class ImmutableSSLSession implements SSLSession {
return delegate.getLocalCertificates();
}
@Deprecated
@SuppressWarnings("removal")
@Deprecated(since="11", forRemoval=true)
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
throws SSLPeerUnverifiedException {
return delegate.getPeerCertificateChain();