From bdeabf4d7f7a8e0ac962222d43d5a8a8f5baa578 Mon Sep 17 00:00:00 2001 From: godotg Date: Mon, 4 Dec 2023 19:11:33 +0800 Subject: [PATCH] feat[protobuf]: check duplicate protocolId and protocolName --- .../com/zfoo/protocol/generate/GenerateProtobufTesting.java | 2 +- protocol/src/test/{resources/proto => protobuf}/all_type.proto | 0 protocol/src/test/{resources/proto => protobuf}/one_enum.proto | 0 protocol/src/test/{resources/proto => protobuf}/one_map.proto | 0 .../src/test/{resources/proto => protobuf}/one_message.proto | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename protocol/src/test/{resources/proto => protobuf}/all_type.proto (100%) rename protocol/src/test/{resources/proto => protobuf}/one_enum.proto (100%) rename protocol/src/test/{resources/proto => protobuf}/one_map.proto (100%) rename protocol/src/test/{resources/proto => protobuf}/one_message.proto (100%) diff --git a/protocol/src/test/java/com/zfoo/protocol/generate/GenerateProtobufTesting.java b/protocol/src/test/java/com/zfoo/protocol/generate/GenerateProtobufTesting.java index 6bdfbb18..79ee553f 100644 --- a/protocol/src/test/java/com/zfoo/protocol/generate/GenerateProtobufTesting.java +++ b/protocol/src/test/java/com/zfoo/protocol/generate/GenerateProtobufTesting.java @@ -24,7 +24,7 @@ public class GenerateProtobufTesting { @Test public void testAllTypeTest() { var buildOption = new PbGenerateOperation(); - buildOption.setProtoPath("D:\\github\\zfoo\\protocol\\src\\test\\resources\\proto"); + buildOption.setProtoPath("D:\\github\\zfoo\\protocol\\src\\test\\protobuf"); buildOption.setOutputPath("D:\\github\\zfoo\\protocol\\src\\test\\zfoopb"); buildOption.setJavaPackage("com.zfoo.protocol.generate.test"); diff --git a/protocol/src/test/resources/proto/all_type.proto b/protocol/src/test/protobuf/all_type.proto similarity index 100% rename from protocol/src/test/resources/proto/all_type.proto rename to protocol/src/test/protobuf/all_type.proto diff --git a/protocol/src/test/resources/proto/one_enum.proto b/protocol/src/test/protobuf/one_enum.proto similarity index 100% rename from protocol/src/test/resources/proto/one_enum.proto rename to protocol/src/test/protobuf/one_enum.proto diff --git a/protocol/src/test/resources/proto/one_map.proto b/protocol/src/test/protobuf/one_map.proto similarity index 100% rename from protocol/src/test/resources/proto/one_map.proto rename to protocol/src/test/protobuf/one_map.proto diff --git a/protocol/src/test/resources/proto/one_message.proto b/protocol/src/test/protobuf/one_message.proto similarity index 100% rename from protocol/src/test/resources/proto/one_message.proto rename to protocol/src/test/protobuf/one_message.proto