fix default value handling for NativeType trait

ntex-rs · Nov 15, 2022 · 9a9aa33 · 9a9aa33
1 parent b9e0379
commit 9a9aa33
Show file tree

Hide file tree

Showing 14 changed files with 202 additions and 92 deletions.
diff --git a/examples/custom/Cargo.toml b/examples/custom/Cargo.toml
@@ -9,7 +9,7 @@ path = "src/client.rs"
 
 [dependencies]
 ntex = "0.5"
-ntex-grpc = "0.1.0"
+ntex-grpc = "0.2.0-b.2"
 
 async-trait = "0.1.0"
 clap = "3.2"

diff --git a/examples/custom/src/helloworld.rs b/examples/custom/src/helloworld.rs
@@ -3,19 +3,20 @@
     unused_mut,
     unused_variables,
     clippy::identity_op,
-    clippy::derivable_impls
+    clippy::derivable_impls,
+    clippy::unit_arg
 )]
 /// DO NOT MODIFY. Auto-generated file
 
 ///  The request message containing the user's name.
-#[derive(Clone, PartialEq, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct HelloRequest {
     pub name: ::ntex_grpc::ByteString,
     pub msg_id: crate::unique_id::UniqueId,
 }
 
 ///  The response message containing the greetings
-#[derive(Clone, PartialEq, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct HelloReply {
     pub message: ::ntex_grpc::ByteString,
 }
@@ -105,8 +106,13 @@ impl<T: ::ntex_grpc::Transport<GreeterSayHelloMethod>> GreeterClient<T> {
 impl ::ntex_grpc::Message for HelloRequest {
     #[inline]
     fn write(&self, dst: &mut ::ntex_grpc::BytesMut) {
-        ::ntex_grpc::NativeType::serialize(&self.name, 1, None, dst);
-        ::ntex_grpc::NativeType::serialize(&self.msg_id, 2, None, dst);
+        ::ntex_grpc::NativeType::serialize(&self.name, 1, ::ntex_grpc::DefaultValue::Default, dst);
+        ::ntex_grpc::NativeType::serialize(
+            &self.msg_id,
+            2,
+            ::ntex_grpc::DefaultValue::Default,
+            dst,
+        );
     }
 
     #[inline]
@@ -130,8 +136,15 @@ impl ::ntex_grpc::Message for HelloRequest {
 
     #[inline]
     fn encoded_len(&self) -> usize {
-        0 + ::ntex_grpc::NativeType::serialized_len(&self.name, 1, None)
-            + ::ntex_grpc::NativeType::serialized_len(&self.msg_id, 2, None)
+        0 + ::ntex_grpc::NativeType::serialized_len(
+            &self.name,
+            1,
+            ::ntex_grpc::DefaultValue::Default,
+        ) + ::ntex_grpc::NativeType::serialized_len(
+            &self.msg_id,
+            2,
+            ::ntex_grpc::DefaultValue::Default,
+        )
     }
 }
 
@@ -147,7 +160,12 @@ impl ::std::default::Default for HelloRequest {
 impl ::ntex_grpc::Message for HelloReply {
     #[inline]
     fn write(&self, dst: &mut ::ntex_grpc::BytesMut) {
-        ::ntex_grpc::NativeType::serialize(&self.message, 1, None, dst);
+        ::ntex_grpc::NativeType::serialize(
+            &self.message,
+            1,
+            ::ntex_grpc::DefaultValue::Default,
+            dst,
+        );
     }
 
     #[inline]
@@ -169,7 +187,11 @@ impl ::ntex_grpc::Message for HelloReply {
 
     #[inline]
     fn encoded_len(&self) -> usize {
-        0 + ::ntex_grpc::NativeType::serialized_len(&self.message, 1, None)
+        0 + ::ntex_grpc::NativeType::serialized_len(
+            &self.message,
+            1,
+            ::ntex_grpc::DefaultValue::Default,
+        )
     }
 }
 

diff --git a/examples/custom/src/unique_id.rs b/examples/custom/src/unique_id.rs
@@ -1,7 +1,7 @@
 use ntex::util::{Bytes, BytesMut};
 use uuid::Uuid;
 
-#[derive(Clone, Copy, PartialEq, Debug)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub struct UniqueId(Uuid);
 
 impl UniqueId {

diff --git a/examples/helloworld/Cargo.toml b/examples/helloworld/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/server.rs"
 
 [dependencies]
 ntex = "0.5"
-ntex-grpc = "0.1.0"
+ntex-grpc = "0.2.0-b.2"
 
 async-trait = "0.1.0"
 clap = "2"

diff --git a/examples/helloworld/src/helloworld.rs b/examples/helloworld/src/helloworld.rs
@@ -3,18 +3,19 @@
     unused_mut,
     unused_variables,
     clippy::identity_op,
-    clippy::derivable_impls
+    clippy::derivable_impls,
+    clippy::unit_arg
 )]
 /// DO NOT MODIFY. Auto-generated file
 
 ///  The request message containing the user's name.
-#[derive(Clone, PartialEq, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct HelloRequest {
     pub name: ::ntex_grpc::ByteString,
 }
 
 ///  The response message containing the greetings
-#[derive(Clone, PartialEq, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct HelloReply {
     pub metadata: i64,
     pub reply_type: hello_reply::Type,
@@ -102,7 +103,7 @@ pub mod hello_reply {
         }
     }
 
-    #[derive(Clone, PartialEq, Debug)]
+    #[derive(Clone, PartialEq, Eq, Debug)]
     pub enum Result {
         Success(super::ResponseResult),
         ServiceError(i64),
@@ -122,17 +123,31 @@ pub mod hello_reply {
         }
 
         /// Encodes the message to a buffer.
-        fn serialize(&self, _: u32, _: Option<&Self>, dst: &mut ::ntex_grpc::BytesMut) {
+        fn serialize(
+            &self,
+            _: u32,
+            _: ::ntex_grpc::DefaultValue<&Self>,
+            dst: &mut ::ntex_grpc::BytesMut,
+        ) {
             match *self {
-                Result::Success(ref value) => {
-                    ::ntex_grpc::NativeType::serialize(value, 1, None, dst)
-                }
-                Result::ServiceError(ref value) => {
-                    ::ntex_grpc::NativeType::serialize(value, 2, None, dst)
-                }
-                Result::InvalidRequest(ref value) => {
-                    ::ntex_grpc::NativeType::serialize(value, 3, None, dst)
-                }
+                Result::Success(ref value) => ::ntex_grpc::NativeType::serialize(
+                    value,
+                    1,
+                    ::ntex_grpc::DefaultValue::Default,
+                    dst,
+                ),
+                Result::ServiceError(ref value) => ::ntex_grpc::NativeType::serialize(
+                    value,
+                    2,
+                    ::ntex_grpc::DefaultValue::Default,
+                    dst,
+                ),
+                Result::InvalidRequest(ref value) => ::ntex_grpc::NativeType::serialize(
+                    value,
+                    3,
+                    ::ntex_grpc::DefaultValue::Default,
+                    dst,
+                ),
             }
         }
         /// Decodes an instance of the message from a buffer, and merges it into self.
@@ -158,17 +173,23 @@ pub mod hello_reply {
             Ok(())
         }
         /// Returns the encoded length of the message without a length delimiter.
-        fn serialized_len(&self, _: u32, _: Option<&Self>) -> usize {
+        fn serialized_len(&self, _: u32, _: ::ntex_grpc::DefaultValue<&Self>) -> usize {
             match *self {
-                Result::Success(ref value) => {
-                    ::ntex_grpc::NativeType::serialized_len(value, 1, None)
-                }
-                Result::ServiceError(ref value) => {
-                    ::ntex_grpc::NativeType::serialized_len(value, 2, None)
-                }
-                Result::InvalidRequest(ref value) => {
-                    ::ntex_grpc::NativeType::serialized_len(value, 3, None)
-                }
+                Result::Success(ref value) => ::ntex_grpc::NativeType::serialized_len(
+                    value,
+                    1,
+                    ::ntex_grpc::DefaultValue::Default,
+                ),
+                Result::ServiceError(ref value) => ::ntex_grpc::NativeType::serialized_len(
+                    value,
+                    2,
+                    ::ntex_grpc::DefaultValue::Default,
+                ),
+                Result::InvalidRequest(ref value) => ::ntex_grpc::NativeType::serialized_len(
+                    value,
+                    3,
+                    ::ntex_grpc::DefaultValue::Default,
+                ),
             }
         }
     }
@@ -179,7 +200,7 @@ pub mod hello_reply {
         }
     }
 }
-#[derive(Clone, PartialEq, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct ResponseResult {
     pub message: ::ntex_grpc::ByteString,
 }
@@ -269,7 +290,7 @@ impl<T: ::ntex_grpc::Transport<GreeterSayHelloMethod>> GreeterClient<T> {
 impl ::ntex_grpc::Message for HelloRequest {
     #[inline]
     fn write(&self, dst: &mut ::ntex_grpc::BytesMut) {
-        ::ntex_grpc::NativeType::serialize(&self.name, 1, None, dst);
+        ::ntex_grpc::NativeType::serialize(&self.name, 1, ::ntex_grpc::DefaultValue::Default, dst);
     }
 
     #[inline]
@@ -291,7 +312,11 @@ impl ::ntex_grpc::Message for HelloRequest {
 
     #[inline]
     fn encoded_len(&self) -> usize {
-        0 + ::ntex_grpc::NativeType::serialized_len(&self.name, 1, None)
+        0 + ::ntex_grpc::NativeType::serialized_len(
+            &self.name,
+            1,
+            ::ntex_grpc::DefaultValue::Default,
+        )
     }
 }
 
@@ -306,9 +331,24 @@ impl ::std::default::Default for HelloRequest {
 impl ::ntex_grpc::Message for HelloReply {
     #[inline]
     fn write(&self, dst: &mut ::ntex_grpc::BytesMut) {
-        ::ntex_grpc::NativeType::serialize(&self.metadata, 4, None, dst);
-        ::ntex_grpc::NativeType::serialize(&self.reply_type, 5, None, dst);
-        ::ntex_grpc::NativeType::serialize(&self.result, 0, None, dst);
+        ::ntex_grpc::NativeType::serialize(
+            &self.metadata,
+            4,
+            ::ntex_grpc::DefaultValue::Default,
+            dst,
+        );
+        ::ntex_grpc::NativeType::serialize(
+            &self.reply_type,
+            5,
+            ::ntex_grpc::DefaultValue::Default,
+            dst,
+        );
+        ::ntex_grpc::NativeType::serialize(
+            &self.result,
+            0,
+            ::ntex_grpc::DefaultValue::Default,
+            dst,
+        );
     }
 
     #[inline]
@@ -338,9 +378,19 @@ impl ::ntex_grpc::Message for HelloReply {
 
     #[inline]
     fn encoded_len(&self) -> usize {
-        0 + ::ntex_grpc::NativeType::serialized_len(&self.metadata, 4, None)
-            + ::ntex_grpc::NativeType::serialized_len(&self.reply_type, 5, None)
-            + ::ntex_grpc::NativeType::serialized_len(&self.result, 0, None)
+        0 + ::ntex_grpc::NativeType::serialized_len(
+            &self.metadata,
+            4,
+            ::ntex_grpc::DefaultValue::Default,
+        ) + ::ntex_grpc::NativeType::serialized_len(
+            &self.reply_type,
+            5,
+            ::ntex_grpc::DefaultValue::Default,
+        ) + ::ntex_grpc::NativeType::serialized_len(
+            &self.result,
+            0,
+            ::ntex_grpc::DefaultValue::Default,
+        )
     }
 }
 
@@ -357,7 +407,12 @@ impl ::std::default::Default for HelloReply {
 impl ::ntex_grpc::Message for ResponseResult {
     #[inline]
     fn write(&self, dst: &mut ::ntex_grpc::BytesMut) {
-        ::ntex_grpc::NativeType::serialize(&self.message, 1, None, dst);
+        ::ntex_grpc::NativeType::serialize(
+            &self.message,
+            1,
+            ::ntex_grpc::DefaultValue::Default,
+            dst,
+        );
     }
 
     #[inline]
@@ -379,7 +434,11 @@ impl ::ntex_grpc::Message for ResponseResult {
 
     #[inline]
     fn encoded_len(&self) -> usize {
-        0 + ::ntex_grpc::NativeType::serialized_len(&self.message, 1, None)
+        0 + ::ntex_grpc::NativeType::serialized_len(
+            &self.message,
+            1,
+            ::ntex_grpc::DefaultValue::Default,
+        )
     }
 }
 

diff --git a/ntex-grpc-codegen/CHANGES.md b/ntex-grpc-codegen/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.2.0-b.0] - 2022-11-15
+
+* Generate code for ntex-grpc 0.2
+
 ## [0.1.6] - 2022-10-07
 
 * Fix service name generation for empty package

diff --git a/ntex-grpc-codegen/Cargo.toml b/ntex-grpc-codegen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-grpc-codegen"
-version = "0.1.6"
+version = "0.2.0-b.0"
 license = "MIT"
 authors = ["Nikolay Kim <[email protected]>"]
 description = "GRPC Client/Server framework (codegen)"
@@ -17,6 +17,6 @@ path = "src/main.rs"
 
 [dependencies]
 clap = { version = "3.2", features = ["derive"] }
-ntex-prost-build = "0.10.7"
+ntex-prost-build = "0.11.0-b.0"
 log = "0.4"
 env_logger = "0.9"
diff --git a/ntex-grpc-codegen/src/config.rs b/ntex-grpc-codegen/src/config.rs
@@ -23,7 +23,7 @@ impl NGrpcGenerator {
 
     /// Map protobuf type to custom rust type
     pub fn map_field_type(&mut self, path: &str, rust_type: &str) {
-        let _ = self.pconfig.map_field_type(&[path], rust_type);
+        let _ = self.pconfig.map_field_type([path], rust_type);
     }
 
     /// Compile `.proto` files into Rust files during a Cargo build with additional code generator

diff --git a/ntex-grpc/CHANGES.md b/ntex-grpc/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.2.0-b.2] - 2022-11-15
+
+* Fix Option<T> encodinging
+
 ## [0.2.0-b.1] - 2022-11-14
 
 * Fix default value for Option<T>, None is always default

diff --git a/ntex-grpc/Cargo.toml b/ntex-grpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-grpc"
-version = "0.2.0-b.1"
+version = "0.2.0-b.2"
 license = "MIT"
 authors = ["Nikolay Kim <[email protected]>"]
 description = "GRPC Client/Server framework"
@@ -27,11 +27,7 @@ ntex-rt = "0.4"
 ntex-grpc-derive = "0.1.0"
 
 async-trait = "0.1.0"
-bitflags = "1.3"
-futures-util = "0.3.21"
-slab = "0.4.2"
 log = "0.4"
-pin-project-lite = "0.2"
 thiserror = "1.0"
 
 [dev-dependencies]