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

@@ -1590,8 +1590,8 @@ private Class<?> loadModuleInfoClass() {
      */
     private Class<?> loadModuleInfoClass(InputStream in) throws IOException {
         final String MODULE_INFO = "module-info";
-        byte[] bytes = Classfile.parse(in.readAllBytes(),
-                Classfile.Option.constantPoolSharing(false)).transform((clb, cle) -> {
+        var cc = Classfile.of(Classfile.ConstantPoolSharingOption.DO_NOT_SHARE_CONSTANT_POOL);
+        byte[] bytes = cc.transform(cc.parse(in.readAllBytes()), (clb, cle) -> {
             switch (cle) {
                 case AccessFlags af -> clb.withFlags(AccessFlag.INTERFACE,
                         AccessFlag.ABSTRACT, AccessFlag.SYNTHETIC);

src/java.base/share/classes/jdk/internal/classfile/ClassModel.java

@@ -72,25 +72,6 @@ public sealed interface ClassModel
     /** {@return the interfaces implemented by this class} */
     List<ClassEntry> interfaces();
 
-    /**
-     * Transform this classfile into a new classfile with the aid of a
-     * {@link ClassTransform}.  The transform will receive each element of
-     * this class, as well as a {@link ClassBuilder} for building the new class.
-     * The transform is free to preserve, remove, or replace elements as it
-     * sees fit.
-     *
-     * @implNote
-     * <p>This method behaves as if:
-     * {@snippet lang=java :
-     *     Classfile.build(thisClass(), ConstantPoolBuilder.of(this),
-     *                     b -> b.transform(this, transform));
-     * }
-     *
-     * @param transform the transform
-     * @return the bytes of the new class
-     */
-    byte[] transform(ClassTransform transform);
-
     /** {@return whether this class is a module descriptor} */
     boolean isModuleInfo();
 

src/java.base/share/classes/jdk/internal/classfile/ClassReader.java

@@ -51,7 +51,7 @@ public sealed interface ClassReader extends ConstantPool
 
     /**
      * {@return the table of custom attribute mappers}  This is derived from
-     * the processing option {@link Classfile.Option#attributeMapper(Function)}.
+     * the processing option {@link Classfile.AttributeMapperOption}.
      */
     Function<Utf8Entry, AttributeMapper<?>> customAttributes();