changeset 52901:e4624753b153 jep-334

adding since 12 to API, missing copyright, etc
author vromero
date Fri, 19 Oct 2018 13:23:31 -0400
parents 533a0c8e1567
children 9b2652a213e2
files src/java.base/share/classes/java/lang/Enum.java src/java.base/share/classes/java/lang/constant/ClassDesc.java src/java.base/share/classes/java/lang/constant/Constable.java src/java.base/share/classes/java/lang/constant/ConstantDesc.java src/java.base/share/classes/java/lang/constant/ConstantDescs.java src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java src/java.base/share/classes/java/lang/constant/package-info.java src/java.base/share/classes/java/lang/invoke/TypeDescriptor.java src/java.base/share/classes/java/lang/invoke/VarHandle.java src/java.base/share/classes/module-info.java test/jdk/java/lang/constant/ClassDescTest.java test/jdk/java/lang/constant/CondyDescTest.java test/jdk/java/lang/constant/MethodHandleDescTest.java test/jdk/java/lang/constant/MethodTypeDescTest.java test/jdk/java/lang/constant/SymbolicDescTest.java test/jdk/java/lang/constant/TestHelpers.java test/jdk/java/lang/constant/TypeDescriptorTest.java
diffstat 21 files changed, 58 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/java/lang/Enum.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/Enum.java	Fri Oct 19 13:23:31 2018 -0400
@@ -279,6 +279,8 @@
      * {@code enum} constant.
      *
      * @param <E> the type of the enum constant
+     *
+     * @since 12
      */
     public static final class EnumDesc<E extends Enum<E>>
             extends DynamicConstantDesc<E> {
--- a/src/java.base/share/classes/java/lang/constant/ClassDesc.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/constant/ClassDesc.java	Fri Oct 19 13:23:31 2018 -0400
@@ -54,6 +54,8 @@
  * {@linkplain ClassDesc} directly.
  *
  * @see ConstantDescs
+ *
+ * @since 12
  */
 public interface ClassDesc
         extends ConstantDesc<Class<?>>,
--- a/src/java.base/share/classes/java/lang/constant/Constable.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/constant/Constable.java	Fri Oct 19 13:23:31 2018 -0400
@@ -62,6 +62,8 @@
  * @jvms 4.4.10 The CONSTANT_InvokeDynamic_info Structure
  *
  * @param <T> the type of the constant value
+ *
+ * @since 12
  */
 public interface Constable<T> {
     /**
--- a/src/java.base/share/classes/java/lang/constant/ConstantDesc.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/constant/ConstantDesc.java	Fri Oct 19 13:23:31 2018 -0400
@@ -81,6 +81,8 @@
  * @see ConstantDescs
  *
  * @jvms 4.4 The Constant Pool
+ *
+ * @since 12
  */
 public interface ConstantDesc<T> {
     /**
--- a/src/java.base/share/classes/java/lang/constant/ConstantDescs.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/constant/ConstantDescs.java	Fri Oct 19 13:23:31 2018 -0400
@@ -47,6 +47,8 @@
  * bootstrap methods.
  *
  * @see ConstantDesc
+ *
+ * @since 12
  */
 public final class ConstantDescs {
     // No instances
--- a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java	Fri Oct 19 13:23:31 2018 -0400
@@ -50,6 +50,8 @@
  * may become a {@code sealed} interface, which would prohibit subclassing except
  * by explicitly permitted types.  Non-platform classes should not implement
  * {@linkplain DirectMethodHandleDesc} directly.
+ *
+ * @since 12
  */
 public interface DirectMethodHandleDesc extends MethodHandleDesc {
     /**
--- a/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java	Fri Oct 19 13:23:31 2018 -0400
@@ -43,6 +43,8 @@
  *
  * <p>Concrete subtypes of {@linkplain DynamicCallSiteDesc} must be
  * <a href="../doc-files/ValueBased.html">value-based</a>.
+ *
+ * @since 12
  */
 public class DynamicCallSiteDesc {
 
--- a/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java	Fri Oct 19 13:23:31 2018 -0400
@@ -53,6 +53,8 @@
  * <a href="../doc-files/ValueBased.html">value-based</a>.
  *
  * @param <T> the type of the dynamic constant
+ *
+ * @since 12
  */
 public abstract class DynamicConstantDesc<T>
         implements ConstantDesc<T> {
--- a/src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java	Fri Oct 19 13:23:31 2018 -0400
@@ -38,6 +38,8 @@
  * may become a {@code sealed} interface, which would prohibit subclassing except
  * by explicitly permitted types.  Non-platform classes should not implement
  * {@linkplain MethodHandleDesc} directly.
+ *
+ * @since 12
  */
 public interface MethodHandleDesc
         extends ConstantDesc<MethodHandle> {
--- a/src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java	Fri Oct 19 13:23:31 2018 -0400
@@ -38,6 +38,8 @@
  * may become a {@code sealed} interface, which would prohibit subclassing except
  * by explicitly permitted types.  Non-platform classes should not implement
  * {@linkplain MethodTypeDesc} directly.
+ *
+ * @since 12
  */
 public interface MethodTypeDesc
         extends ConstantDesc<MethodType>,
--- a/src/java.base/share/classes/java/lang/constant/package-info.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/constant/package-info.java	Fri Oct 19 13:23:31 2018 -0400
@@ -90,6 +90,7 @@
  * reading and writing APIs.
  *
  * @jvms 4.4 The Constant Pool
+ *
+ * @since 12
  */
 package java.lang.constant;
-
--- a/src/java.base/share/classes/java/lang/invoke/TypeDescriptor.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/invoke/TypeDescriptor.java	Fri Oct 19 13:23:31 2018 -0400
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
 package java.lang.invoke;
 
 import java.util.List;
@@ -6,6 +30,8 @@
  * An entity that has a field or method type descriptor, as per JVMS 4.3.2 or 4.3.3.
  * @jvms 4.3.2 Field Descriptors
  * @jvms 4.3.3 Method Descriptors
+ *
+ * @since 12
  */
 public interface TypeDescriptor {
     /**
--- a/src/java.base/share/classes/java/lang/invoke/VarHandle.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/java/lang/invoke/VarHandle.java	Fri Oct 19 13:23:31 2018 -0400
@@ -1885,8 +1885,6 @@
 
     @Override
     public final String toString() {
-        // @@@ defer to concrete type for additional description
-        // see https://bugs.openjdk.java.net/browse/JDK-8199149
         return String.format("VarHandle[varType=%s, coord=%s]",
                              varType().getName(),
                              coordinateTypes());
@@ -2127,6 +2125,8 @@
     /**
      * A <a href="package-summary.html#nominal">nominal descriptor</a> for a
      * {@link VarHandle} constant.
+     *
+     * @since 12
      */
     public static final class VarHandleDesc extends DynamicConstantDesc<VarHandle> {
 
--- a/src/java.base/share/classes/module-info.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/src/java.base/share/classes/module-info.java	Fri Oct 19 13:23:31 2018 -0400
@@ -79,11 +79,11 @@
     exports java.io;
     exports java.lang;
     exports java.lang.annotation;
+    exports java.lang.constant;
     exports java.lang.invoke;
     exports java.lang.module;
     exports java.lang.ref;
     exports java.lang.reflect;
-    exports java.lang.constant;
     exports java.math;
     exports java.net;
     exports java.net.spi;
--- a/test/jdk/java/lang/constant/ClassDescTest.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/test/jdk/java/lang/constant/ClassDescTest.java	Fri Oct 19 13:23:31 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
--- a/test/jdk/java/lang/constant/CondyDescTest.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/test/jdk/java/lang/constant/CondyDescTest.java	Fri Oct 19 13:23:31 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
--- a/test/jdk/java/lang/constant/MethodHandleDescTest.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/test/jdk/java/lang/constant/MethodHandleDescTest.java	Fri Oct 19 13:23:31 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
--- a/test/jdk/java/lang/constant/MethodTypeDescTest.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/test/jdk/java/lang/constant/MethodTypeDescTest.java	Fri Oct 19 13:23:31 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
--- a/test/jdk/java/lang/constant/SymbolicDescTest.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/test/jdk/java/lang/constant/SymbolicDescTest.java	Fri Oct 19 13:23:31 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
--- a/test/jdk/java/lang/constant/TestHelpers.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/test/jdk/java/lang/constant/TestHelpers.java	Fri Oct 19 13:23:31 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
--- a/test/jdk/java/lang/constant/TypeDescriptorTest.java	Thu Oct 18 12:24:26 2018 -0700
+++ b/test/jdk/java/lang/constant/TypeDescriptorTest.java	Fri Oct 19 13:23:31 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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