rename and API changes fixes

asotona · Dec 6, 2023 · cf3123e · cf3123e
1 parent 225ece6
commit cf3123e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/ParserVerifier.java b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/ParserVerifier.java
@@ -32,16 +32,16 @@
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-import jdk.internal.classfile.Attribute;
-import jdk.internal.classfile.AttributedElement;
-import jdk.internal.classfile.ClassModel;
-import jdk.internal.classfile.ClassfileElement;
-import jdk.internal.classfile.CodeModel;
-import jdk.internal.classfile.CompoundElement;
-import jdk.internal.classfile.FieldModel;
-import jdk.internal.classfile.MethodModel;
-import jdk.internal.classfile.attribute.*;
-import jdk.internal.classfile.constantpool.*;
+import java.lang.classfile.Attribute;
+import java.lang.classfile.AttributedElement;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.ClassFileElement;
+import java.lang.classfile.CodeModel;
+import java.lang.classfile.CompoundElement;
+import java.lang.classfile.FieldModel;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.attribute.*;
+import java.lang.classfile.constantpool.*;
 import jdk.internal.classfile.impl.BoundAttribute;
 
 /**
@@ -158,7 +158,7 @@ private void verifyMethods(List<VerifyError> errors) {
         }
     }
 
-    private void verifyAttributes(ClassfileElement cfe, List<VerifyError> errors) {
+    private void verifyAttributes(ClassFileElement cfe, List<VerifyError> errors) {
         if (cfe instanceof AttributedElement ae) {
             var attrNames = new HashSet<String>();
             for (var a : ae.attributes()) {

diff --git a/test/jdk/jdk/classfile/VerifierSelfTest.java b/test/jdk/jdk/classfile/VerifierSelfTest.java
@@ -144,7 +144,7 @@ void testParserVerification() {
                     .withMethod("<>", MTD_void, ClassFile.ACC_NATIVE, mb -> {})
                     .withMethod("<>", MTD_void, ClassFile.ACC_NATIVE, mb -> {});
         }));
-        var found = clm.verify(null).stream().map(VerifyError::getMessage).collect(Collectors.toCollection(LinkedList::new));
+        var found = cc.verify(clm).stream().map(VerifyError::getMessage).collect(Collectors.toCollection(LinkedList::new));
         var expected = STR."""
                 Invalid class name: invalid.class.name at constant pool index \{ indexes[0] } in class ParserVerificationTestClass
                 Bad method descriptor: invalid method type at constant pool index \{ indexes[1] } in class ParserVerificationTestClass