From 9d169c568bca0fb2bc783348490fd4a802f348bf Mon Sep 17 00:00:00 2001 From: redkale Date: Tue, 13 Aug 2024 19:57:06 +0800 Subject: [PATCH] =?UTF-8?q?protobuf=E6=9B=B4=E6=8D=A2=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/agent-message.md | 2 +- src/main/java/module-info.java | 2 +- src/main/java/org/redkale/boot/Application.java | 2 +- .../java/org/redkale/convert/ConvertFactory.java | 2 +- .../convert/{proto => pb}/ProtobufArrayDecoder.java | 2 +- .../convert/{proto => pb}/ProtobufArrayEncoder.java | 2 +- .../{proto => pb}/ProtobufByteBufferReader.java | 2 +- .../{proto => pb}/ProtobufByteBufferWriter.java | 2 +- .../{proto => pb}/ProtobufCollectionDecoder.java | 2 +- .../{proto => pb}/ProtobufCollectionEncoder.java | 2 +- .../convert/{proto => pb}/ProtobufConvert.java | 2 +- .../{proto => pb}/ProtobufEnumSimpledCoder.java | 2 +- .../convert/{proto => pb}/ProtobufFactory.java | 2 +- .../convert/{proto => pb}/ProtobufMapDecoder.java | 2 +- .../convert/{proto => pb}/ProtobufMapEncoder.java | 2 +- .../convert/{proto => pb}/ProtobufObjectDecoder.java | 2 +- .../convert/{proto => pb}/ProtobufObjectEncoder.java | 2 +- .../convert/{proto => pb}/ProtobufReader.java | 2 +- .../convert/{proto => pb}/ProtobufStreamDecoder.java | 2 +- .../convert/{proto => pb}/ProtobufStreamEncoder.java | 2 +- .../convert/{proto => pb}/ProtobufStreamReader.java | 2 +- .../convert/{proto => pb}/ProtobufStreamWriter.java | 2 +- .../convert/{proto => pb}/ProtobufWriter.java | 2 +- .../java/org/redkale/util/RedkaleClassLoader.java | 2 +- .../test/convert/{proto => pb}/ArrayBean.java | 4 ++-- .../convert/{proto => pb}/PBCustMessage2Test.java | 10 +++++----- .../convert/{proto => pb}/PBCustMessageTest.java | 12 ++++++------ .../test/convert/{proto => pb}/PSimpleBean.proto | 0 .../convert/{proto => pb}/PSimpleBeanOuterClass.java | 2 +- .../test/convert/{proto => pb}/PTestBean.proto | 0 .../convert/{proto => pb}/PTestBeanOuterClass.java | 2 +- .../test/convert/{proto => pb}/SimpleBean.java | 4 ++-- .../redkale/test/convert/{proto => pb}/TestBean.java | 6 +++--- .../java/org/redkale/test/mq/TestMessageManager.java | 6 +++--- 34 files changed, 47 insertions(+), 47 deletions(-) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufArrayDecoder.java (97%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufArrayEncoder.java (98%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufByteBufferReader.java (99%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufByteBufferWriter.java (99%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufCollectionDecoder.java (97%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufCollectionEncoder.java (98%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufConvert.java (99%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufEnumSimpledCoder.java (98%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufFactory.java (99%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufMapDecoder.java (97%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufMapEncoder.java (97%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufObjectDecoder.java (98%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufObjectEncoder.java (97%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufReader.java (99%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufStreamDecoder.java (97%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufStreamEncoder.java (98%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufStreamReader.java (96%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufStreamWriter.java (97%) rename src/main/java/org/redkale/convert/{proto => pb}/ProtobufWriter.java (99%) rename src/test/java/org/redkale/test/convert/{proto => pb}/ArrayBean.java (95%) rename src/test/java/org/redkale/test/convert/{proto => pb}/PBCustMessage2Test.java (97%) rename src/test/java/org/redkale/test/convert/{proto => pb}/PBCustMessageTest.java (95%) rename src/test/java/org/redkale/test/convert/{proto => pb}/PSimpleBean.proto (100%) rename src/test/java/org/redkale/test/convert/{proto => pb}/PSimpleBeanOuterClass.java (99%) rename src/test/java/org/redkale/test/convert/{proto => pb}/PTestBean.proto (100%) rename src/test/java/org/redkale/test/convert/{proto => pb}/PTestBeanOuterClass.java (99%) rename src/test/java/org/redkale/test/convert/{proto => pb}/SimpleBean.java (97%) rename src/test/java/org/redkale/test/convert/{proto => pb}/TestBean.java (98%) diff --git a/docs/agent-message.md b/docs/agent-message.md index acc7a615b..70fc06835 100644 --- a/docs/agent-message.md +++ b/docs/agent-message.md @@ -85,7 +85,7 @@ public class TestMessageManager extends AbstractService { manager.createTopic("topic_1", "topic_2").join(); } - // 创建topic + // 删除topic public void deleteTopic() { manager.deleteTopic("topic_1", "topic_2").join(); } diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 54ef761dc..c90520e75 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -21,7 +21,7 @@ module org.redkale { exports org.redkale.convert.bson; exports org.redkale.convert.ext; exports org.redkale.convert.json; - exports org.redkale.convert.proto; + exports org.redkale.convert.pb; exports org.redkale.convert.spi; exports org.redkale.inject; exports org.redkale.locked; diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java index 85dd52a72..d4be96404 100644 --- a/src/main/java/org/redkale/boot/Application.java +++ b/src/main/java/org/redkale/boot/Application.java @@ -33,7 +33,7 @@ import org.redkale.cluster.spi.HttpLocalRpcClient; import org.redkale.convert.Convert; import org.redkale.convert.bson.BsonFactory; import org.redkale.convert.json.*; -import org.redkale.convert.proto.ProtobufFactory; +import org.redkale.convert.pb.ProtobufFactory; import org.redkale.inject.ResourceAnnotationLoader; import org.redkale.inject.ResourceEvent; import org.redkale.inject.ResourceFactory; diff --git a/src/main/java/org/redkale/convert/ConvertFactory.java b/src/main/java/org/redkale/convert/ConvertFactory.java index 73744d05c..e50871fea 100644 --- a/src/main/java/org/redkale/convert/ConvertFactory.java +++ b/src/main/java/org/redkale/convert/ConvertFactory.java @@ -23,7 +23,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.proto.ProtobufConvert; +import org.redkale.convert.pb.ProtobufConvert; import org.redkale.convert.spi.ConvertProvider; import org.redkale.util.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufArrayDecoder.java b/src/main/java/org/redkale/convert/pb/ProtobufArrayDecoder.java similarity index 97% rename from src/main/java/org/redkale/convert/proto/ProtobufArrayDecoder.java rename to src/main/java/org/redkale/convert/pb/ProtobufArrayDecoder.java index d989c7764..684b60d85 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufArrayDecoder.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufArrayEncoder.java b/src/main/java/org/redkale/convert/pb/ProtobufArrayEncoder.java similarity index 98% rename from src/main/java/org/redkale/convert/proto/ProtobufArrayEncoder.java rename to src/main/java/org/redkale/convert/pb/ProtobufArrayEncoder.java index eb10853db..3fd3982ce 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufArrayEncoder.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufByteBufferReader.java b/src/main/java/org/redkale/convert/pb/ProtobufByteBufferReader.java similarity index 99% rename from src/main/java/org/redkale/convert/proto/ProtobufByteBufferReader.java rename to src/main/java/org/redkale/convert/pb/ProtobufByteBufferReader.java index 743b2ed53..3378ff155 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufByteBufferReader.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.nio.ByteBuffer; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufByteBufferWriter.java b/src/main/java/org/redkale/convert/pb/ProtobufByteBufferWriter.java similarity index 99% rename from src/main/java/org/redkale/convert/proto/ProtobufByteBufferWriter.java rename to src/main/java/org/redkale/convert/pb/ProtobufByteBufferWriter.java index 31baeea01..20fbbe1fd 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufByteBufferWriter.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.nio.ByteBuffer; import java.util.function.Supplier; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufCollectionDecoder.java b/src/main/java/org/redkale/convert/pb/ProtobufCollectionDecoder.java similarity index 97% rename from src/main/java/org/redkale/convert/proto/ProtobufCollectionDecoder.java rename to src/main/java/org/redkale/convert/pb/ProtobufCollectionDecoder.java index 8634bb056..62ab64249 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufCollectionDecoder.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufCollectionEncoder.java b/src/main/java/org/redkale/convert/pb/ProtobufCollectionEncoder.java similarity index 98% rename from src/main/java/org/redkale/convert/proto/ProtobufCollectionEncoder.java rename to src/main/java/org/redkale/convert/pb/ProtobufCollectionEncoder.java index 6e50a62d7..39206b2ff 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufCollectionEncoder.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufConvert.java b/src/main/java/org/redkale/convert/pb/ProtobufConvert.java similarity index 99% rename from src/main/java/org/redkale/convert/proto/ProtobufConvert.java rename to src/main/java/org/redkale/convert/pb/ProtobufConvert.java index a9effe2b9..37dea8fd2 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufConvert.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.io.*; import java.lang.reflect.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufEnumSimpledCoder.java b/src/main/java/org/redkale/convert/pb/ProtobufEnumSimpledCoder.java similarity index 98% rename from src/main/java/org/redkale/convert/proto/ProtobufEnumSimpledCoder.java rename to src/main/java/org/redkale/convert/pb/ProtobufEnumSimpledCoder.java index c9bda7d40..fb2561fe1 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufEnumSimpledCoder.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Method; import java.util.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufFactory.java b/src/main/java/org/redkale/convert/pb/ProtobufFactory.java similarity index 99% rename from src/main/java/org/redkale/convert/proto/ProtobufFactory.java rename to src/main/java/org/redkale/convert/pb/ProtobufFactory.java index baf747029..c75d9e51e 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufFactory.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.io.Serializable; import java.lang.reflect.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufMapDecoder.java b/src/main/java/org/redkale/convert/pb/ProtobufMapDecoder.java similarity index 97% rename from src/main/java/org/redkale/convert/proto/ProtobufMapDecoder.java rename to src/main/java/org/redkale/convert/pb/ProtobufMapDecoder.java index acbaa0dc1..17af931f0 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufMapDecoder.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Type; import org.redkale.convert.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufMapEncoder.java b/src/main/java/org/redkale/convert/pb/ProtobufMapEncoder.java similarity index 97% rename from src/main/java/org/redkale/convert/proto/ProtobufMapEncoder.java rename to src/main/java/org/redkale/convert/pb/ProtobufMapEncoder.java index cfa8d1e0d..5471e798d 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufMapEncoder.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Type; import org.redkale.convert.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufObjectDecoder.java b/src/main/java/org/redkale/convert/pb/ProtobufObjectDecoder.java similarity index 98% rename from src/main/java/org/redkale/convert/proto/ProtobufObjectDecoder.java rename to src/main/java/org/redkale/convert/pb/ProtobufObjectDecoder.java index 88c2c591f..d4c275bcf 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufObjectDecoder.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Type; import org.redkale.convert.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufObjectEncoder.java b/src/main/java/org/redkale/convert/pb/ProtobufObjectEncoder.java similarity index 97% rename from src/main/java/org/redkale/convert/proto/ProtobufObjectEncoder.java rename to src/main/java/org/redkale/convert/pb/ProtobufObjectEncoder.java index 7e7f4d79d..899065083 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufObjectEncoder.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Type; import org.redkale.convert.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufReader.java b/src/main/java/org/redkale/convert/pb/ProtobufReader.java similarity index 99% rename from src/main/java/org/redkale/convert/proto/ProtobufReader.java rename to src/main/java/org/redkale/convert/pb/ProtobufReader.java index 58f1d0e64..71fd25ad9 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufReader.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufStreamDecoder.java b/src/main/java/org/redkale/convert/pb/ProtobufStreamDecoder.java similarity index 97% rename from src/main/java/org/redkale/convert/proto/ProtobufStreamDecoder.java rename to src/main/java/org/redkale/convert/pb/ProtobufStreamDecoder.java index ade0a1032..ef842f49c 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufStreamDecoder.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufStreamEncoder.java b/src/main/java/org/redkale/convert/pb/ProtobufStreamEncoder.java similarity index 98% rename from src/main/java/org/redkale/convert/proto/ProtobufStreamEncoder.java rename to src/main/java/org/redkale/convert/pb/ProtobufStreamEncoder.java index 815638fea..fe134d59c 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufStreamEncoder.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.lang.reflect.Type; import java.util.concurrent.atomic.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufStreamReader.java b/src/main/java/org/redkale/convert/pb/ProtobufStreamReader.java similarity index 96% rename from src/main/java/org/redkale/convert/proto/ProtobufStreamReader.java rename to src/main/java/org/redkale/convert/pb/ProtobufStreamReader.java index 37f3a8a9e..126b3abd1 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufStreamReader.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.io.*; import org.redkale.convert.*; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufStreamWriter.java b/src/main/java/org/redkale/convert/pb/ProtobufStreamWriter.java similarity index 97% rename from src/main/java/org/redkale/convert/proto/ProtobufStreamWriter.java rename to src/main/java/org/redkale/convert/pb/ProtobufStreamWriter.java index 38392c33b..077dc6bb5 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufStreamWriter.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; import java.io.*; import org.redkale.convert.ConvertException; diff --git a/src/main/java/org/redkale/convert/proto/ProtobufWriter.java b/src/main/java/org/redkale/convert/pb/ProtobufWriter.java similarity index 99% rename from src/main/java/org/redkale/convert/proto/ProtobufWriter.java rename to src/main/java/org/redkale/convert/pb/ProtobufWriter.java index 281d62d38..361763eca 100644 --- a/src/main/java/org/redkale/convert/proto/ProtobufWriter.java +++ b/src/main/java/org/redkale/convert/pb/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.proto; +package org.redkale.convert.pb; 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 86467991a..ac23dc1a9 100644 --- a/src/main/java/org/redkale/util/RedkaleClassLoader.java +++ b/src/main/java/org/redkale/util/RedkaleClassLoader.java @@ -45,7 +45,7 @@ public class RedkaleClassLoader extends URLClassLoader { "org.redkale.convert.bson", "org.redkale.convert.ext", "org.redkale.convert.json", - "org.redkale.convert.proto", + "org.redkale.convert.pb", "org.redkale.convert.spi", "org.redkale.inject", "org.redkale.locked", diff --git a/src/test/java/org/redkale/test/convert/proto/ArrayBean.java b/src/test/java/org/redkale/test/convert/pb/ArrayBean.java similarity index 95% rename from src/test/java/org/redkale/test/convert/proto/ArrayBean.java rename to src/test/java/org/redkale/test/convert/pb/ArrayBean.java index 39823fa23..7fe83c660 100644 --- a/src/test/java/org/redkale/test/convert/proto/ArrayBean.java +++ b/src/test/java/org/redkale/test/convert/pb/ArrayBean.java @@ -3,10 +3,10 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.test.convert.proto; +package org.redkale.test.convert.pb; import java.util.*; -import org.redkale.convert.proto.ProtobufConvert; +import org.redkale.convert.pb.ProtobufConvert; import org.redkale.util.Utility; /** @author zhangjx */ diff --git a/src/test/java/org/redkale/test/convert/proto/PBCustMessage2Test.java b/src/test/java/org/redkale/test/convert/pb/PBCustMessage2Test.java similarity index 97% rename from src/test/java/org/redkale/test/convert/proto/PBCustMessage2Test.java rename to src/test/java/org/redkale/test/convert/pb/PBCustMessage2Test.java index 4e1ebb82d..6b81e1b65 100644 --- a/src/test/java/org/redkale/test/convert/proto/PBCustMessage2Test.java +++ b/src/test/java/org/redkale/test/convert/pb/PBCustMessage2Test.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.test.convert.proto; +package org.redkale.test.convert.pb; import java.lang.annotation.*; import static java.lang.annotation.ElementType.TYPE; @@ -13,10 +13,10 @@ import java.util.function.*; import org.junit.jupiter.api.*; import org.redkale.convert.*; import org.redkale.convert.json.JsonConvert; -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.convert.pb.ProtobufConvert; +import org.redkale.convert.pb.ProtobufObjectDecoder; +import org.redkale.convert.pb.ProtobufObjectEncoder; +import org.redkale.convert.pb.ProtobufReader; import org.redkale.util.*; /** @author zhangjx */ diff --git a/src/test/java/org/redkale/test/convert/proto/PBCustMessageTest.java b/src/test/java/org/redkale/test/convert/pb/PBCustMessageTest.java similarity index 95% rename from src/test/java/org/redkale/test/convert/proto/PBCustMessageTest.java rename to src/test/java/org/redkale/test/convert/pb/PBCustMessageTest.java index b1dabe002..9e608ec94 100644 --- a/src/test/java/org/redkale/test/convert/proto/PBCustMessageTest.java +++ b/src/test/java/org/redkale/test/convert/pb/PBCustMessageTest.java @@ -1,6 +1,6 @@ /* */ -package org.redkale.test.convert.proto; +package org.redkale.test.convert.pb; 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.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.convert.pb.ProtobufConvert; +import org.redkale.convert.pb.ProtobufFactory; +import org.redkale.convert.pb.ProtobufObjectDecoder; +import org.redkale.convert.pb.ProtobufObjectEncoder; +import org.redkale.convert.pb.ProtobufReader; import org.redkale.util.*; /** @author zhangjx */ diff --git a/src/test/java/org/redkale/test/convert/proto/PSimpleBean.proto b/src/test/java/org/redkale/test/convert/pb/PSimpleBean.proto similarity index 100% rename from src/test/java/org/redkale/test/convert/proto/PSimpleBean.proto rename to src/test/java/org/redkale/test/convert/pb/PSimpleBean.proto diff --git a/src/test/java/org/redkale/test/convert/proto/PSimpleBeanOuterClass.java b/src/test/java/org/redkale/test/convert/pb/PSimpleBeanOuterClass.java similarity index 99% rename from src/test/java/org/redkale/test/convert/proto/PSimpleBeanOuterClass.java rename to src/test/java/org/redkale/test/convert/pb/PSimpleBeanOuterClass.java index 0824fba43..7eee03c22 100644 --- a/src/test/java/org/redkale/test/convert/proto/PSimpleBeanOuterClass.java +++ b/src/test/java/org/redkale/test/convert/pb/PSimpleBeanOuterClass.java @@ -1,4 +1,4 @@ -package org.redkale.test.convert.proto; +package org.redkale.test.convert.pb; //// 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/proto/PTestBean.proto b/src/test/java/org/redkale/test/convert/pb/PTestBean.proto similarity index 100% rename from src/test/java/org/redkale/test/convert/proto/PTestBean.proto rename to src/test/java/org/redkale/test/convert/pb/PTestBean.proto diff --git a/src/test/java/org/redkale/test/convert/proto/PTestBeanOuterClass.java b/src/test/java/org/redkale/test/convert/pb/PTestBeanOuterClass.java similarity index 99% rename from src/test/java/org/redkale/test/convert/proto/PTestBeanOuterClass.java rename to src/test/java/org/redkale/test/convert/pb/PTestBeanOuterClass.java index fb92102e7..80ba7d4d7 100644 --- a/src/test/java/org/redkale/test/convert/proto/PTestBeanOuterClass.java +++ b/src/test/java/org/redkale/test/convert/pb/PTestBeanOuterClass.java @@ -1,4 +1,4 @@ -package org.redkale.test.convert.proto; +package org.redkale.test.convert.pb; //// 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/proto/SimpleBean.java b/src/test/java/org/redkale/test/convert/pb/SimpleBean.java similarity index 97% rename from src/test/java/org/redkale/test/convert/proto/SimpleBean.java rename to src/test/java/org/redkale/test/convert/pb/SimpleBean.java index 98387d8c9..712eb7d73 100644 --- a/src/test/java/org/redkale/test/convert/proto/SimpleBean.java +++ b/src/test/java/org/redkale/test/convert/pb/SimpleBean.java @@ -1,4 +1,4 @@ -package org.redkale.test.convert.proto; +package org.redkale.test.convert.pb; /// * // * To change this license header, choose License Headers in Project Properties. @@ -11,7 +11,7 @@ package org.redkale.test.convert.proto; // import org.redkale.convert.ConvertColumn; // import org.redkale.convert.json.JsonConvert; // import org.redkale.util.Utility; -// import org.redkalex.convert.protobuf.ProtobufConvert; +// import org.redkale.convert.pb.ProtobufConvert; // /// ** // * diff --git a/src/test/java/org/redkale/test/convert/proto/TestBean.java b/src/test/java/org/redkale/test/convert/pb/TestBean.java similarity index 98% rename from src/test/java/org/redkale/test/convert/proto/TestBean.java rename to src/test/java/org/redkale/test/convert/pb/TestBean.java index c8bfae3ad..cbbf596b1 100644 --- a/src/test/java/org/redkale/test/convert/proto/TestBean.java +++ b/src/test/java/org/redkale/test/convert/pb/TestBean.java @@ -1,4 +1,4 @@ -package org.redkale.test.convert.proto; +package org.redkale.test.convert.pb; /// * // * To change this license header, choose License Headers in Project Properties. @@ -7,8 +7,8 @@ package org.redkale.test.convert.proto; // */ // package org.redkalex.test.protobuf; // -// import org.redkalex.convert.protobuf.ProtobufReader; -// import org.redkalex.convert.protobuf.ProtobufConvert; +// import org.redkale.convert.pb.ProtobufReader; +// import org.redkale.convert.pb.ProtobufConvert; // import com.google.protobuf.*; // import java.util.*; // import org.redkale.convert.ConvertColumn; diff --git a/src/test/java/org/redkale/test/mq/TestMessageManager.java b/src/test/java/org/redkale/test/mq/TestMessageManager.java index cfaec07d3..012bc9d21 100644 --- a/src/test/java/org/redkale/test/mq/TestMessageManager.java +++ b/src/test/java/org/redkale/test/mq/TestMessageManager.java @@ -22,12 +22,12 @@ public class TestMessageManager extends AbstractService { public void initTopic() { manager.createTopic("topic_1", "topic_2").join(); } - - // 创建topic + + // 删除topic public void deleteTopic() { manager.deleteTopic("topic_1", "topic_2").join(); } - + // 查询topic public void printTopic() { List topics = manager.queryTopic().join();