lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pb

Browse Source
This commit is contained in:
redkale
2024-09-30 19:40:16 +08:00
parent e7f05c31e0
commit bb92e4541a
13 changed files with 208 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/redkale/convert/ConvertFactory.java
View File

@@ -128,10 +128,10 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
this.register(BigInteger.class, BigIntegerSimpledCoder.instance);
this.register(BigDecimal.class, BigDecimalSimpledCoder.instance);
this.register(InetAddress.class, InetAddressSimpledCoder.instance);
this.register(InetSocketAddress.class, InetAddressSimpledCoder.InetSocketAddressSimpledCoder.instance);
this.register(LongAdder.class, LongAdderSimpledCoder.instance);
this.register(Uint128.class, Uint128SimpledCoder.instance);
this.register(Class.class, TypeSimpledCoder.instance);
this.register(InetSocketAddress.class, InetAddressSimpledCoder.InetSocketAddressSimpledCoder.instance);
this.register(Pattern.class, PatternSimpledCoder.instance);
this.register(File.class, FileSimpledCoder.instance);
this.register(Throwable.class, ThrowableSimpledCoder.instance);

2
src/main/java/org/redkale/convert/ext/BigDecimalSimpledCoder.java
View File

@@ -19,7 +19,7 @@ import org.redkale.util.Utility;
* @param <R> Reader输入的子类型
* @param <W> Writer输出的子类型
*/
public final class BigDecimalSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, BigDecimal> {
public class BigDecimalSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, BigDecimal> {
public static final BigDecimalSimpledCoder instance = new BigDecimalSimpledCoder();

2
src/main/java/org/redkale/convert/ext/BigIntegerSimpledCoder.java
View File

@@ -18,7 +18,7 @@ import org.redkale.convert.json.*;
* @param <R> Reader输入的子类型
* @param <W> Writer输出的子类型
*/
public final class BigIntegerSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, BigInteger> {
public class BigIntegerSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, BigInteger> {
public static final BigIntegerSimpledCoder instance = new BigIntegerSimpledCoder();

4
src/main/java/org/redkale/convert/ext/InetAddressSimpledCoder.java
View File

@@ -20,7 +20,7 @@ import org.redkale.util.StringWrapper;
* @param <W> Writer输出的子类型
*/
@SuppressWarnings("unchecked")
public final class InetAddressSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, InetAddress> {
public class InetAddressSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, InetAddress> {
public static final InetAddressSimpledCoder instance = new InetAddressSimpledCoder();
@@ -53,7 +53,7 @@ public final class InetAddressSimpledCoder<R extends Reader, W extends Writer> e
* @param <W> Writer输出的子类型
*/
@SuppressWarnings("unchecked")
public static final class InetSocketAddressSimpledCoder<R extends Reader, W extends Writer>
public static class InetSocketAddressSimpledCoder<R extends Reader, W extends Writer>
extends SimpledCoder<R, W, InetSocketAddress> {
public static final InetSocketAddressSimpledCoder instance = new InetSocketAddressSimpledCoder();

2
src/main/java/org/redkale/convert/ext/LongAdderSimpledCoder.java
View File

@@ -17,7 +17,7 @@ import org.redkale.convert.*;
* @param <R> Reader输入的子类型
* @param <W> Writer输出的子类型
*/
public final class LongAdderSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, LongAdder> {
public class LongAdderSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, LongAdder> {
public static final LongAdderSimpledCoder instance = new LongAdderSimpledCoder();

2
src/main/java/org/redkale/convert/ext/Uint128SimpledCoder.java
View File

@@ -18,7 +18,7 @@ import org.redkale.util.*;
* @param <R> Reader输入的子类型
* @param <W> Writer输出的子类型
*/
public final class Uint128SimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, Uint128> {
public class Uint128SimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, Uint128> {
private static final ByteArraySimpledCoder bsSimpledCoder = ByteArraySimpledCoder.instance;

8
src/main/java/org/redkale/convert/pb/ProtobufArrayEncoder.java
View File

@@ -55,16 +55,16 @@ public class ProtobufArrayEncoder<T> extends ArrayEncoder<ProtobufWriter, T>
if (value == null || value.length < 1) {
return 0;
}
int len = 0;
int size = 0;
ProtobufEncodeable itemEncoder = (ProtobufEncodeable) this.componentEncoder;
for (T item : value) {
len += itemEncoder.computeSize(item);
size += itemEncoder.computeSize(item);
}
return len;
return size;
}
@Override
public boolean requireSize() {
return requireSizeFlag;
return !componentSimpled;
}
}

137
src/main/java/org/redkale/convert/pb/ProtobufCoders.java
View File

@@ -5,6 +5,10 @@
package org.redkale.convert.pb;
import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.*;
import java.util.concurrent.atomic.*;
import java.util.stream.Stream;
@@ -12,6 +16,8 @@ import org.redkale.convert.SimpledCoder;
import org.redkale.convert.ext.AtomicBooleanSimpledCoder;
import org.redkale.convert.ext.AtomicIntegerSimpledCoder;
import org.redkale.convert.ext.AtomicLongSimpledCoder;
import org.redkale.convert.ext.BigDecimalSimpledCoder;
import org.redkale.convert.ext.BigIntegerSimpledCoder;
import org.redkale.convert.ext.BoolSimpledCoder;
import org.redkale.convert.ext.ByteSimpledCoder;
import org.redkale.convert.ext.CharSequenceSimpledCoder;
@@ -21,16 +27,20 @@ import org.redkale.convert.ext.DateSimpledCoder;
import org.redkale.convert.ext.DoubleSimpledCoder;
import org.redkale.convert.ext.DurationSimpledCoder;
import org.redkale.convert.ext.FloatSimpledCoder;
import org.redkale.convert.ext.InetAddressSimpledCoder;
import org.redkale.convert.ext.InetAddressSimpledCoder.InetSocketAddressSimpledCoder;
import org.redkale.convert.ext.InstantSimpledCoder;
import org.redkale.convert.ext.IntSimpledCoder;
import org.redkale.convert.ext.LocalDateSimpledCoder;
import org.redkale.convert.ext.LocalDateTimeSimpledCoder;
import org.redkale.convert.ext.LocalTimeSimpledCoder;
import org.redkale.convert.ext.LongAdderSimpledCoder;
import org.redkale.convert.ext.LongSimpledCoder;
import org.redkale.convert.ext.NumberSimpledCoder;
import org.redkale.convert.ext.ShortSimpledCoder;
import org.redkale.convert.ext.StringSimpledCoder;
import org.redkale.convert.ext.StringWrapperSimpledCoder;
import org.redkale.convert.ext.Uint128SimpledCoder;
import org.redkale.util.*;
/**
@@ -175,7 +185,7 @@ public abstract class ProtobufCoders {
}
public static class ProtobufStringSimpledCoder extends StringSimpledCoder<ProtobufReader, ProtobufWriter>
implements ProtobufPrimitivable, ProtobufEncodeable<ProtobufWriter, String> {
implements ProtobufEncodeable<ProtobufWriter, String> {
public static final ProtobufStringSimpledCoder instance = new ProtobufStringSimpledCoder();
@@ -213,7 +223,7 @@ public abstract class ProtobufCoders {
public static class ProtobufStringWrapperSimpledCoder
extends StringWrapperSimpledCoder<ProtobufReader, ProtobufWriter>
implements ProtobufPrimitivable, ProtobufEncodeable<ProtobufWriter, StringWrapper> {
implements ProtobufEncodeable<ProtobufWriter, StringWrapper> {
public static final ProtobufStringWrapperSimpledCoder instance = new ProtobufStringWrapperSimpledCoder();
@@ -230,7 +240,7 @@ public abstract class ProtobufCoders {
public static class ProtobufCharSequenceSimpledCoder
extends CharSequenceSimpledCoder<ProtobufReader, ProtobufWriter>
implements ProtobufPrimitivable, ProtobufEncodeable<ProtobufWriter, CharSequence> {
implements ProtobufEncodeable<ProtobufWriter, CharSequence> {
public static final ProtobufCharSequenceSimpledCoder instance = new ProtobufCharSequenceSimpledCoder();
@@ -247,7 +257,7 @@ public abstract class ProtobufCoders {
public static class ProtobufStringBuilderSimpledCoder
extends StringBuilderSimpledCoder<ProtobufReader, ProtobufWriter>
implements ProtobufPrimitivable, ProtobufEncodeable<ProtobufWriter, StringBuilder> {
implements ProtobufEncodeable<ProtobufWriter, StringBuilder> {
public static final ProtobufStringBuilderSimpledCoder instance = new ProtobufStringBuilderSimpledCoder();
@@ -331,7 +341,7 @@ public abstract class ProtobufCoders {
public static class ProtobufLocalDateTimeSimpledCoder
extends LocalDateTimeSimpledCoder<ProtobufReader, ProtobufWriter>
implements ProtobufPrimitivable, ProtobufEncodeable<ProtobufWriter, java.time.LocalDateTime> {
implements ProtobufEncodeable<ProtobufWriter, java.time.LocalDateTime> {
public static final ProtobufLocalDateTimeSimpledCoder instance = new ProtobufLocalDateTimeSimpledCoder();
@@ -412,6 +422,123 @@ public abstract class ProtobufCoders {
}
}
public static class ProtobufBigIntegerSimpledCoder extends BigIntegerSimpledCoder<ProtobufReader, ProtobufWriter>
implements ProtobufEncodeable<ProtobufWriter, BigInteger> {
public static final ProtobufBigIntegerSimpledCoder instance = new ProtobufBigIntegerSimpledCoder();
@Override
public int computeSize(BigInteger value) {
if (value == null) {
return 0;
}
byte[] bs = value.toByteArray();
return ProtobufFactory.computeSInt32SizeNoTag(bs.length) + bs.length;
}
@Override
public Type getType() {
return BigInteger.class;
}
}
public static class ProtobufBigDecimalSimpledCoder extends BigDecimalSimpledCoder<ProtobufReader, ProtobufWriter>
implements ProtobufEncodeable<ProtobufWriter, BigDecimal> {
public static final ProtobufBigDecimalSimpledCoder instance = new ProtobufBigDecimalSimpledCoder();
@Override
public int computeSize(BigDecimal value) {
if (value == null) {
return 0;
}
return ProtobufStringSimpledCoder.instance.computeSize(value.toString());
}
@Override
public Type getType() {
return BigDecimal.class;
}
}
public static class ProtobufInetAddressSimpledCoder extends InetAddressSimpledCoder<ProtobufReader, ProtobufWriter>
implements ProtobufEncodeable<ProtobufWriter, InetAddress> {
public static final ProtobufInetAddressSimpledCoder instance = new ProtobufInetAddressSimpledCoder();
@Override
public int computeSize(InetAddress value) {
if (value == null) {
return 0;
}
byte[] bs = value.getAddress();
return ProtobufFactory.computeSInt32SizeNoTag(bs.length) + bs.length;
}
@Override
public Type getType() {
return InetAddress.class;
}
}
public static class ProtobufInetSocketAddressSimpledCoder
extends InetSocketAddressSimpledCoder<ProtobufReader, ProtobufWriter>
implements ProtobufEncodeable<ProtobufWriter, InetSocketAddress> {
public static final ProtobufInetSocketAddressSimpledCoder instance =
new ProtobufInetSocketAddressSimpledCoder();
@Override
public int computeSize(InetSocketAddress value) {
if (value == null) {
return 0;
}
byte[] bs = value.getAddress().getAddress();
return ProtobufFactory.computeSInt32SizeNoTag(bs.length) + bs.length;
}
@Override
public Type getType() {
return InetSocketAddress.class;
}
}
public static class ProtobufLongAdderSimpledCoder extends LongAdderSimpledCoder<ProtobufReader, ProtobufWriter>
implements ProtobufPrimitivable, ProtobufEncodeable<ProtobufWriter, LongAdder> {
public static final ProtobufLongAdderSimpledCoder instance = new ProtobufLongAdderSimpledCoder();
@Override
public int computeSize(LongAdder value) {
return ProtobufLongSimpledCoder.instance.computeSize(value == null ? null : value.longValue());
}
@Override
public Type getType() {
return LongAdder.class;
}
}
public static class ProtobufUint128SimpledCoder extends Uint128SimpledCoder<ProtobufReader, ProtobufWriter>
implements ProtobufEncodeable<ProtobufWriter, Uint128> {
public static final ProtobufUint128SimpledCoder instance = new ProtobufUint128SimpledCoder();
@Override
public int computeSize(Uint128 value) {
if (value == null) {
return 0;
}
byte[] bs = value.getBytes();
return ProtobufFactory.computeSInt32SizeNoTag(bs.length) + bs.length;
}
@Override
public Type getType() {
return Uint128.class;
}
}
// ------------------------------------- boolean[] -------------------------------------
public static class ProtobufBoolArraySimpledCoder extends SimpledCoder<ProtobufReader, ProtobufWriter, boolean[]>
implements ProtobufPrimitivable, ProtobufEncodeable<ProtobufWriter, boolean[]> {

13
src/main/java/org/redkale/convert/pb/ProtobufCollectionEncoder.java
View File

@@ -13,7 +13,8 @@ import org.redkale.convert.*;
* @author zhangjx
* @param <T> T
*/
public class ProtobufCollectionEncoder<T> extends CollectionEncoder<ProtobufWriter, T> {
public class ProtobufCollectionEncoder<T> extends CollectionEncoder<ProtobufWriter, T>
implements ProtobufEncodeable<ProtobufWriter, Collection<T>> {
protected final boolean componentSimpled;
@@ -45,4 +46,14 @@ public class ProtobufCollectionEncoder<T> extends CollectionEncoder<ProtobufWrit
}
out.writeArrayE();
}
@Override
public int computeSize(Collection<T> value) {
return 0;
}
@Override
public boolean requireSize() {
return !componentSimpled;
}
}

12
src/main/java/org/redkale/convert/pb/ProtobufEnumSimpledCoder.java
View File

@@ -21,7 +21,7 @@ import org.redkale.util.RedkaleClassLoader;
* @param <E> Enum的子类
*/
public class ProtobufEnumSimpledCoder<R extends ProtobufReader, W extends ProtobufWriter, E extends Enum>
extends SimpledCoder<R, W, E> {
extends SimpledCoder<R, W, E> implements ProtobufEncodeable<W, E> {
private final Map<Integer, E> values = new HashMap<>();
@@ -68,4 +68,14 @@ public class ProtobufEnumSimpledCoder<R extends ProtobufReader, W extends Protob
public Class<E> getType() {
return (Class) type;
}
@Override
public int computeSize(E value) {
return 0;
}
@Override
public boolean requireSize() {
return false;
}
}

11
src/main/java/org/redkale/convert/pb/ProtobufFactory.java
View File

@@ -6,6 +6,10 @@
package org.redkale.convert.pb;
import java.lang.reflect.*;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.*;
import java.util.concurrent.atomic.*;
import java.util.stream.Stream;
@@ -74,6 +78,12 @@ public class ProtobufFactory extends ConvertFactory<ProtobufReader, ProtobufWrit
this.register(AtomicBoolean.class, ProtobufCoders.ProtobufAtomicBooleanSimpledCoder.instance);
this.register(AtomicInteger.class, ProtobufCoders.ProtobufAtomicIntegerSimpledCoder.instance);
this.register(AtomicLong.class, ProtobufCoders.ProtobufAtomicLongSimpledCoder.instance);
this.register(BigInteger.class, ProtobufCoders.ProtobufBigIntegerSimpledCoder.instance);
this.register(BigDecimal.class, ProtobufCoders.ProtobufBigDecimalSimpledCoder.instance);
this.register(InetAddress.class, ProtobufCoders.ProtobufInetAddressSimpledCoder.instance);
this.register(InetSocketAddress.class, ProtobufCoders.ProtobufInetSocketAddressSimpledCoder.instance);
this.register(LongAdder.class, ProtobufCoders.ProtobufLongAdderSimpledCoder.instance);
this.register(Uint128.class, ProtobufCoders.ProtobufUint128SimpledCoder.instance);
this.register(boolean[].class, ProtobufCoders.ProtobufBoolArraySimpledCoder.instance);
this.register(byte[].class, ProtobufCoders.ProtobufByteArraySimpledCoder.instance);
@@ -96,6 +106,7 @@ public class ProtobufFactory extends ConvertFactory<ProtobufReader, ProtobufWrit
this.register(String[].class, this.createArrayDecoder(String[].class));
this.register(String[].class, this.createArrayEncoder(String[].class));
}
}

16
src/main/java/org/redkale/convert/pb/ProtobufMapEncoder.java
View File

@@ -15,7 +15,8 @@ import org.redkale.convert.*;
* @param <K> K
* @param <V> V
*/
public class ProtobufMapEncoder<K, V> extends MapEncoder<ProtobufWriter, K, V> {
public class ProtobufMapEncoder<K, V> extends MapEncoder<ProtobufWriter, K, V>
implements ProtobufEncodeable<ProtobufWriter, Map<K, V>> {
private final boolean enumtostring;
private final int keyTag;
@@ -60,4 +61,17 @@ public class ProtobufMapEncoder<K, V> extends MapEncoder<ProtobufWriter, K, V> {
});
out.writeMapE();
}
@Override
public int computeSize(Map<K, V> value) {
if (value == null || value.isEmpty()) {
return 0;
}
return 0;
}
@Override
public final boolean requireSize() {
return true;
}
}

21
src/main/java/org/redkale/convert/pb/ProtobufObjectEncoder.java
View File

@@ -17,6 +17,8 @@ import org.redkale.util.Utility;
public class ProtobufObjectEncoder<T> extends ObjectEncoder<ProtobufWriter, T>
implements ProtobufEncodeable<ProtobufWriter, T> {
protected boolean memberSizeRequired;
protected ProtobufObjectEncoder(Type type) {
super(type);
}
@@ -29,15 +31,20 @@ public class ProtobufObjectEncoder<T> extends ObjectEncoder<ProtobufWriter, T>
}
Attribute attr = member.getAttribute();
boolean enumtostring = ((ProtobufFactory) factory).enumtostring;
this.memberSizeRequired |= ((ProtobufEncodeable) member.getEncoder()).requireSize();
setTag(member, ProtobufFactory.getTag(attr.field(), attr.genericType(), member.getPosition(), enumtostring));
}
@Override
protected ProtobufWriter objectWriter(ProtobufWriter out, T value) {
if (out.length() > out.initOffset) {
return out.pollChild().configParentFunc(out);
}
return out;
// if (memberSizeRequired) {
// out.writeLength(computeSize(value));
// }
// return out;
if (out.length() > out.initOffset) {
return out.pollChild().configParentFunc(out);
}
return out;
}
@Override
@@ -49,7 +56,11 @@ public class ProtobufObjectEncoder<T> extends ObjectEncoder<ProtobufWriter, T>
@Override
public int computeSize(T value) {
return 0;
int size = 0;
for (EnMember member : members) {
size += ((ProtobufEncodeable) member.getEncoder()).computeSize(member.getFieldValue(value));
}
return size;
}
@Override