From ee0e9dfdde42f489e7715b620a2796daaef6ace9 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 1 Mar 2023 22:18:27 +0100 Subject: [PATCH 1/3] Add Java options for a correct generation --- src/blockchain_region_param_v1.proto | 3 +++ src/region.proto | 3 +++ src/service/iot_config.proto | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/blockchain_region_param_v1.proto b/src/blockchain_region_param_v1.proto index ae7a999c..a6cbfaa8 100644 --- a/src/blockchain_region_param_v1.proto +++ b/src/blockchain_region_param_v1.proto @@ -1,6 +1,9 @@ syntax = "proto3"; package helium; +option java_package = "xyz.nova.grpc"; +option java_outer_classname = "regionparam"; +option java_multiple_files = true; message blockchain_region_params_v1 { repeated blockchain_region_param_v1 region_params = 1; diff --git a/src/region.proto b/src/region.proto index facb13ed..185248ba 100644 --- a/src/region.proto +++ b/src/region.proto @@ -1,6 +1,9 @@ syntax = "proto3"; package helium; +option java_package = "xyz.nova.grpc"; +option java_outer_classname = "IotRegion"; +option java_multiple_files = true; enum region { US915 = 0; diff --git a/src/service/iot_config.proto b/src/service/iot_config.proto index fc0948a2..eac4bcdc 100644 --- a/src/service/iot_config.proto +++ b/src/service/iot_config.proto @@ -1,6 +1,9 @@ syntax = "proto3"; package helium.iot_config; +option java_package = "xyz.nova.grpc"; +option java_outer_classname = "IotConfig"; +option java_multiple_files = true; import "blockchain_region_param_v1.proto"; import "region.proto"; From 18de7e8597df392d5c765127f1c4a61505043eb7 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 20 Mar 2023 23:28:32 +0100 Subject: [PATCH 2/3] add proto used for poc_lora and change the package name --- src/blockchain_region_param_v1.proto | 2 +- src/data_rate.proto | 3 +++ src/region.proto | 2 +- src/service/iot_config.proto | 2 +- src/service/poc_lora.proto | 3 +++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/blockchain_region_param_v1.proto b/src/blockchain_region_param_v1.proto index a6cbfaa8..169a5db8 100644 --- a/src/blockchain_region_param_v1.proto +++ b/src/blockchain_region_param_v1.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package helium; -option java_package = "xyz.nova.grpc"; +option java_package = "com.helium.grpc"; option java_outer_classname = "regionparam"; option java_multiple_files = true; diff --git a/src/data_rate.proto b/src/data_rate.proto index d3129c1f..89481291 100644 --- a/src/data_rate.proto +++ b/src/data_rate.proto @@ -1,6 +1,9 @@ syntax = "proto3"; package helium; +option java_package = "com.helium.grpc"; +option java_outer_classname = "PocLoRa"; +option java_multiple_files = true; enum data_rate { SF12BW125 = 0; diff --git a/src/region.proto b/src/region.proto index 185248ba..d5435e58 100644 --- a/src/region.proto +++ b/src/region.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package helium; -option java_package = "xyz.nova.grpc"; +option java_package = "com.helium.grpc"; option java_outer_classname = "IotRegion"; option java_multiple_files = true; diff --git a/src/service/iot_config.proto b/src/service/iot_config.proto index eac4bcdc..ecc0cca5 100644 --- a/src/service/iot_config.proto +++ b/src/service/iot_config.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package helium.iot_config; -option java_package = "xyz.nova.grpc"; +option java_package = "com.helium.grpc"; option java_outer_classname = "IotConfig"; option java_multiple_files = true; diff --git a/src/service/poc_lora.proto b/src/service/poc_lora.proto index a5de1f70..0495b37b 100644 --- a/src/service/poc_lora.proto +++ b/src/service/poc_lora.proto @@ -1,6 +1,9 @@ syntax = "proto3"; package helium.poc_lora; +option java_package = "com.helium.grpc"; +option java_outer_classname = "PocLoRa"; +option java_multiple_files = true; import "data_rate.proto"; From 0625b9c66d7498004c6d1072617d57f180da2863 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 20 Aug 2023 13:08:13 +0200 Subject: [PATCH 3/3] add required Java options --- src/service/packet_verifier.proto | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/service/packet_verifier.proto b/src/service/packet_verifier.proto index 77c72617..5a709c3f 100644 --- a/src/service/packet_verifier.proto +++ b/src/service/packet_verifier.proto @@ -1,6 +1,9 @@ syntax = "proto3"; package helium.packet_verifier; +option java_package = "com.helium.grpc"; +option java_outer_classname = "PacketVerifier"; +option java_multiple_files = true; message valid_packet { uint32 payload_size = 1;