wneessen/niljson
1
0
Fork 0
mirror of https://github.com/wneessen/niljson.git synced 2024-11-22 13:40:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reorder type declarations and JSON marshal/unmarshal methods

Browse source 
Moved type declarations for Nil* variables to the top for better readability and organization. JSON marshal and unmarshal methods have been repositioned towards the bottom of the file to keep related logic together.
This commit is contained in:
Winni Neessen 2024-09-11 11:25:37 +02:00
parent 61e2f10196
commit 270111e53f
Signed by: wneessen
GPG key ID: 385AC9889632126E
1 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
niljson.go
View file

@ -8,6 +8,42 @@ import (
"encoding/json" "encoding/json"
) )
// NilBoolean is an boolean type that can be nil
type NilBoolean = Variable[bool]
// NilByteSlice is a []byte type that can be nil
type NilByteSlice = Variable[[]byte]
// NilInt is an int type that can be nil
type NilInt = Variable[int]
// NilInt64 is an int64 type that can be nil
type NilInt64 = Variable[int64]
// NilUInt is an uint type that can be nil
type NilUInt = Variable[uint]
// NilUInt8 is an uint8 type that can be nil
type NilUInt8 = Variable[uint8]
// NilUInt16 is an uint16 type that can be nil
type NilUInt16 = Variable[uint16]
// NilUInt32 is an uint32 type that can be nil
type NilUInt32 = Variable[uint32]
// NilUInt64 is an uint64 type that can be nil
type NilUInt64 = Variable[uint64]
// NilFloat32 is an float32 type that can be nil
type NilFloat32 = Variable[float32]
// NilFloat64 is an float64 type that can be nil
type NilFloat64 = Variable[float64]
// NilString is a string type that can be nil
type NilString = Variable[string]
// Variable is a generic variable type that can be null. // Variable is a generic variable type that can be null.
type Variable[T any] struct { type Variable[T any] struct {
value T value T
@ -50,41 +86,13 @@ func (v *Variable[T]) Value() T {
return v.value return v.value
} }
// NilBoolean is an boolean type that can be nil // MarshalJSON satisfies the json.Marshaler interface for generic Variable types
type NilBoolean = Variable[bool] func (v *Variable[T]) MarshalJSON() ([]byte, error) {
if !v.notNil {
// NilByteSlice is a []byte type that can be nil return json.Marshal(nil)
type NilByteSlice = Variable[[]byte] }
return json.Marshal(v.value)
// NilInt is an int type that can be nil }
type NilInt = Variable[int]
// NilInt64 is an int64 type that can be nil
type NilInt64 = Variable[int64]
// NilUInt is an uint type that can be nil
type NilUInt = Variable[uint]
// NilUInt8 is an uint8 type that can be nil
type NilUInt8 = Variable[uint8]
// NilUInt16 is an uint16 type that can be nil
type NilUInt16 = Variable[uint16]
// NilUInt32 is an uint32 type that can be nil
type NilUInt32 = Variable[uint32]
// NilUInt64 is an uint64 type that can be nil
type NilUInt64 = Variable[uint64]
// NilFloat32 is an float32 type that can be nil
type NilFloat32 = Variable[float32]
// NilFloat64 is an float64 type that can be nil
type NilFloat64 = Variable[float64]
// NilString is a string type that can be nil
type NilString = Variable[string]
// UnmarshalJSON satisfies the json.Unmarshaler interface for generic Variable types // UnmarshalJSON satisfies the json.Unmarshaler interface for generic Variable types
func (v *Variable[T]) UnmarshalJSON(data []byte) error { func (v *Variable[T]) UnmarshalJSON(data []byte) error {
@ -96,11 +104,3 @@ func (v *Variable[T]) UnmarshalJSON(data []byte) error {
} }
return nil return nil
} }
// MarshalJSON satisfies the json.Marshaler interface for generic Variable types
func (v *Variable[T]) MarshalJSON() ([]byte, error) {
if !v.notNil {
return json.Marshal(nil)
}
return json.Marshal(v.value)
}