aarifullin/frostfs-api-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-api-go
Code Pull requests Activity

[#72] session: Unify unmarshaling code

Browse source 
gopatch:
```
@@
var err, msg, data, t, protojson identifier
var obj expression
@@
+import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/message"
-import protojson "google.golang.org/protobuf/encoding/protojson"

-msg := obj
-if err := protojson.Unmarshal(data, msg); err != nil {
-return err
-}
-return t.FromGRPCMessage(msg)
+return message.UnmarshalJSON(t, data, obj)

@@
var err, msg, data, t, goproto identifier
var obj expression
@@
+import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/message"
-import goproto "google.golang.org/protobuf/proto"

-msg := obj
-if err := goproto.Unmarshal(data, msg); err != nil {
-return err
-}
-return t.FromGRPCMessage(msg)
+return message.Unmarshal(t, data, obj)
```

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2024-04-20 13:58:44 +03:00
parent 491a47e7fe
commit 4a330a5706
2 changed files with 16 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

57
session/json.go
View file

@ -3,7 +3,6 @@ package session
import (
"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/message"
session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session/grpc"
"google.golang.org/protobuf/encoding/protojson"
)
func (c *ObjectSessionContext) MarshalJSON() ([]byte, error) {
@ -27,13 +26,7 @@ func (t *TokenBody) MarshalJSON() ([]byte, error) {
}
func (t *TokenBody) UnmarshalJSON(data []byte) error {
msg := new(session.SessionToken_Body)
if err := protojson.Unmarshal(data, msg); err != nil {
return err
}
return t.FromGRPCMessage(msg)
return message.UnmarshalJSON(t, data, new(session.SessionToken_Body))
}
func (t *Token) MarshalJSON() ([]byte, error) {
@ -41,13 +34,7 @@ func (t *Token) MarshalJSON() ([]byte, error) {
}
func (t *Token) UnmarshalJSON(data []byte) error {
msg := new(session.SessionToken)
if err := protojson.Unmarshal(data, msg); err != nil {
return err
}
return t.FromGRPCMessage(msg)
return message.UnmarshalJSON(t, data, new(session.SessionToken))
}
func (x *XHeader) MarshalJSON() ([]byte, error) {
@ -55,13 +42,7 @@ func (x *XHeader) MarshalJSON() ([]byte, error) {
}
func (x *XHeader) UnmarshalJSON(data []byte) error {
msg := new(session.XHeader)
if err := protojson.Unmarshal(data, msg); err != nil {
return err
}
return x.FromGRPCMessage(msg)
return message.UnmarshalJSON(x, data, new(session.XHeader))
}
func (r *RequestMetaHeader) MarshalJSON() ([]byte, error) {
@ -69,13 +50,7 @@ func (r *RequestMetaHeader) MarshalJSON() ([]byte, error) {
}
func (r *RequestMetaHeader) UnmarshalJSON(data []byte) error {
msg := new(session.RequestMetaHeader)
if err := protojson.Unmarshal(data, msg); err != nil {
return err
}
return r.FromGRPCMessage(msg)
return message.UnmarshalJSON(r, data, new(session.RequestMetaHeader))
}
func (r *RequestVerificationHeader) MarshalJSON() ([]byte, error) {
@ -83,13 +58,7 @@ func (r *RequestVerificationHeader) MarshalJSON() ([]byte, error) {
}
func (r *RequestVerificationHeader) UnmarshalJSON(data []byte) error {
msg := new(session.RequestVerificationHeader)
if err := protojson.Unmarshal(data, msg); err != nil {
return err
}
return r.FromGRPCMessage(msg)
return message.UnmarshalJSON(r, data, new(session.RequestVerificationHeader))
}
func (r *ResponseMetaHeader) MarshalJSON() ([]byte, error) {
@ -97,13 +66,7 @@ func (r *ResponseMetaHeader) MarshalJSON() ([]byte, error) {
}
func (r *ResponseMetaHeader) UnmarshalJSON(data []byte) error {
msg := new(session.ResponseMetaHeader)
if err := protojson.Unmarshal(data, msg); err != nil {
return err
}
return r.FromGRPCMessage(msg)
return message.UnmarshalJSON(r, data, new(session.ResponseMetaHeader))
}
func (r *ResponseVerificationHeader) MarshalJSON() ([]byte, error) {
@ -111,13 +74,7 @@ func (r *ResponseVerificationHeader) MarshalJSON() ([]byte, error) {
}
func (r *ResponseVerificationHeader) UnmarshalJSON(data []byte) error {
msg := new(session.ResponseVerificationHeader)
if err := protojson.Unmarshal(data, msg); err != nil {
return err
}
return r.FromGRPCMessage(msg)
return message.UnmarshalJSON(r, data, new(session.ResponseVerificationHeader))
}
func (x *ContainerSessionContext) MarshalJSON() ([]byte, error) {