wip

Author: stevenschlansker

java/fory-format/src/main/java/org/apache/fory/format/encoder/BeanArrayEncoder.java

@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.fory.format.encoder;
+
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.fory.format.row.binary.BinaryArray;
+import org.apache.fory.format.row.binary.writer.BinaryArrayWriter;
+import org.apache.fory.memory.MemoryBuffer;
+import org.apache.fory.memory.MemoryUtils;
+
+class BeanArrayEncoder<T> implements ArrayEncoder<T> {
+    private final BinaryArrayWriter writer;
+    private final Field field;
+    private final GeneratedArrayEncoder codec;
+
+    BeanArrayEncoder(BinaryArrayWriter writer, Field field,
+            GeneratedArrayEncoder codec) {
+        this.writer = writer;
+        this.field = field;
+        this.codec = codec;
+    }
+
+    @Override
+    public Field field() {
+      return field;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public T fromArray(BinaryArray array) {
+      return (T) codec.fromArray(array);
+    }
+
+    @Override
+    public BinaryArray toArray(T obj) {
+      return codec.toArray(obj);
+    }
+
+    @Override
+    public T decode(MemoryBuffer buffer) {
+      return decode(buffer, buffer.readInt32());
+    }
+
+    public T decode(MemoryBuffer buffer, int size) {
+      BinaryArray array = new BinaryArray(field);
+      int readerIndex = buffer.readerIndex();
+      array.pointTo(buffer, readerIndex, size);
+      buffer.readerIndex(readerIndex + size);
+      return fromArray(array);
+    }
+
+    @Override
+    public T decode(byte[] bytes) {
+      return decode(MemoryUtils.wrap(bytes), bytes.length);
+    }
+
+    @Override
+    public byte[] encode(T obj) {
+      BinaryArray array = toArray(obj);
+      return writer.getBuffer().getBytes(0, 8 + array.getSizeInBytes());
+    }
+
+    @Override
+    public void encode(MemoryBuffer buffer, T obj) {
+      MemoryBuffer prevBuffer = writer.getBuffer();
+      int writerIndex = buffer.writerIndex();
+      buffer.writeInt32(-1);
+      try {
+        writer.setBuffer(buffer);
+        BinaryArray array = toArray(obj);
+        int size = buffer.writerIndex() - writerIndex - 4;
+        assert size == array.getSizeInBytes();
+        buffer.putInt32(writerIndex, size);
+      } finally {
+        writer.setBuffer(prevBuffer);
+      }
+    }
+}

java/fory-format/src/main/java/org/apache/fory/format/encoder/BeanCodecBuilder.java

@@ -20,18 +20,28 @@
 package org.apache.fory.format.encoder;
 
 import java.lang.reflect.Constructor;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Supplier;
+
+import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.fory.Fory;
 import org.apache.fory.builder.CodecBuilder;
 import org.apache.fory.format.row.binary.BinaryRow;
 import org.apache.fory.format.row.binary.CompactBinaryRow;
 import org.apache.fory.format.row.binary.writer.BaseBinaryRowWriter;
+import org.apache.fory.format.row.binary.writer.BinaryArrayWriter;
 import org.apache.fory.format.row.binary.writer.BinaryRowWriter;
 import org.apache.fory.format.row.binary.writer.CompactBinaryRowWriter;
+import org.apache.fory.format.type.DataTypes;
 import org.apache.fory.format.type.TypeInference;
 import org.apache.fory.memory.MemoryBuffer;
+import org.apache.fory.reflect.TypeRef;
+
+import static org.apache.fory.type.TypeUtils.getRawType;
 
 public class BeanCodecBuilder<T> {
 
@@ -112,6 +122,25 @@ public RowEncoder<T> apply(final BaseBinaryRowWriter writer) {
     };
   }
 
+  public <C extends Collection<T>> Supplier<ArrayEncoder<T>> arrayEncoder(final TypeRef<T> token, final Fory fory) {
+      final Schema schema = TypeInference.inferSchema(token, false);
+      final Field field = DataTypes.fieldOfSchema(schema, 0);
+      final BinaryArrayWriter writer = new BinaryArrayWriter(field);
+
+      final Set<TypeRef<?>> set = new HashSet<>();
+      findBeanToken(token, set);
+      if (set.isEmpty()) {
+        throw new IllegalArgumentException("can not find bean class.");
+      }
+
+      TypeRef<?> typeRef = null;
+      for (final TypeRef<?> tt : set) {
+        typeRef = set.iterator().next();
+        Encoders.loadOrGenRowCodecClass(getRawType(tt));
+      }
+      return arrayEncoder(token, typeRef, writer, fory);
+    }
+
   Function<BaseBinaryRowWriter, GeneratedRowEncoder> codecFactory() {
     final Class<?> rowCodecClass = Encoders.loadOrGenRowCodecClass(beanClass, codecFactory);
     Constructor<? extends GeneratedRowEncoder> constructor;

java/fory-format/src/main/java/org/apache/fory/format/encoder/CompactArrayEncoderBuilder.java

@@ -0,0 +1,14 @@
+package org.apache.fory.format.encoder;
+
+import org.apache.fory.reflect.TypeRef;
+
+class CompactArrayEncoderBuilder extends ArrayEncoderBuilder {
+    public CompactArrayEncoderBuilder(final TypeRef<?> clsType, final TypeRef<?> beanType) {
+        super(clsType, beanType);
+    }
+
+    @Override
+    protected String codecSuffix() {
+        return "CompactCodec";
+    }
+}

java/fory-format/src/main/java/org/apache/fory/format/encoder/CompactMapEncoderBuilder.java

@@ -0,0 +1,15 @@
+package org.apache.fory.format.encoder;
+
+import org.apache.fory.reflect.TypeRef;
+
+class CompactMapEncoderBuilder extends MapEncoderBuilder {
+
+    public CompactMapEncoderBuilder(final TypeRef<?> clsType, final TypeRef<?> beanType) {
+        super(clsType, beanType);
+    }
+
+    @Override
+    protected String codecSuffix() {
+        return "CompactCodec";
+    }
+}

java/fory-format/src/main/java/org/apache/fory/format/encoder/Encoders.java

@@ -214,64 +214,7 @@ public static <T extends Collection, B> ArrayEncoder<T> arrayEncoder(
               .getConstructor(Object[].class)
               .newInstance(references);
 
-      return new ArrayEncoder<T>() {
-
-        @Override
-        public Field field() {
-          return field;
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public T fromArray(BinaryArray array) {
-          return (T) codec.fromArray(array);
-        }
-
-        @Override
-        public BinaryArray toArray(T obj) {
-          return codec.toArray(obj);
-        }
-
-        @Override
-        public T decode(MemoryBuffer buffer) {
-          return decode(buffer, buffer.readInt32());
-        }
-
-        public T decode(MemoryBuffer buffer, int size) {
-          BinaryArray array = new BinaryArray(field);
-          int readerIndex = buffer.readerIndex();
-          array.pointTo(buffer, readerIndex, size);
-          buffer.readerIndex(readerIndex + size);
-          return fromArray(array);
-        }
-
-        @Override
-        public T decode(byte[] bytes) {
-          return decode(MemoryUtils.wrap(bytes), bytes.length);
-        }
-
-        @Override
-        public byte[] encode(T obj) {
-          BinaryArray array = toArray(obj);
-          return writer.getBuffer().getBytes(0, 8 + array.getSizeInBytes());
-        }
-
-        @Override
-        public void encode(MemoryBuffer buffer, T obj) {
-          MemoryBuffer prevBuffer = writer.getBuffer();
-          int writerIndex = buffer.writerIndex();
-          buffer.writeInt32(-1);
-          try {
-            writer.setBuffer(buffer);
-            BinaryArray array = toArray(obj);
-            int size = buffer.writerIndex() - writerIndex - 4;
-            assert size == array.getSizeInBytes();
-            buffer.putInt32(writerIndex, size);
-          } finally {
-            writer.setBuffer(prevBuffer);
-          }
-        }
-      };
+      return new BeanArrayEncoder<T>(writer, field, codec);
     } catch (Exception e) {
       String msg = String.format("Create encoder failed, \nelementType: %s", elementType);
       throw new EncoderException(msg, e);