fix CICD errors: making some methods public to make code generation compatible with java8 without hacks

Author: gowa

parquet-protobuf/src/main/java/org/apache/parquet/proto/ByteBuddyCodeGen.java

@@ -73,6 +73,7 @@
 import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
 import net.bytebuddy.dynamic.scaffold.InstrumentedType;
 import net.bytebuddy.implementation.Implementation;
+import net.bytebuddy.implementation.MethodCall;
 import net.bytebuddy.implementation.SuperMethodCall;
 import net.bytebuddy.implementation.bytecode.ByteCodeAppender;
 import net.bytebuddy.implementation.bytecode.Removal;
@@ -101,7 +102,7 @@
 import org.apache.parquet.proto.ByteBuddyCodeGen.CodeGenUtils.LocalVar;
 import org.apache.parquet.schema.MessageType;
 
-class ByteBuddyCodeGen {
+public class ByteBuddyCodeGen {
   private static final AtomicLong BYTE_BUDDY_CLASS_SEQUENCE = new AtomicLong();
 
   private static final GenerateMessageClasses GeneratedMessageV3 =
@@ -185,6 +186,7 @@ static class CodeGenUtils {
     static final ResolvedReflection Reflection = new ResolvedReflection();
 
     static class ResolvedReflection {
+      final Method MethodHandles_lookup = ReflectionUtil.getDeclaredMethod(MethodHandles.class, "lookup");
 
       final RecordConsumerMethods RecordConsumer = new RecordConsumerMethods();
       final ByteBuddyMessageWritersMethods ByteBuddyProto3FastMessageWriter =
@@ -741,7 +743,7 @@ static Optional<Class<?>> classForName(String className) {
     }
   }
 
-  static class WriteSupport {
+  public static class WriteSupport {
     // in order to avoid class generation for the same proto descriptors, cache implementations.
     private static final Map<MessageFieldsWritersCacheKey, Consumer<ProtoWriteSupport<?>.MessageWriter>>
         WRITERS_CACHE = new MapMaker().weakValues().makeMap();
@@ -1390,6 +1392,7 @@ public ByteBuddyMessageWritersCodeGen(
 
         classBuilder = new ByteBuddy()
             .subclass(ByteBuddyMessageWriters.class)
+            .modifiers(Visibility.PUBLIC)
             .name(ByteBuddyMessageWriters.class.getName() + "$Generated$"
                 + BYTE_BUDDY_CLASS_SEQUENCE.incrementAndGet());
 
@@ -1398,6 +1401,7 @@ public ByteBuddyMessageWritersCodeGen(
         generateConstructor();
         generateMethods();
         overrideSetFallbackFieldWriters();
+        overrideGetLookup();
 
         DynamicType.Unloaded<ByteBuddyMessageWriters> unloaded = classBuilder.make();
 
@@ -1408,10 +1412,16 @@ public ByteBuddyMessageWritersCodeGen(
         //         }
 
         byteBuddyMessageWritersClass = unloaded.load(
-                null, ClassLoadingStrategy.UsingLookup.of(MethodHandles.lookup()))
+                this.getClass().getClassLoader(), ClassLoadingStrategy.Default.WRAPPER)
             .getLoaded();
       }
 
+      private void overrideGetLookup() {
+        classBuilder = classBuilder
+            .method(ElementMatchers.named("getLookup"))
+            .intercept(MethodCall.invoke(Reflection.MethodHandles_lookup));
+      }
+
       private void registerFallbackFieldWriterFields() {
         for (CodeGenFieldWriterFallback fieldWriterFallback : fieldWriterFallbacks.values()) {
           classBuilder = classBuilder.define(fieldWriterFallback.fieldWriter());
@@ -1465,7 +1475,8 @@ private void generateMethods() {
       private void generateConstructor() {
         classBuilder = classBuilder
             .constructor(ElementMatchers.any())
-            .intercept(SuperMethodCall.INSTANCE.andThen(new ByteBuddyMessageWritersConstructor()));
+            .intercept(SuperMethodCall.INSTANCE.andThen(new ByteBuddyMessageWritersConstructor()))
+            .modifiers(Visibility.PUBLIC);
       }
 
       private void registerEnumFields() {
@@ -2645,14 +2656,16 @@ public void accept(ProtoWriteSupport<?>.MessageWriter messageWriter) {
 
     // this is subclassed with ByteBuddy, overriding the constructor, setProtoReflectionMessageWriters and adding
     // new fields and methods
-    abstract static class ByteBuddyMessageWriters {
+    public abstract static class ByteBuddyMessageWriters {
       private final ProtoWriteSupport<?> protoWriteSupport;
       private final Map<Method, ProtoWriteSupport.MessageFieldsWriter> fastMessageWriters = new LinkedHashMap<>();
+      private final MethodHandles.Lookup lookup;
 
       public ByteBuddyMessageWriters(
           ProtoWriteSupport<?>.MessageWriter rootMessageWriter,
           ByteBuddyMessageWritersCodeGen.GeneratedElementsInfo generatedElementsInfo) {
         this.protoWriteSupport = rootMessageWriter.getProtoWriteSupport();
+        this.lookup = getLookup();
         final ProtoWriteSupport<?>.FieldWriter[] fallbackFieldWriters =
             new ProtoWriteSupport<?>.FieldWriter[generatedElementsInfo.fallbackFieldWriters.size()];
 
@@ -2699,7 +2712,6 @@ public Map<String, Integer> enumNameNumberPairs(String enumTypeFullName) {
 
       public ProtoWriteSupport.MessageFieldsWriter getFastMessageWriter(Method method) {
         return fastMessageWriters.computeIfAbsent(method, k -> {
-          MethodHandles.Lookup lookup = MethodHandles.lookup();
           Class<?> messageOrBuilderInterface = method.getParameterTypes()[0];
           try {
             Consumer<MessageOrBuilder> consumer =
@@ -2728,6 +2740,8 @@ public boolean writeAllFields(MessageOrBuilder messageOrBuilder) {
           }
         });
       }
+
+      protected abstract MethodHandles.Lookup getLookup();
     }
   }
 }

parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoWriteSupport.java

@@ -327,7 +327,7 @@ private Map<String, String> enumMetadata() {
     return enumMetadata;
   }
 
-  class FieldWriter {
+  public class FieldWriter {
     String fieldName;
     int index = -1;
 
@@ -345,7 +345,7 @@ void setIndex(int index) {
     /**
      * Used for writing repeated fields
      */
-    void writeRawValue(Object value) {}
+    public void writeRawValue(Object value) {}
 
     /**
      * Used for writing nonrepeated (optional, required) fields
@@ -538,7 +538,7 @@ void writeTopLevelMessage(Object value) {
      * Writes message as part of repeated field. It cannot start field
      */
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       recordConsumer.startGroup();
       writeAllFields((MessageOrBuilder) value);
       recordConsumer.endGroup();
@@ -614,7 +614,7 @@ class ArrayWriter extends FieldWriter {
     }
 
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       throw new UnsupportedOperationException("Array has no raw value");
     }
 
@@ -657,7 +657,7 @@ class RepeatedWriter extends FieldWriter {
     }
 
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       throw new UnsupportedOperationException("Array has no raw value");
     }
 
@@ -697,23 +697,23 @@ private void validatedMapping(Descriptor descriptor, GroupType parquetSchema) {
 
   class StringWriter extends FieldWriter {
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       Binary binaryString = Binary.fromString((String) value);
       recordConsumer.addBinary(binaryString);
     }
   }
 
   class IntWriter extends FieldWriter {
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       recordConsumer.addInteger((Integer) value);
     }
   }
 
   class LongWriter extends FieldWriter {
 
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       recordConsumer.addLong((Long) value);
     }
   }
@@ -730,7 +730,7 @@ public MapWriter(FieldWriter keyWriter, FieldWriter valueWriter) {
     }
 
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       Collection<Message> collection = (Collection<Message>) value;
       if (collection.isEmpty()) {
         return;
@@ -761,14 +761,14 @@ final void writeRawValue(Object value) {
 
   class FloatWriter extends FieldWriter {
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       recordConsumer.addFloat((Float) value);
     }
   }
 
   class DoubleWriter extends FieldWriter {
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       recordConsumer.addDouble((Double) value);
     }
   }
@@ -786,7 +786,7 @@ public EnumWriter(Descriptors.EnumDescriptor enumType) {
     }
 
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       Descriptors.EnumValueDescriptor enumValueDesc = (Descriptors.EnumValueDescriptor) value;
       Binary binary = Binary.fromString(enumValueDesc.getName());
       recordConsumer.addBinary(binary);
@@ -796,14 +796,14 @@ final void writeRawValue(Object value) {
 
   class BooleanWriter extends FieldWriter {
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       recordConsumer.addBoolean((Boolean) value);
     }
   }
 
   class BinaryWriter extends FieldWriter {
     @Override
-    final void writeRawValue(Object value) {
+    public final void writeRawValue(Object value) {
       // Non-ByteString values can happen when recursions gets truncated.
       ByteString byteString = value instanceof ByteString
           ? (ByteString) value
@@ -819,15 +819,15 @@ final void writeRawValue(Object value) {
 
   class TimestampWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       Timestamp timestamp = (Timestamp) value;
       recordConsumer.addLong(Timestamps.toNanos(timestamp));
     }
   }
 
   class DateWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       Date date = (Date) value;
       LocalDate localDate = LocalDate.of(date.getYear(), date.getMonth(), date.getDay());
       recordConsumer.addInteger((int) localDate.toEpochDay());
@@ -836,7 +836,7 @@ void writeRawValue(Object value) {
 
   class TimeWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       com.google.type.TimeOfDay timeOfDay = (com.google.type.TimeOfDay) value;
       LocalTime localTime = LocalTime.of(
           timeOfDay.getHours(), timeOfDay.getMinutes(), timeOfDay.getSeconds(), timeOfDay.getNanos());
@@ -846,64 +846,64 @@ void writeRawValue(Object value) {
 
   class DoubleValueWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       recordConsumer.addDouble(((DoubleValue) value).getValue());
     }
   }
 
   class FloatValueWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       recordConsumer.addFloat(((FloatValue) value).getValue());
     }
   }
 
   class Int64ValueWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       recordConsumer.addLong(((Int64Value) value).getValue());
     }
   }
 
   class UInt64ValueWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       recordConsumer.addLong(((UInt64Value) value).getValue());
     }
   }
 
   class Int32ValueWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       recordConsumer.addInteger(((Int32Value) value).getValue());
     }
   }
 
   class UInt32ValueWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       recordConsumer.addLong(((UInt32Value) value).getValue());
     }
   }
 
   class BoolValueWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       recordConsumer.addBoolean(((BoolValue) value).getValue());
     }
   }
 
   class StringValueWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       Binary binaryString = Binary.fromString(((StringValue) value).getValue());
       recordConsumer.addBinary(binaryString);
     }
   }
 
   class BytesValueWriter extends FieldWriter {
     @Override
-    void writeRawValue(Object value) {
+    public void writeRawValue(Object value) {
       byte[] byteArray = ((BytesValue) value).getValue().toByteArray();
       Binary binary = Binary.fromConstantByteArray(byteArray);
       recordConsumer.addBinary(binary);
@@ -917,7 +917,7 @@ private FieldWriter unknownType(FieldDescriptor fieldDescriptor) {
   }
 
   /**
-   * A plugin for {@link MessageWriter#writeAllFields(MessageOrBuilder)} that is potentially
+   * A plugin for MessageWriter.writeAllFields(MessageOrBuilder) that is potentially
    * capable to write MessageOrBuilder fields faster.
    */
   public interface MessageFieldsWriter {