11/*
2- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44 *
55 * This code is free software; you can redistribute it and/or modify it
3030 * @run main NoUnnecessaryLoadableDescriptorsTest
3131 */
3232
33- import com .sun .tools .classfile .*;
34- import com .sun .tools .classfile .ConstantPool .CONSTANT_Utf8_info ;
33+ import java .lang .classfile .Attributes ;
34+ import java .lang .classfile .ClassFile ;
35+ import java .lang .classfile .ClassModel ;
36+ import java .lang .classfile .attribute .LoadableDescriptorsAttribute ;
37+ import java .lang .classfile .constantpool .Utf8Entry ;
38+ import java .util .List ;
3539
3640public class NoUnnecessaryLoadableDescriptorsTest {
3741
@@ -50,80 +54,65 @@ static value class Inner2 {}
5054 }
5155
5256 public static void main (String [] args ) throws Exception {
57+ ClassModel cls ;
58+ LoadableDescriptorsAttribute loadableDescriptors ;
5359
5460 // There should be no LoadableDescriptors attribute in NoUnnecessaryLoadableDescriptorsTest.class
55- ClassFile cls = ClassFile .read (NoUnnecessaryLoadableDescriptorsTest .class .getResourceAsStream ("NoUnnecessaryLoadableDescriptorsTest.class" ));
56-
57- if (cls == null ) {
58- throw new AssertionError ("Could not locate the class files" );
61+ try (var in = NoUnnecessaryLoadableDescriptorsTest .class .getResourceAsStream ("NoUnnecessaryLoadableDescriptorsTest.class" )) {
62+ cls = ClassFile .of ().parse (in .readAllBytes ());
5963 }
6064
6165 /* Check emission of LoadableDescriptors attribute */
62- LoadableDescriptors_attribute LoadableDescriptors = (LoadableDescriptors_attribute ) cls .attributes .get (Attribute .LoadableDescriptors );
63- if (LoadableDescriptors != null ) {
66+ if (cls .findAttribute (Attributes .loadableDescriptors ()).isPresent ()) {
6467 throw new AssertionError ("Unexpected LoadableDescriptors attribute!" );
6568 }
6669
6770 // There should be no LoadableDescriptors attribute in NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest1.class
68- cls = ClassFile .read (NoUnnecessaryLoadableDescriptorsTest .class .getResourceAsStream ("NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest1.class" ));
69-
70- if (cls == null ) {
71- throw new AssertionError ("Could not locate the class files" );
71+ try (var in = NoUnnecessaryLoadableDescriptorsTest .class .getResourceAsStream ("NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest1.class" )) {
72+ cls = ClassFile .of ().parse (in .readAllBytes ());
7273 }
7374
7475 /* Check emission of LoadableDescriptors attribute */
75- LoadableDescriptors = (LoadableDescriptors_attribute ) cls .attributes .get (Attribute .LoadableDescriptors );
76- if (LoadableDescriptors != null ) {
76+ if (cls .findAttribute (Attributes .loadableDescriptors ()).isPresent ()) {
7777 throw new AssertionError ("Unexpected LoadableDescriptors attribute!" );
7878 }
7979
80- // There should be no LoadableDescriptors attribute in NoUnnecessaryLoadableDescriptorsTest$PreloadTest2.class
81- cls = ClassFile .read (NoUnnecessaryLoadableDescriptorsTest .class .getResourceAsStream ("NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest2.class" ));
82-
83- if (cls == null ) {
84- throw new AssertionError ("Could not locate the class files" );
80+ // There should be no LoadableDescriptors attribute in NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest2.class
81+ try (var in = NoUnnecessaryLoadableDescriptorsTest .class .getResourceAsStream ("NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest2.class" )) {
82+ cls = ClassFile .of ().parse (in .readAllBytes ());
8583 }
8684
8785 /* Check emission of LoadableDescriptors attribute */
88- LoadableDescriptors = (LoadableDescriptors_attribute ) cls .attributes .get (Attribute .LoadableDescriptors );
89- if (LoadableDescriptors != null ) {
86+ if (cls .findAttribute (Attributes .loadableDescriptors ()).isPresent ()) {
9087 throw new AssertionError ("Unexpected LoadableDescriptors attribute!" );
9188 }
9289
9390 // There should be no LoadableDescriptors attribute in NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest2$Inner2.class
94- cls = ClassFile .read (NoUnnecessaryLoadableDescriptorsTest .class .getResourceAsStream ("NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest2$Inner1$Inner2.class" ));
95-
96- if (cls == null ) {
97- throw new AssertionError ("Could not locate the class files" );
91+ try (var in = NoUnnecessaryLoadableDescriptorsTest .class .getResourceAsStream ("NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest2$Inner1$Inner2.class" )) {
92+ cls = ClassFile .of ().parse (in .readAllBytes ());
9893 }
9994
10095 /* Check emission of LoadableDescriptors attribute */
101- LoadableDescriptors = (LoadableDescriptors_attribute ) cls .attributes .get (Attribute .LoadableDescriptors );
102- if (LoadableDescriptors != null ) {
96+ if (cls .findAttribute (Attributes .loadableDescriptors ()).isPresent ()) {
10397 throw new AssertionError ("Unexpected LoadableDescriptors attribute!" );
10498 }
10599
106100 // There should be ONE LoadableDescriptors attribute entry in NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest2$Inner1.class
107- cls = ClassFile .read (NoUnnecessaryLoadableDescriptorsTest .class .getResourceAsStream ("NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest2$Inner1.class" ));
101+ try (var in = NoUnnecessaryLoadableDescriptorsTest .class .getResourceAsStream ("NoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest2$Inner1.class" )) {
102+ cls = ClassFile .of ().parse (in .readAllBytes ());
103+ }
108104
109105 if (cls == null ) {
110106 throw new AssertionError ("Could not locate the class files" );
111107 }
112108
113109 /* Check emission of LoadableDescriptors attribute */
114- LoadableDescriptors = (LoadableDescriptors_attribute ) cls .attributes .get (Attribute .LoadableDescriptors );
115- if (LoadableDescriptors == null ) {
116- throw new AssertionError ("Missing LoadableDescriptors attribute!" );
117- }
118-
119- if (LoadableDescriptors .number_of_descriptors != 1 ) {
120- throw new AssertionError ("Incorrect number of LoadableDescriptors classes" );
121- }
110+ loadableDescriptors = cls .findAttribute (Attributes .loadableDescriptors ()).orElseThrow ();
122111
123- CONSTANT_Utf8_info utf8Info = cls . constant_pool . getUTF8Info ( LoadableDescriptors . descriptors [ 0 ] );
124- System . err . println ( "utf8 " + utf8Info . value );
125- if (!utf8Info . value . equals ("LNoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest2$Inner1$Inner2;" )) {
126- throw new AssertionError ("Expected LoadableDescriptors class entry is missing , but found " + utf8Info . value );
112+ List < String > expected = List . of ( "LNoUnnecessaryLoadableDescriptorsTest$LoadableDescriptorsTest2$Inner1$Inner2;" );
113+ List < String > found = loadableDescriptors . loadableDescriptors (). stream (). map ( Utf8Entry :: stringValue ). toList ( );
114+ if (!expected . equals (found )) {
115+ throw new AssertionError ("Expected one LoadableDescriptors class entry Inner2 , but found " + found );
127116 }
128117 }
129118}
0 commit comments