From d971fe94eefa3cd170b7de76f0ea7f71cacf4795 Mon Sep 17 00:00:00 2001 From: redkale Date: Mon, 18 Dec 2023 23:53:30 +0800 Subject: [PATCH] proto --- src/main/java/module-info.java | 2 +- .../java/org/redkale/boot/Application.java | 2 +- .../org/redkale/convert/ConvertFactory.java | 2 +- .../ProtobufArrayDecoder.java | 2 +- .../ProtobufArrayEncoder.java | 2 +- .../ProtobufByteBufferReader.java | 2 +- .../ProtobufByteBufferWriter.java | 2 +- .../ProtobufCollectionDecoder.java | 2 +- .../ProtobufCollectionEncoder.java | 2 +- .../{protobuf => proto}/ProtobufConvert.java | 2 +- .../ProtobufEnumSimpledCoder.java | 2 +- .../{protobuf => proto}/ProtobufFactory.java | 2 +- .../ProtobufMapDecoder.java | 2 +- .../ProtobufMapEncoder.java | 2 +- .../ProtobufObjectDecoder.java | 2 +- .../ProtobufObjectEncoder.java | 2 +- .../{protobuf => proto}/ProtobufReader.java | 2 +- .../ProtobufStreamDecoder.java | 2 +- .../ProtobufStreamEncoder.java | 2 +- .../ProtobufStreamReader.java | 2 +- .../ProtobufStreamWriter.java | 2 +- .../{protobuf => proto}/ProtobufWriter.java | 2 +- .../org/redkale/util/RedkaleClassLoader.java | 2 +- .../java/org/redkale/util/ResourceEvent.java | 20 +++++++++++++++++++ .../{protobuf => proto}/ArrayBean.java | 4 ++-- .../PBCustMessage2Test.java | 10 +++++----- .../PBCustMessageTest.java | 12 +++++------ .../{protobuf => proto}/PSimpleBean.proto | 0 .../PSimpleBeanOuterClass.java | 2 +- .../{protobuf => proto}/PTestBean.proto | 0 .../PTestBeanOuterClass.java | 2 +- .../{protobuf => proto}/SimpleBean.java | 2 +- .../convert/{protobuf => proto}/TestBean.java | 2 +- 33 files changed, 60 insertions(+), 40 deletions(-) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufArrayDecoder.java (97%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufArrayEncoder.java (97%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufByteBufferReader.java (99%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufByteBufferWriter.java (99%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufCollectionDecoder.java (97%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufCollectionEncoder.java (97%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufConvert.java (99%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufEnumSimpledCoder.java (98%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufFactory.java (99%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufMapDecoder.java (97%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufMapEncoder.java (97%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufObjectDecoder.java (98%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufObjectEncoder.java (97%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufReader.java (99%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufStreamDecoder.java (97%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufStreamEncoder.java (97%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufStreamReader.java (96%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufStreamWriter.java (96%) rename src/main/java/org/redkale/convert/{protobuf => proto}/ProtobufWriter.java (99%) create mode 100644 src/main/java/org/redkale/util/ResourceEvent.java rename src/test/java/org/redkale/test/convert/{protobuf => proto}/ArrayBean.java (95%) rename src/test/java/org/redkale/test/convert/{protobuf => proto}/PBCustMessage2Test.java (96%) rename src/test/java/org/redkale/test/convert/{protobuf => proto}/PBCustMessageTest.java (95%) rename src/test/java/org/redkale/test/convert/{protobuf => proto}/PSimpleBean.proto (100%) rename src/test/java/org/redkale/test/convert/{protobuf => proto}/PSimpleBeanOuterClass.java (99%) rename src/test/java/org/redkale/test/convert/{protobuf => proto}/PTestBean.proto (100%) rename src/test/java/org/redkale/test/convert/{protobuf => proto}/PTestBeanOuterClass.java (99%) rename src/test/java/org/redkale/test/convert/{protobuf => proto}/SimpleBean.java (98%) rename src/test/java/org/redkale/test/convert/{protobuf => proto}/TestBean.java (99%) diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index ddeb9fb1e..7914e508c 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -24,7 +24,7 @@ module org.redkale { exports org.redkale.convert.bson; exports org.redkale.convert.ext; exports org.redkale.convert.json; - exports org.redkale.convert.protobuf; + exports org.redkale.convert.proto; exports org.redkale.inject; exports org.redkale.lock; exports org.redkale.mq; diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java index 57a42e2eb..2fa651ae6 100644 --- a/src/main/java/org/redkale/boot/Application.java +++ b/src/main/java/org/redkale/boot/Application.java @@ -27,7 +27,7 @@ import org.redkale.cluster.*; import org.redkale.convert.Convert; import org.redkale.convert.bson.BsonFactory; import org.redkale.convert.json.*; -import org.redkale.convert.protobuf.ProtobufFactory; +import org.redkale.convert.proto.ProtobufFactory; import org.redkale.inject.ResourceEvent; import org.redkale.inject.ResourceFactory; import org.redkale.inject.ResourceTypeLoader; diff --git a/src/main/java/org/redkale/convert/ConvertFactory.java b/src/main/java/org/redkale/convert/ConvertFactory.java index 7f4397e75..fc2334953 100644 --- a/src/main/java/org/redkale/convert/ConvertFactory.java +++ b/src/main/java/org/redkale/convert/ConvertFactory.java @@ -21,7 +21,7 @@ import org.redkale.annotation.ConstructorParameters; import org.redkale.convert.bson.BsonConvert; import org.redkale.convert.ext.*; import org.redkale.convert.json.JsonConvert; -import org.redkale.convert.protobuf.ProtobufConvert; +import org.redkale.convert.proto.ProtobufConvert; import org.redkale.util.*; /** diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufArrayDecoder.java b/src/main/java/org/redkale/convert/proto/ProtobufArrayDecoder.java similarity index 97% rename from src/main/java/org/redkale/convert/protobuf/ProtobufArrayDecoder.java rename to src/main/java/org/redkale/convert/proto/ProtobufArrayDecoder.java index 28cc04ac8..7fcbfa56c 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufArrayDecoder.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufArrayDecoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufArrayEncoder.java b/src/main/java/org/redkale/convert/proto/ProtobufArrayEncoder.java similarity index 97% rename from src/main/java/org/redkale/convert/protobuf/ProtobufArrayEncoder.java rename to src/main/java/org/redkale/convert/proto/ProtobufArrayEncoder.java index fcfa056b6..1679a26b0 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufArrayEncoder.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufArrayEncoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufByteBufferReader.java b/src/main/java/org/redkale/convert/proto/ProtobufByteBufferReader.java similarity index 99% rename from src/main/java/org/redkale/convert/protobuf/ProtobufByteBufferReader.java rename to src/main/java/org/redkale/convert/proto/ProtobufByteBufferReader.java index f1306ef9e..d8cfcab06 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufByteBufferReader.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufByteBufferReader.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.nio.ByteBuffer; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufByteBufferWriter.java b/src/main/java/org/redkale/convert/proto/ProtobufByteBufferWriter.java similarity index 99% rename from src/main/java/org/redkale/convert/protobuf/ProtobufByteBufferWriter.java rename to src/main/java/org/redkale/convert/proto/ProtobufByteBufferWriter.java index 5d99d83ec..0ae10a27c 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufByteBufferWriter.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufByteBufferWriter.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.nio.ByteBuffer; import java.util.function.Supplier; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufCollectionDecoder.java b/src/main/java/org/redkale/convert/proto/ProtobufCollectionDecoder.java similarity index 97% rename from src/main/java/org/redkale/convert/protobuf/ProtobufCollectionDecoder.java rename to src/main/java/org/redkale/convert/proto/ProtobufCollectionDecoder.java index 20551f0a3..60c8b45c7 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufCollectionDecoder.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufCollectionDecoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufCollectionEncoder.java b/src/main/java/org/redkale/convert/proto/ProtobufCollectionEncoder.java similarity index 97% rename from src/main/java/org/redkale/convert/protobuf/ProtobufCollectionEncoder.java rename to src/main/java/org/redkale/convert/proto/ProtobufCollectionEncoder.java index 53fe9b314..d2496bb65 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufCollectionEncoder.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufCollectionEncoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufConvert.java b/src/main/java/org/redkale/convert/proto/ProtobufConvert.java similarity index 99% rename from src/main/java/org/redkale/convert/protobuf/ProtobufConvert.java rename to src/main/java/org/redkale/convert/proto/ProtobufConvert.java index ac85d9524..6d57df422 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufConvert.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufConvert.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.io.*; import java.lang.reflect.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufEnumSimpledCoder.java b/src/main/java/org/redkale/convert/proto/ProtobufEnumSimpledCoder.java similarity index 98% rename from src/main/java/org/redkale/convert/protobuf/ProtobufEnumSimpledCoder.java rename to src/main/java/org/redkale/convert/proto/ProtobufEnumSimpledCoder.java index 939d037a3..06a450842 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufEnumSimpledCoder.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufEnumSimpledCoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Method; import java.util.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufFactory.java b/src/main/java/org/redkale/convert/proto/ProtobufFactory.java similarity index 99% rename from src/main/java/org/redkale/convert/protobuf/ProtobufFactory.java rename to src/main/java/org/redkale/convert/proto/ProtobufFactory.java index 12d50fa03..9b4ad579d 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufFactory.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufFactory.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.io.Serializable; import java.lang.reflect.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufMapDecoder.java b/src/main/java/org/redkale/convert/proto/ProtobufMapDecoder.java similarity index 97% rename from src/main/java/org/redkale/convert/protobuf/ProtobufMapDecoder.java rename to src/main/java/org/redkale/convert/proto/ProtobufMapDecoder.java index a2c8fe781..1d8cd39f0 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufMapDecoder.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufMapDecoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import org.redkale.convert.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufMapEncoder.java b/src/main/java/org/redkale/convert/proto/ProtobufMapEncoder.java similarity index 97% rename from src/main/java/org/redkale/convert/protobuf/ProtobufMapEncoder.java rename to src/main/java/org/redkale/convert/proto/ProtobufMapEncoder.java index 016fabbc2..391afa60c 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufMapEncoder.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufMapEncoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import org.redkale.convert.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufObjectDecoder.java b/src/main/java/org/redkale/convert/proto/ProtobufObjectDecoder.java similarity index 98% rename from src/main/java/org/redkale/convert/protobuf/ProtobufObjectDecoder.java rename to src/main/java/org/redkale/convert/proto/ProtobufObjectDecoder.java index 286faf878..3cbdbd78d 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufObjectDecoder.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufObjectDecoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import org.redkale.convert.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufObjectEncoder.java b/src/main/java/org/redkale/convert/proto/ProtobufObjectEncoder.java similarity index 97% rename from src/main/java/org/redkale/convert/protobuf/ProtobufObjectEncoder.java rename to src/main/java/org/redkale/convert/proto/ProtobufObjectEncoder.java index 2b5b7d0ed..da2edb536 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufObjectEncoder.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufObjectEncoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import org.redkale.convert.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufReader.java b/src/main/java/org/redkale/convert/proto/ProtobufReader.java similarity index 99% rename from src/main/java/org/redkale/convert/protobuf/ProtobufReader.java rename to src/main/java/org/redkale/convert/proto/ProtobufReader.java index ec8e3fcf8..7f90b55f6 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufReader.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufReader.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufStreamDecoder.java b/src/main/java/org/redkale/convert/proto/ProtobufStreamDecoder.java similarity index 97% rename from src/main/java/org/redkale/convert/protobuf/ProtobufStreamDecoder.java rename to src/main/java/org/redkale/convert/proto/ProtobufStreamDecoder.java index 9a292c529..3f946a88f 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufStreamDecoder.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufStreamDecoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufStreamEncoder.java b/src/main/java/org/redkale/convert/proto/ProtobufStreamEncoder.java similarity index 97% rename from src/main/java/org/redkale/convert/protobuf/ProtobufStreamEncoder.java rename to src/main/java/org/redkale/convert/proto/ProtobufStreamEncoder.java index 6f4f2f048..cb5a77d80 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufStreamEncoder.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufStreamEncoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufStreamReader.java b/src/main/java/org/redkale/convert/proto/ProtobufStreamReader.java similarity index 96% rename from src/main/java/org/redkale/convert/protobuf/ProtobufStreamReader.java rename to src/main/java/org/redkale/convert/proto/ProtobufStreamReader.java index a4b2e97d6..319262076 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufStreamReader.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufStreamReader.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.io.*; import org.redkale.convert.*; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufStreamWriter.java b/src/main/java/org/redkale/convert/proto/ProtobufStreamWriter.java similarity index 96% rename from src/main/java/org/redkale/convert/protobuf/ProtobufStreamWriter.java rename to src/main/java/org/redkale/convert/proto/ProtobufStreamWriter.java index 74f6f3597..5bcbb9e21 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufStreamWriter.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufStreamWriter.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.io.*; import org.redkale.convert.ConvertException; diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufWriter.java b/src/main/java/org/redkale/convert/proto/ProtobufWriter.java similarity index 99% rename from src/main/java/org/redkale/convert/protobuf/ProtobufWriter.java rename to src/main/java/org/redkale/convert/proto/ProtobufWriter.java index 154ae8e64..510d1b797 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufWriter.java +++ b/src/main/java/org/redkale/convert/proto/ProtobufWriter.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.convert.protobuf; +package org.redkale.convert.proto; import java.lang.reflect.Type; import java.nio.ByteBuffer; diff --git a/src/main/java/org/redkale/util/RedkaleClassLoader.java b/src/main/java/org/redkale/util/RedkaleClassLoader.java index 156b05c49..c62f76da8 100644 --- a/src/main/java/org/redkale/util/RedkaleClassLoader.java +++ b/src/main/java/org/redkale/util/RedkaleClassLoader.java @@ -54,7 +54,7 @@ public class RedkaleClassLoader extends URLClassLoader { "org.redkale.convert.bson", "org.redkale.convert.ext", "org.redkale.convert.json", - "org.redkale.convert.protobuf", + "org.redkale.convert.proto", "org.redkale.inject", "org.redkale.lock", "org.redkale.mq", diff --git a/src/main/java/org/redkale/util/ResourceEvent.java b/src/main/java/org/redkale/util/ResourceEvent.java new file mode 100644 index 000000000..c70e47018 --- /dev/null +++ b/src/main/java/org/redkale/util/ResourceEvent.java @@ -0,0 +1,20 @@ +/* + * + */ +package org.redkale.util; + +/** + * 详情见: https://redkale.org + * + * @see org.redkale.inject.ResourceEvent + * + * @param 泛型 + * + * @author zhangjx + * @since 2.7.0 + * @deprecated replaced by org.redkale.inject.ResourceEvent + */ +@Deprecated(since = "2.8.0") +public interface ResourceEvent extends org.redkale.inject.ResourceEvent { + +} diff --git a/src/test/java/org/redkale/test/convert/protobuf/ArrayBean.java b/src/test/java/org/redkale/test/convert/proto/ArrayBean.java similarity index 95% rename from src/test/java/org/redkale/test/convert/protobuf/ArrayBean.java rename to src/test/java/org/redkale/test/convert/proto/ArrayBean.java index 83d0cb415..df6dded82 100644 --- a/src/test/java/org/redkale/test/convert/protobuf/ArrayBean.java +++ b/src/test/java/org/redkale/test/convert/proto/ArrayBean.java @@ -3,11 +3,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.test.convert.protobuf; +package org.redkale.test.convert.proto; import java.util.*; import org.redkale.util.Utility; -import org.redkale.convert.protobuf.ProtobufConvert; +import org.redkale.convert.proto.ProtobufConvert; /** * diff --git a/src/test/java/org/redkale/test/convert/protobuf/PBCustMessage2Test.java b/src/test/java/org/redkale/test/convert/proto/PBCustMessage2Test.java similarity index 96% rename from src/test/java/org/redkale/test/convert/protobuf/PBCustMessage2Test.java rename to src/test/java/org/redkale/test/convert/proto/PBCustMessage2Test.java index 4e3bfdee9..4b0494278 100644 --- a/src/test/java/org/redkale/test/convert/protobuf/PBCustMessage2Test.java +++ b/src/test/java/org/redkale/test/convert/proto/PBCustMessage2Test.java @@ -1,6 +1,6 @@ /* */ -package org.redkale.test.convert.protobuf; +package org.redkale.test.convert.proto; import java.lang.annotation.*; import static java.lang.annotation.ElementType.TYPE; @@ -10,10 +10,10 @@ import java.util.function.*; import org.junit.jupiter.api.*; import org.redkale.convert.*; import org.redkale.convert.json.JsonConvert; -import org.redkale.convert.protobuf.ProtobufConvert; -import org.redkale.convert.protobuf.ProtobufObjectDecoder; -import org.redkale.convert.protobuf.ProtobufObjectEncoder; -import org.redkale.convert.protobuf.ProtobufReader; +import org.redkale.convert.proto.ProtobufConvert; +import org.redkale.convert.proto.ProtobufObjectDecoder; +import org.redkale.convert.proto.ProtobufObjectEncoder; +import org.redkale.convert.proto.ProtobufReader; import org.redkale.util.*; /** diff --git a/src/test/java/org/redkale/test/convert/protobuf/PBCustMessageTest.java b/src/test/java/org/redkale/test/convert/proto/PBCustMessageTest.java similarity index 95% rename from src/test/java/org/redkale/test/convert/protobuf/PBCustMessageTest.java rename to src/test/java/org/redkale/test/convert/proto/PBCustMessageTest.java index b5b125671..c5753e7d9 100644 --- a/src/test/java/org/redkale/test/convert/protobuf/PBCustMessageTest.java +++ b/src/test/java/org/redkale/test/convert/proto/PBCustMessageTest.java @@ -1,6 +1,6 @@ /* */ -package org.redkale.test.convert.protobuf; +package org.redkale.test.convert.proto; import java.lang.annotation.*; import static java.lang.annotation.ElementType.TYPE; @@ -10,11 +10,11 @@ import java.util.function.*; import org.junit.jupiter.api.*; import org.redkale.convert.*; import org.redkale.convert.json.JsonConvert; -import org.redkale.convert.protobuf.ProtobufConvert; -import org.redkale.convert.protobuf.ProtobufFactory; -import org.redkale.convert.protobuf.ProtobufObjectDecoder; -import org.redkale.convert.protobuf.ProtobufObjectEncoder; -import org.redkale.convert.protobuf.ProtobufReader; +import org.redkale.convert.proto.ProtobufConvert; +import org.redkale.convert.proto.ProtobufFactory; +import org.redkale.convert.proto.ProtobufObjectDecoder; +import org.redkale.convert.proto.ProtobufObjectEncoder; +import org.redkale.convert.proto.ProtobufReader; import org.redkale.util.*; /** diff --git a/src/test/java/org/redkale/test/convert/protobuf/PSimpleBean.proto b/src/test/java/org/redkale/test/convert/proto/PSimpleBean.proto similarity index 100% rename from src/test/java/org/redkale/test/convert/protobuf/PSimpleBean.proto rename to src/test/java/org/redkale/test/convert/proto/PSimpleBean.proto diff --git a/src/test/java/org/redkale/test/convert/protobuf/PSimpleBeanOuterClass.java b/src/test/java/org/redkale/test/convert/proto/PSimpleBeanOuterClass.java similarity index 99% rename from src/test/java/org/redkale/test/convert/protobuf/PSimpleBeanOuterClass.java rename to src/test/java/org/redkale/test/convert/proto/PSimpleBeanOuterClass.java index ac4e8f08c..05da4b543 100644 --- a/src/test/java/org/redkale/test/convert/protobuf/PSimpleBeanOuterClass.java +++ b/src/test/java/org/redkale/test/convert/proto/PSimpleBeanOuterClass.java @@ -1,4 +1,4 @@ -package org.redkale.test.convert.protobuf; +package org.redkale.test.convert.proto; //// Generated by the protocol buffer compiler. DO NOT EDIT! //// source: src/test/java/org/redkalex/test/protobuf/PSimpleBean.proto diff --git a/src/test/java/org/redkale/test/convert/protobuf/PTestBean.proto b/src/test/java/org/redkale/test/convert/proto/PTestBean.proto similarity index 100% rename from src/test/java/org/redkale/test/convert/protobuf/PTestBean.proto rename to src/test/java/org/redkale/test/convert/proto/PTestBean.proto diff --git a/src/test/java/org/redkale/test/convert/protobuf/PTestBeanOuterClass.java b/src/test/java/org/redkale/test/convert/proto/PTestBeanOuterClass.java similarity index 99% rename from src/test/java/org/redkale/test/convert/protobuf/PTestBeanOuterClass.java rename to src/test/java/org/redkale/test/convert/proto/PTestBeanOuterClass.java index 7578c0954..26c256558 100644 --- a/src/test/java/org/redkale/test/convert/protobuf/PTestBeanOuterClass.java +++ b/src/test/java/org/redkale/test/convert/proto/PTestBeanOuterClass.java @@ -1,4 +1,4 @@ -package org.redkale.test.convert.protobuf; +package org.redkale.test.convert.proto; //// Generated by the protocol buffer compiler. DO NOT EDIT! //// source: src/test/java/org/redkalex/test/protobuf/PTestBean.proto diff --git a/src/test/java/org/redkale/test/convert/protobuf/SimpleBean.java b/src/test/java/org/redkale/test/convert/proto/SimpleBean.java similarity index 98% rename from src/test/java/org/redkale/test/convert/protobuf/SimpleBean.java rename to src/test/java/org/redkale/test/convert/proto/SimpleBean.java index 3386fc521..ea75f3f2c 100644 --- a/src/test/java/org/redkale/test/convert/protobuf/SimpleBean.java +++ b/src/test/java/org/redkale/test/convert/proto/SimpleBean.java @@ -1,4 +1,4 @@ -package org.redkale.test.convert.protobuf; +package org.redkale.test.convert.proto; ///* // * To change this license header, choose License Headers in Project Properties. diff --git a/src/test/java/org/redkale/test/convert/protobuf/TestBean.java b/src/test/java/org/redkale/test/convert/proto/TestBean.java similarity index 99% rename from src/test/java/org/redkale/test/convert/protobuf/TestBean.java rename to src/test/java/org/redkale/test/convert/proto/TestBean.java index 8bcf7701e..d600817a2 100644 --- a/src/test/java/org/redkale/test/convert/protobuf/TestBean.java +++ b/src/test/java/org/redkale/test/convert/proto/TestBean.java @@ -1,4 +1,4 @@ -package org.redkale.test.convert.protobuf; +package org.redkale.test.convert.proto; ///* // * To change this license header, choose License Headers in Project Properties.