Update BitSet problem

Author: yx9o

…ketmq/remoting/protocol/BitSetCodec.java …otocol/BitSetSerializerDeserializer.javaremoting/src/main/java/org/apache/rocketmq/remoting/protocol/BitSetCodec.java renamed to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/BitSetSerializerDeserializer.java remoting/src/main/java/org/apache/rocketmq/remoting/protocol/BitSetCodec.java renamed to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/BitSetSerializerDeserializer.java

@@ -16,38 +16,37 @@
  */
 package org.apache.rocketmq.remoting.protocol;
 
-import com.alibaba.fastjson2.JSONFactory;
 import com.alibaba.fastjson2.JSONReader;
 import com.alibaba.fastjson2.JSONWriter;
 import com.alibaba.fastjson2.reader.ObjectReader;
 import com.alibaba.fastjson2.writer.ObjectWriter;
 
 import java.lang.reflect.Type;
+import java.util.Base64;
 import java.util.BitSet;
 
-public class BitSetCodec implements ObjectReader<BitSetWrapper>, ObjectWriter<BitSetWrapper> {
-
-    static {
-        JSONFactory.getDefaultObjectWriterProvider().register(BitSetWrapper.class, new BitSetCodec());
-        JSONFactory.getDefaultObjectReaderProvider().register(BitSetWrapper.class, new BitSetCodec());
-    }
+public class BitSetSerializerDeserializer implements ObjectReader<BitSet>, ObjectWriter<BitSet> {
 
     @Override
     public void write(JSONWriter writer, Object object, Object fieldName, Type fieldType, long features) {
         if (object == null) {
-            writer.writeNull();
+            writer.writeBase64(null);
         } else {
-            writer.writeBinary(((BitSetWrapper) object).getValue().toByteArray());
+            writer.writeBase64(((BitSet) object).toByteArray());
         }
     }
 
     @Override
-    public BitSetWrapper readObject(JSONReader reader, Type fieldType, Object fieldName, long features) {
-        byte[] bytes = reader.readBinary();
-        if (bytes != null) {
-            return new BitSetWrapper(BitSet.valueOf(bytes));
+    public BitSet readObject(JSONReader reader, Type fieldType, Object fieldName, long features) {
+        if (reader.nextIfNull()) {
+            return null;
+        }
+        String base64 = reader.readString();
+        if (base64 == null || base64.isEmpty()) {
+            return null;
         }
-        return null;
+        byte[] bytes = Base64.getDecoder().decode(base64);
+        return BitSet.valueOf(bytes);
     }
 
     @Override
@@ -56,7 +55,7 @@ public long getFeatures() {
     }
 
     @Override
-    public Class<BitSetWrapper> getObjectClass() {
+    public Class<BitSet> getObjectClass() {
         return ObjectReader.super.getObjectClass();
     }
 }

remoting/src/main/java/org/apache/rocketmq/remoting/protocol/BitSetWrapper.java

@@ -17,7 +17,7 @@
 package org.apache.rocketmq.remoting.protocol.body;
 
 import com.alibaba.fastjson2.annotation.JSONField;
-import org.apache.rocketmq.remoting.protocol.BitSetWrapper;
+import org.apache.rocketmq.remoting.protocol.BitSetSerializerDeserializer;
 
 import java.io.Serializable;
 import java.util.BitSet;
@@ -39,8 +39,8 @@ public class BatchAck implements Serializable {
     private long popTime;
     @JSONField(name = "it", alternateNames = {"invisibleTime"})
     private long invisibleTime;
-    @JSONField(name = "b", alternateNames = {"bitSet"})
-    private BitSetWrapper bitSet; // ack offsets bitSet
+    @JSONField(name = "b", alternateNames = {"bitSet"}, serializeUsing = BitSetSerializerDeserializer.class, deserializeUsing = BitSetSerializerDeserializer.class)
+    private BitSet bitSet; // ack offsets bitSet
 
     public String getConsumerGroup() {
         return consumerGroup;
@@ -107,11 +107,11 @@ public void setInvisibleTime(long invisibleTime) {
     }
 
     public BitSet getBitSet() {
-        return bitSet != null ? bitSet.getValue() : null;
+        return bitSet;
     }
 
     public void setBitSet(BitSet bitSet) {
-        this.bitSet = bitSet != null ? new BitSetWrapper(bitSet) : null;
+        this.bitSet = bitSet;
     }
 
     @Override

remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/BatchAck.java

@@ -26,7 +26,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.BitSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -49,7 +48,7 @@ public void testCompatibilityCheck() {
 
         for (Class<? extends RemotingSerializable> clazz : subTypes) {
             if (clazz.isInterface() || Modifier.isAbstract(clazz.getModifiers()) || clazz.getSimpleName().endsWith("Test")
-                    || clazz.isAnonymousClass() || clazz.getName().contains("$") || clazz.getName().contains("BatchAckMessageRequestBody")) {
+                    || clazz.isAnonymousClass() || clazz.getName().contains("$")) {
                 continue;
             }
             try {
@@ -229,11 +228,6 @@ private Object getDefaultValue(final Class<?> type) {
         if (type == String.class) {
             return "test";
         }
-        if (type == BitSetWrapper.class) {
-            BitSet bitSet = new BitSet();
-            bitSet.set(0);
-            return new BitSetWrapper(bitSet);
-        }
         return null;
     }