Skip to content

Commit 0db9bc5

Browse files
committedJul 3, 2024
8335290: Rename ClassFile::transform to ClassFile::transformClass
Reviewed-by: asotona
1 parent d51141e commit 0db9bc5

File tree

58 files changed

+171
-174
lines changed

Some content is hidden

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

58 files changed

+171
-174
lines changed
 

‎src/java.base/share/classes/java/lang/Module.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,9 @@
5454
import java.util.stream.Stream;
5555
import java.lang.classfile.AccessFlags;
5656
import java.lang.classfile.Attribute;
57-
import java.lang.classfile.ClassModel;
58-
import java.lang.classfile.ClassTransform;
5957
import java.lang.classfile.ClassFile;
60-
import java.lang.classfile.attribute.ModuleAttribute;
6158
import java.lang.classfile.attribute.RuntimeVisibleAnnotationsAttribute;
6259

63-
import jdk.internal.javac.PreviewFeature;
6460
import jdk.internal.loader.BuiltinClassLoader;
6561
import jdk.internal.loader.BootLoader;
6662
import jdk.internal.loader.ClassLoaders;
@@ -1588,7 +1584,7 @@ private Class<?> loadModuleInfoClass() {
15881584
private Class<?> loadModuleInfoClass(InputStream in) throws IOException {
15891585
final String MODULE_INFO = "module-info";
15901586
var cc = ClassFile.of(ClassFile.ConstantPoolSharingOption.NEW_POOL);
1591-
byte[] bytes = cc.transform(cc.parse(in.readAllBytes()), (clb, cle) -> {
1587+
byte[] bytes = cc.transformClass(cc.parse(in.readAllBytes()), (clb, cle) -> {
15921588
switch (cle) {
15931589
case AccessFlags af -> clb.withFlags(AccessFlag.INTERFACE,
15941590
AccessFlag.ABSTRACT, AccessFlag.SYNTHETIC);

‎src/java.base/share/classes/java/lang/classfile/ClassFile.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.util.function.Function;
3333

3434
import java.lang.classfile.attribute.ModuleAttribute;
35-
import java.lang.classfile.attribute.UnknownAttribute;
3635
import java.lang.classfile.constantpool.ClassEntry;
3736
import java.lang.classfile.constantpool.ConstantPoolBuilder;
3837
import java.lang.classfile.constantpool.Utf8Entry;
@@ -435,15 +434,15 @@ default void buildModuleTo(Path path,
435434
* This method behaves as if:
436435
* {@snippet lang=java :
437436
* this.build(model.thisClass(), ConstantPoolBuilder.of(model),
438-
* b -> b.transform(model, transform));
437+
* clb -> clb.transform(model, transform));
439438
* }
440439
*
441440
* @param model the class model to transform
442441
* @param transform the transform
443442
* @return the bytes of the new class
444443
*/
445-
default byte[] transform(ClassModel model, ClassTransform transform) {
446-
return transform(model, model.thisClass(), transform);
444+
default byte[] transformClass(ClassModel model, ClassTransform transform) {
445+
return transformClass(model, model.thisClass(), transform);
447446
}
448447

449448
/**
@@ -458,8 +457,8 @@ default byte[] transform(ClassModel model, ClassTransform transform) {
458457
* @param transform the transform
459458
* @return the bytes of the new class
460459
*/
461-
default byte[] transform(ClassModel model, ClassDesc newClassName, ClassTransform transform) {
462-
return transform(model, TemporaryConstantPool.INSTANCE.classEntry(newClassName), transform);
460+
default byte[] transformClass(ClassModel model, ClassDesc newClassName, ClassTransform transform) {
461+
return transformClass(model, TemporaryConstantPool.INSTANCE.classEntry(newClassName), transform);
463462
}
464463

465464
/**
@@ -473,15 +472,15 @@ default byte[] transform(ClassModel model, ClassDesc newClassName, ClassTransfor
473472
* This method behaves as if:
474473
* {@snippet lang=java :
475474
* this.build(newClassName, ConstantPoolBuilder.of(model),
476-
* b -> b.transform(model, transform));
475+
* clb -> clb.transform(model, transform));
477476
* }
478477
*
479478
* @param model the class model to transform
480479
* @param newClassName new class name
481480
* @param transform the transform
482481
* @return the bytes of the new class
483482
*/
484-
byte[] transform(ClassModel model, ClassEntry newClassName, ClassTransform transform);
483+
byte[] transformClass(ClassModel model, ClassEntry newClassName, ClassTransform transform);
485484

486485
/**
487486
* Verify a classfile. Any verification errors found will be returned.

0 commit comments

Comments
 (0)