Skip to content

Commit 3b53536

Browse files
committed
Update JDK
1 parent ecd687e commit 3b53536

File tree

174 files changed

+670
-829
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+670
-829
lines changed

jdk

Submodule jdk updated 3452 files

src/main/java/io/github/dmlloyd/classfile/AccessFlags.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,14 @@
2828
import java.util.Set;
2929

3030
import io.github.dmlloyd.classfile.impl.AccessFlagsImpl;
31-
import io.github.dmlloyd.classfile.extras.PreviewFeature;
3231

3332
/**
3433
* Models the access flags for a class, method, or field. Delivered as a
3534
* {@link ClassElement}, {@link FieldElement}, or {@link MethodElement}
3635
* when traversing the corresponding model type.
3736
*
38-
* @since 22
37+
* @since 24
3938
*/
40-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
4139
public sealed interface AccessFlags
4240
extends ClassElement, MethodElement, FieldElement
4341
permits AccessFlagsImpl {

src/main/java/io/github/dmlloyd/classfile/Annotation.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import io.github.dmlloyd.classfile.impl.AnnotationImpl;
3636
import io.github.dmlloyd.classfile.impl.TemporaryConstantPool;
3737
import io.github.dmlloyd.classfile.impl.Util;
38-
import io.github.dmlloyd.classfile.extras.PreviewFeature;
3938

4039
/**
4140
* Models an {@code annotation} structure (JVMS {@jvms 4.7.16}) or part of a {@code
@@ -63,9 +62,8 @@
6362
* @see RuntimeVisibleParameterAnnotationsAttribute
6463
* @see RuntimeInvisibleParameterAnnotationsAttribute
6564
*
66-
* @since 22
65+
* @since 24
6766
*/
68-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
6967
public sealed interface Annotation
7068
permits AnnotationImpl {
7169

src/main/java/io/github/dmlloyd/classfile/AnnotationElement.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
import io.github.dmlloyd.classfile.impl.AnnotationImpl;
3131
import io.github.dmlloyd.classfile.impl.TemporaryConstantPool;
32-
import io.github.dmlloyd.classfile.extras.PreviewFeature;
3332

3433
/**
3534
* Models an element-value pair in the {@code element_value_pairs}
@@ -43,9 +42,8 @@
4342
* @see Annotation
4443
* @see AnnotationValue
4544
*
46-
* @since 22
45+
* @since 24
4746
*/
48-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
4947
public sealed interface AnnotationElement
5048
permits AnnotationImpl.AnnotationElementImpl {
5149

src/main/java/io/github/dmlloyd/classfile/AnnotationValue.java

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import io.github.dmlloyd.classfile.impl.AnnotationImpl;
3434
import io.github.dmlloyd.classfile.impl.TemporaryConstantPool;
3535
import io.github.dmlloyd.classfile.impl.Util;
36-
import io.github.dmlloyd.classfile.extras.PreviewFeature;
3736

3837
import static java.util.Objects.requireNonNull;
3938

@@ -48,18 +47,16 @@
4847
* @see AnnotationElement
4948
*
5049
* @sealedGraph
51-
* @since 22
50+
* @since 24
5251
*/
53-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
5452
public sealed interface AnnotationValue {
5553

5654
/**
5755
* Models an annotation value of an element-value pair.
5856
* The {@linkplain #tag tag} of this value is {@value TAG_ANNOTATION}.
5957
*
60-
* @since 22
58+
* @since 24
6159
*/
62-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
6360
sealed interface OfAnnotation extends AnnotationValue
6461
permits AnnotationImpl.OfAnnotationImpl {
6562
/** {@return the annotation value} */
@@ -70,9 +67,8 @@ sealed interface OfAnnotation extends AnnotationValue
7067
* Models an array value of an element-value pair.
7168
* The {@linkplain #tag tag} of this value is {@value TAG_ARRAY}.
7269
*
73-
* @since 22
70+
* @since 24
7471
*/
75-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
7672
sealed interface OfArray extends AnnotationValue
7773
permits AnnotationImpl.OfArrayImpl {
7874
/**
@@ -88,12 +84,11 @@ sealed interface OfArray extends AnnotationValue
8884
}
8985

9086
/**
91-
* Models a constant-valued element
87+
* Models a constant value of an element-value pair.
9288
*
9389
* @sealedGraph
94-
* @since 22
90+
* @since 24
9591
*/
96-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
9792
sealed interface OfConstant extends AnnotationValue {
9893
/**
9994
* {@return the constant pool entry backing this constant element}
@@ -128,9 +123,8 @@ sealed interface OfConstant extends AnnotationValue {
128123
* Models a string value of an element-value pair.
129124
* The {@linkplain #tag tag} of this value is {@value TAG_STRING}.
130125
*
131-
* @since 22
126+
* @since 24
132127
*/
133-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
134128
sealed interface OfString extends OfConstant
135129
permits AnnotationImpl.OfStringImpl {
136130
/** {@return the backing UTF8 entry} */
@@ -156,9 +150,8 @@ default String resolvedValue() {
156150
* Models a double value of an element-value pair.
157151
* The {@linkplain #tag tag} of this value is {@value TAG_DOUBLE}.
158152
*
159-
* @since 22
153+
* @since 24
160154
*/
161-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
162155
sealed interface OfDouble extends OfConstant
163156
permits AnnotationImpl.OfDoubleImpl {
164157
/** {@return the backing double entry} */
@@ -184,9 +177,8 @@ default Double resolvedValue() {
184177
* Models a float value of an element-value pair.
185178
* The {@linkplain #tag tag} of this value is {@value TAG_FLOAT}.
186179
*
187-
* @since 22
180+
* @since 24
188181
*/
189-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
190182
sealed interface OfFloat extends OfConstant
191183
permits AnnotationImpl.OfFloatImpl {
192184
/** {@return the backing float entry} */
@@ -212,9 +204,8 @@ default Float resolvedValue() {
212204
* Models a long value of an element-value pair.
213205
* The {@linkplain #tag tag} of this value is {@value TAG_LONG}.
214206
*
215-
* @since 22
207+
* @since 24
216208
*/
217-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
218209
sealed interface OfLong extends OfConstant
219210
permits AnnotationImpl.OfLongImpl {
220211
/** {@return the backing long entry} */
@@ -240,9 +231,8 @@ default Long resolvedValue() {
240231
* Models an int value of an element-value pair.
241232
* The {@linkplain #tag tag} of this value is {@value TAG_INT}.
242233
*
243-
* @since 22
234+
* @since 24
244235
*/
245-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
246236
sealed interface OfInt extends OfConstant
247237
permits AnnotationImpl.OfIntImpl {
248238
/** {@return the backing integer entry} */
@@ -268,9 +258,8 @@ default Integer resolvedValue() {
268258
* Models a short value of an element-value pair.
269259
* The {@linkplain #tag tag} of this value is {@value TAG_SHORT}.
270260
*
271-
* @since 22
261+
* @since 24
272262
*/
273-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
274263
sealed interface OfShort extends OfConstant
275264
permits AnnotationImpl.OfShortImpl {
276265
/** {@return the backing integer entry} */
@@ -299,9 +288,8 @@ default Short resolvedValue() {
299288
* Models a char value of an element-value pair.
300289
* The {@linkplain #tag tag} of this value is {@value TAG_CHAR}.
301290
*
302-
* @since 22
291+
* @since 24
303292
*/
304-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
305293
sealed interface OfChar extends OfConstant
306294
permits AnnotationImpl.OfCharImpl {
307295
/** {@return the backing integer entry} */
@@ -330,9 +318,8 @@ default Character resolvedValue() {
330318
* Models a byte value of an element-value pair.
331319
* The {@linkplain #tag tag} of this value is {@value TAG_BYTE}.
332320
*
333-
* @since 22
321+
* @since 24
334322
*/
335-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
336323
sealed interface OfByte extends OfConstant
337324
permits AnnotationImpl.OfByteImpl {
338325
/** {@return the backing integer entry} */
@@ -361,10 +348,9 @@ default Byte resolvedValue() {
361348
* Models a boolean value of an element-value pair.
362349
* The {@linkplain #tag tag} of this value is {@value TAG_BOOLEAN}.
363350
*
364-
* @since 22
351+
* @since 24
365352
*/
366-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
367-
sealed interface OfBoolean extends AnnotationValue.OfConstant
353+
sealed interface OfBoolean extends OfConstant
368354
permits AnnotationImpl.OfBooleanImpl {
369355
/** {@return the backing integer entry} */
370356
@Override
@@ -392,9 +378,8 @@ default Boolean resolvedValue() {
392378
* Models a class value of an element-value pair.
393379
* The {@linkplain #tag tag} of this value is {@value TAG_CLASS}.
394380
*
395-
* @since 22
381+
* @since 24
396382
*/
397-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
398383
sealed interface OfClass extends AnnotationValue
399384
permits AnnotationImpl.OfClassImpl {
400385
/** {@return the class descriptor string} */
@@ -410,9 +395,8 @@ default ClassDesc classSymbol() {
410395
* Models an enum value of an element-value pair.
411396
* The {@linkplain #tag tag} of this value is {@value TAG_ENUM}.
412397
*
413-
* @since 22
398+
* @since 24
414399
*/
415-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
416400
sealed interface OfEnum extends AnnotationValue
417401
permits AnnotationImpl.OfEnumImpl {
418402
/** {@return the enum class descriptor string} */

src/main/java/io/github/dmlloyd/classfile/Attribute.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
package io.github.dmlloyd.classfile;
2626

2727
import io.github.dmlloyd.classfile.attribute.*;
28+
import io.github.dmlloyd.classfile.constantpool.Utf8Entry;
2829

2930
import io.github.dmlloyd.classfile.impl.BoundAttribute;
3031
import io.github.dmlloyd.classfile.impl.UnboundAttribute;
31-
import io.github.dmlloyd.classfile.extras.PreviewFeature;
3232

3333
/**
3434
* Models a classfile attribute (JVMS {@jvms 4.7}). Many, though not all, subtypes of
@@ -41,9 +41,8 @@
4141
* @param <A> the attribute type
4242
*
4343
* @sealedGraph
44-
* @since 22
44+
* @since 24
4545
*/
46-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
4746
public sealed interface Attribute<A extends Attribute<A>>
4847
extends ClassFileElement
4948
permits AnnotationDefaultAttribute, BootstrapMethodsAttribute,
@@ -65,7 +64,7 @@ public sealed interface Attribute<A extends Attribute<A>>
6564
/**
6665
* {@return the name of the attribute}
6766
*/
68-
String attributeName();
67+
Utf8Entry attributeName();
6968

7069
/**
7170
* {@return the {@link AttributeMapper} associated with this attribute}

src/main/java/io/github/dmlloyd/classfile/AttributeMapper.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
*/
2525
package io.github.dmlloyd.classfile;
2626

27-
import io.github.dmlloyd.classfile.extras.PreviewFeature;
28-
2927
/**
3028
* Bidirectional mapper between the classfile representation of an attribute and
3129
* how that attribute is modeled in the API. The attribute mapper is used
@@ -37,17 +35,15 @@
3735
* CustomAttribute}.
3836
* @param <A> the attribute type
3937
*
40-
* @since 22
38+
* @since 24
4139
*/
42-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
4340
public interface AttributeMapper<A extends Attribute<A>> {
4441

4542
/**
4643
* Attribute stability indicator
4744
*
48-
* @since 22
45+
* @since 24
4946
*/
50-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
5147
enum AttributeStability {
5248

5349
/**

src/main/java/io/github/dmlloyd/classfile/AttributedElement.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import java.util.Optional;
3232

3333
import io.github.dmlloyd.classfile.impl.AbstractUnboundModel;
34-
import io.github.dmlloyd.classfile.extras.PreviewFeature;
3534

3635
import static java.util.Objects.requireNonNull;
3736

@@ -40,9 +39,8 @@
4039
* as a class, field, method, code attribute, or record component.
4140
*
4241
* @sealedGraph
43-
* @since 22
42+
* @since 24
4443
*/
45-
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
4644
public sealed interface AttributedElement extends ClassFileElement
4745
permits ClassModel, CodeModel, FieldModel, MethodModel,
4846
RecordComponentInfo, AbstractUnboundModel {

0 commit comments

Comments
 (0)