RFR: 8047721: @since should have JDK version

Bradford Wetmore bradford.wetmore at oracle.com
Mon Jun 23 17:04:34 UTC 2014


I would prefer that JCE1.2 be pulled out completely in the Cipher* 
classes.  I will be sending you a separate note about JCE logistics.

Thanks for doing this cleanup.

Brad


On 6/20/2014 11:46 AM, Henry Jen wrote:
> Hi,
>
> Please review a trivial webrev to add JDK version to @since in a format
> as Mark suggested[1].
>
> http://cr.openjdk.java.net/~henryjen/jdk9/8047721/0/webrev/
>
> [1] http://mail.openjdk.java.net/pipermail/jdk9-dev/2014-June/000806.html
>
> Appened is the diff as in the webrev.
>
> Cheers,
> Henry
>
>
> diff --git a/src/share/classes/java/lang/Package.java
> b/src/share/classes/java/lang/Package.java
> --- a/src/share/classes/java/lang/Package.java
> +++ b/src/share/classes/java/lang/Package.java
> @@ -107,6 +107,7 @@
>    * loader to be found.
>    *
>    * @see ClassLoader#definePackage
> + * @since 1.2
>    */
>   public class Package implements java.lang.reflect.AnnotatedElement {
>       /**
> diff --git a/src/share/classes/javax/crypto/CipherInputStream.java
> b/src/share/classes/javax/crypto/CipherInputStream.java
> --- a/src/share/classes/javax/crypto/CipherInputStream.java
> +++ b/src/share/classes/javax/crypto/CipherInputStream.java
> @@ -170,7 +170,7 @@
>        * @return  the next byte of data, or <code>-1</code> if the end
> of the
>        *          stream is reached.
>        * @exception  IOException  if an I/O error occurs.
> -     * @since JCE1.2
> +     * @since 1.4, JCE1.2
>        */
>       public int read() throws IOException {
>           if (ostart >= ofinish) {
> @@ -196,7 +196,7 @@
>        *             the stream has been reached.
>        * @exception  IOException  if an I/O error occurs.
>        * @see        java.io.InputStream#read(byte[], int, int)
> -     * @since      JCE1.2
> +     * @since      1.4, JCE1.2
>        */
>       public int read(byte b[]) throws IOException {
>           return read(b, 0, b.length);
> @@ -217,7 +217,7 @@
>        *             the stream has been reached.
>        * @exception  IOException  if an I/O error occurs.
>        * @see        java.io.InputStream#read()
> -     * @since      JCE1.2
> +     * @since      1.4, JCE1.2
>        */
>       public int read(byte b[], int off, int len) throws IOException {
>           if (ostart >= ofinish) {
> @@ -254,7 +254,7 @@
>        * @param      n the number of bytes to be skipped.
>        * @return     the actual number of bytes skipped.
>        * @exception  IOException  if an I/O error occurs.
> -     * @since JCE1.2
> +     * @since 1.4, JCE1.2
>        */
>       public long skip(long n) throws IOException {
>           int available = ofinish - ostart;
> @@ -277,7 +277,7 @@
>        * @return     the number of bytes that can be read from this
> input stream
>        *             without blocking.
>        * @exception  IOException  if an I/O error occurs.
> -     * @since      JCE1.2
> +     * @since      1.4, JCE1.2
>        */
>       public int available() throws IOException {
>           return (ofinish - ostart);
> @@ -292,7 +292,7 @@
>        * stream.
>        *
>        * @exception  IOException  if an I/O error occurs.
> -     * @since JCE1.2
> +     * @since 1.4, JCE1.2
>        */
>       public void close() throws IOException {
>           if (closed) {
> @@ -321,7 +321,7 @@
>        *          <code>mark</code> and <code>reset</code> methods.
>        * @see     java.io.InputStream#mark(int)
>        * @see     java.io.InputStream#reset()
> -     * @since   JCE1.2
> +     * @since   1.4, JCE1.2
>        */
>       public boolean markSupported() {
>           return false;
> diff --git a/src/share/classes/javax/crypto/CipherOutputStream.java
> b/src/share/classes/javax/crypto/CipherOutputStream.java
> --- a/src/share/classes/javax/crypto/CipherOutputStream.java
> +++ b/src/share/classes/javax/crypto/CipherOutputStream.java
> @@ -114,7 +114,7 @@
>        *
>        * @param      b   the <code>byte</code>.
>        * @exception  IOException  if an I/O error occurs.
> -     * @since      JCE1.2
> +     * @since      1.4, JCE1.2
>        */
>       public void write(int b) throws IOException {
>           ibuffer[0] = (byte) b;
> @@ -138,7 +138,7 @@
>        * @exception  NullPointerException if <code>b</code> is null.
>        * @exception  IOException  if an I/O error occurs.
>        * @see        javax.crypto.CipherOutputStream#write(byte[], int,
> int)
> -     * @since JCE1.2
> +     * @since 1.4, JCE1.2
>        */
>       public void write(byte b[]) throws IOException {
>           write(b, 0, b.length);
> @@ -152,7 +152,7 @@
>        * @param      off   the start offset in the data.
>        * @param      len   the number of bytes to write.
>        * @exception  IOException  if an I/O error occurs.
> -     * @since      JCE1.2
> +     * @since      1.4, JCE1.2
>        */
>       public void write(byte b[], int off, int len) throws IOException {
>           obuffer = cipher.update(b, off, len);
> @@ -174,7 +174,7 @@
>        * the cipher's block size, no bytes will be written out.
>        *
>        * @exception  IOException  if an I/O error occurs.
> -     * @since      JCE1.2
> +     * @since      1.4, JCE1.2
>        */
>       public void flush() throws IOException {
>           if (obuffer != null) {
> @@ -198,7 +198,7 @@
>        * stream.
>        *
>        * @exception  IOException  if an I/O error occurs.
> -     * @since      JCE1.2
> +     * @since      1.4, JCE1.2
>        */
>       public void close() throws IOException {
>           if (closed) {
> diff --git a/src/share/classes/javax/naming/InitialContext.java
> b/src/share/classes/javax/naming/InitialContext.java
> --- a/src/share/classes/javax/naming/InitialContext.java
> +++ b/src/share/classes/javax/naming/InitialContext.java
> @@ -125,7 +125,7 @@
>    * @see Context
>    * @see NamingManager#setInitialContextFactoryBuilder
>    *      NamingManager.setInitialContextFactoryBuilder
> - * @since JNDI 1.1 / Java 2 Platform, Standard Edition, v 1.3
> + * @since 1.3, JNDI 1.1
>    */
>
>   public class InitialContext implements Context {
>


More information about the security-dev mailing list