8334726: Remove accidentally exposed individual methods from Class-File API

Reviewed-by: asotona

Author: liach

src/java.base/share/classes/java/lang/classfile/attribute/ModuleAttribute.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -153,7 +153,7 @@ static ModuleAttribute of(ModuleDesc moduleName,
                               Consumer<ModuleAttributeBuilder> attrHandler) {
         var mb = new ModuleAttributeBuilderImpl(moduleName);
         attrHandler.accept(mb);
-        return  mb.build();
+        return mb.build();
     }
 
     /**
@@ -166,7 +166,7 @@ static ModuleAttribute of(ModuleEntry moduleName,
                               Consumer<ModuleAttributeBuilder> attrHandler) {
         var mb = new ModuleAttributeBuilderImpl(moduleName);
         attrHandler.accept(mb);
-        return  mb.build();
+        return mb.build();
     }
 
     /**
@@ -319,11 +319,5 @@ default ModuleAttributeBuilder opens(PackageDesc pkge, Collection<AccessFlag> op
          * @return this builder
          */
         ModuleAttributeBuilder provides(ModuleProvideInfo provides);
-
-        /**
-         * Builds module attribute.
-         * @return the module attribute
-         */
-        ModuleAttribute build();
     }
 }

src/java.base/share/classes/java/lang/classfile/components/CodeRelabeler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,12 +74,4 @@ static CodeRelabeler of(Map<Label, Label> map) {
     static CodeRelabeler of(BiFunction<Label, CodeBuilder, Label> mapFunction) {
         return new CodeRelabelerImpl(mapFunction);
     }
-
-    /**
-     * Access method to internal re-labeling function.
-     * @param label source label
-     * @param codeBuilder builder to create new labels
-     * @return target label
-     */
-    Label relabel(Label label, CodeBuilder codeBuilder);
 }

src/java.base/share/classes/java/lang/classfile/constantpool/ConstantPoolBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,14 +92,6 @@ static ConstantPoolBuilder of() {
      */
     boolean canWriteDirect(ConstantPool constantPool);
 
-    /**
-     * Writes associated bootstrap method entries to the specified writer
-     *
-     * @param buf the writer
-     * @return false when no bootstrap method entry has been written
-     */
-    boolean writeBootstrapMethods(BufWriter buf);
-
     /**
      * {@return A {@link Utf8Entry} describing the provided {@linkplain String}}
      * If a UTF8 entry in the pool already describes this string, it is returned;

src/java.base/share/classes/jdk/internal/classfile/impl/CodeRelabelerImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
 
 public record CodeRelabelerImpl(BiFunction<Label, CodeBuilder, Label> mapFunction) implements CodeRelabeler {
 
-    @Override
     public Label relabel(Label label, CodeBuilder cob) {
         return mapFunction.apply(label, cob);
     }

src/java.base/share/classes/jdk/internal/classfile/impl/ModuleAttributeBuilderImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,6 @@ public ModuleAttributeBuilderImpl(ModuleDesc moduleName) {
         this(TemporaryConstantPool.INSTANCE.moduleEntry(TemporaryConstantPool.INSTANCE.utf8Entry(moduleName.name())));
     }
 
-    @Override
     public ModuleAttribute build() {
         return new UnboundAttribute.UnboundModuleAttribute(moduleEntry, moduleFlags, moduleVersion,
                                                             requires, exports, opens, uses, provides);

src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java

@@ -135,7 +135,6 @@ public boolean canWriteDirect(ConstantPool other) {
         return this == other || parent == other;
     }
 
-    @Override
     public boolean writeBootstrapMethods(BufWriter buf) {
         if (bsmSize == 0)
             return false;

src/java.base/share/classes/jdk/internal/classfile/impl/TemporaryConstantPool.java

@@ -190,11 +190,6 @@ public boolean canWriteDirect(ConstantPool constantPool) {
         return false;
     }
 
-    @Override
-    public boolean writeBootstrapMethods(BufWriter buf) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public void writeTo(BufWriter buf) {
         throw new UnsupportedOperationException();