Skip to content

Tree: ToJson() / ToJsonIetf() #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steiler merged 2 commits into from
Oct 9, 2024
Merged

Tree: ToJson() / ToJsonIetf() #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b82cfc
tojson on tree
steiler Oct 8, 2024
7d920e6
Tree: ToJson(IETF) onlyNewOrUpdated
steiler Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 2 additions & 41 deletions pkg/datastore/jbuilderv2/jsonbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"strings"

schemaClient "github.com/sdcio/data-server/pkg/datastore/clients/schema"
"github.com/sdcio/data-server/pkg/utils"
sdcpb "github.com/sdcio/sdc-protos/sdcpb"
log "github.com/sirupsen/logrus"
)
Expand Down Expand Up @@ -108,7 +109,7 @@ func (j *jsonBuilder) AddUpdate(ctx context.Context, obj map[string]any, p *sdcp
if isDefault(tv, psc.GetSchema()) && tv != nil && tv.GetValue() != nil {
return nil
}
value := getValue(tv)
value := utils.GetJsonValue(tv)

pes, err := j.buildPathElems(ctx, p)
if err != nil {
Expand Down Expand Up @@ -390,43 +391,3 @@ func tvIsEqual(tv *sdcpb.TypedValue, val string) bool {
}
return false
}

func getValue(tv *sdcpb.TypedValue) any {
switch tv.Value.(type) {
case *sdcpb.TypedValue_AsciiVal:
return tv.GetAsciiVal()
case *sdcpb.TypedValue_BoolVal:
return tv.GetBoolVal()
case *sdcpb.TypedValue_BytesVal:
return tv.GetBytesVal()
case *sdcpb.TypedValue_DecimalVal:
return tv.GetDecimalVal()
case *sdcpb.TypedValue_EmptyVal:
return map[string]any{}
case *sdcpb.TypedValue_FloatVal:
return tv.GetFloatVal()
case *sdcpb.TypedValue_DoubleVal:
return tv.GetDoubleVal()
case *sdcpb.TypedValue_IntVal:
return tv.GetIntVal()
case *sdcpb.TypedValue_StringVal:
return tv.GetStringVal()
case *sdcpb.TypedValue_UintVal:
return tv.GetUintVal()
case *sdcpb.TypedValue_JsonIetfVal:
return tv.GetJsonIetfVal()
case *sdcpb.TypedValue_JsonVal:
return tv.GetJsonVal()
case *sdcpb.TypedValue_LeaflistVal:
rs := make([]any, 0, len(tv.GetLeaflistVal().GetElement()))
for _, e := range tv.GetLeaflistVal().GetElement() {
rs = append(rs, getValue(e))
}
return rs
case *sdcpb.TypedValue_ProtoBytes:
return tv.GetProtoBytes()
case *sdcpb.TypedValue_AnyVal:
return tv.GetAnyVal()
}
return nil
}
Loading