@@ -42,7 +42,7 @@ func (e registryError) Error() string {
4242// ErrRegistry indicates an error returned by the [Registrar].
4343var ErrRegistry registryError = "JSON adapters registry error"
4444
45- type registry []ifaces.RegistryEntry
45+ type registry []* ifaces.RegistryEntry
4646
4747// Registrar holds registered [ifaces.Adapters] for different serialization capabilities.
4848//
@@ -57,54 +57,79 @@ type Registrar struct {
5757 gmx sync.RWMutex
5858
5959 // cache indexed by value type, so we don't have to lookup
60- marshalerCache map [reflect.Type ]ifaces.RegistryEntry
61- unmarshalerCache map [reflect.Type ]ifaces.RegistryEntry
62- orderedMarshalerCache map [reflect.Type ]ifaces.RegistryEntry
63- orderedUnmarshalerCache map [reflect.Type ]ifaces.RegistryEntry
64- orderedMapCache map [reflect.Type ]ifaces.RegistryEntry
60+ marshalerCache map [reflect.Type ]* ifaces.RegistryEntry
61+ unmarshalerCache map [reflect.Type ]* ifaces.RegistryEntry
62+ orderedMarshalerCache map [reflect.Type ]* ifaces.RegistryEntry
63+ orderedUnmarshalerCache map [reflect.Type ]* ifaces.RegistryEntry
64+ orderedMapCache map [reflect.Type ]* ifaces.RegistryEntry
6565}
6666
6767func NewRegistrar () * Registrar {
6868 r := & Registrar {}
6969
70- r .marshalerCache = make (map [reflect.Type ]ifaces.RegistryEntry )
71- r .unmarshalerCache = make (map [reflect.Type ]ifaces.RegistryEntry )
72- r .orderedMarshalerCache = make (map [reflect.Type ]ifaces.RegistryEntry )
73- r .orderedUnmarshalerCache = make (map [reflect.Type ]ifaces.RegistryEntry )
74- r .orderedMapCache = make (map [reflect.Type ]ifaces.RegistryEntry )
70+ r .marshalerRegistry = make (registry , 0 , 1 )
71+ r .unmarshalerRegistry = make (registry , 0 , 1 )
72+ r .orderedMarshalerRegistry = make (registry , 0 , 1 )
73+ r .orderedUnmarshalerRegistry = make (registry , 0 , 1 )
74+ r .orderedMapRegistry = make (registry , 0 , 1 )
75+
76+ r .marshalerCache = make (map [reflect.Type ]* ifaces.RegistryEntry )
77+ r .unmarshalerCache = make (map [reflect.Type ]* ifaces.RegistryEntry )
78+ r .orderedMarshalerCache = make (map [reflect.Type ]* ifaces.RegistryEntry )
79+ r .orderedUnmarshalerCache = make (map [reflect.Type ]* ifaces.RegistryEntry )
80+ r .orderedMapCache = make (map [reflect.Type ]* ifaces.RegistryEntry )
7581
7682 defaultRegistered (r )
7783
7884 return r
7985}
8086
87+ // ClearCache resets the internal type cache.
88+ func (r * Registrar ) ClearCache () {
89+ r .gmx .Lock ()
90+ r .clearCache ()
91+ r .gmx .Unlock ()
92+ }
93+
94+ // Reset the [Registrar] to its defaults.
95+ func (r * Registrar ) Reset () {
96+ r .gmx .Lock ()
97+ r .clearCache ()
98+ r .marshalerRegistry = r .marshalerRegistry [:0 ]
99+ r .unmarshalerRegistry = r .unmarshalerRegistry [:0 ]
100+ r .orderedMarshalerRegistry = r .orderedMarshalerRegistry [:0 ]
101+ r .orderedUnmarshalerRegistry = r .orderedUnmarshalerRegistry [:0 ]
102+ r .orderedMapRegistry = r .orderedMapRegistry [:0 ]
103+ r .gmx .Unlock ()
104+ }
105+
81106// RegisterFor registers an adapter for some JSON capabilities.
82107func (r * Registrar ) RegisterFor (entry ifaces.RegistryEntry ) {
83108 r .gmx .Lock ()
84109 if entry .What .Has (ifaces .CapabilityMarshalJSON ) {
85110 e := entry
86111 e .What &= ifaces .Capabilities (ifaces .CapabilityMarshalJSON )
87- r .marshalerRegistry = slices .Insert (r .marshalerRegistry , 0 , e )
112+ r .marshalerRegistry = slices .Insert (r .marshalerRegistry , 0 , & e )
88113 }
89114 if entry .What .Has (ifaces .CapabilityUnmarshalJSON ) {
90115 e := entry
91116 e .What &= ifaces .Capabilities (ifaces .CapabilityUnmarshalJSON )
92- r .unmarshalerRegistry = slices .Insert (r .unmarshalerRegistry , 0 , e )
117+ r .unmarshalerRegistry = slices .Insert (r .unmarshalerRegistry , 0 , & e )
93118 }
94119 if entry .What .Has (ifaces .CapabilityOrderedMarshalJSON ) {
95120 e := entry
96121 e .What &= ifaces .Capabilities (ifaces .CapabilityOrderedMarshalJSON )
97- r .orderedMarshalerRegistry = slices .Insert (r .orderedMarshalerRegistry , 0 , e )
122+ r .orderedMarshalerRegistry = slices .Insert (r .orderedMarshalerRegistry , 0 , & e )
98123 }
99124 if entry .What .Has (ifaces .CapabilityOrderedUnmarshalJSON ) {
100125 e := entry
101126 e .What &= ifaces .Capabilities (ifaces .CapabilityOrderedUnmarshalJSON )
102- r .orderedUnmarshalerRegistry = slices .Insert (r .orderedUnmarshalerRegistry , 0 , e )
127+ r .orderedUnmarshalerRegistry = slices .Insert (r .orderedUnmarshalerRegistry , 0 , & e )
103128 }
104129 if entry .What .Has (ifaces .CapabilityOrderedMap ) {
105130 e := entry
106131 e .What &= ifaces .Capabilities (ifaces .CapabilityOrderedMap )
107- r .orderedMapRegistry = slices .Insert (r .orderedMapRegistry , 0 , e )
132+ r .orderedMapRegistry = slices .Insert (r .orderedMapRegistry , 0 , & e )
108133 }
109134 r .gmx .Unlock ()
110135}
@@ -119,16 +144,22 @@ func (r *Registrar) AdapterFor(capability ifaces.Capability, value any) (ifaces.
119144 return nil , noopRedeemer
120145 }
121146
122- adapter := entry .Constructor ()
123- if entry .Redeemer != nil {
124- return adapter , func () {
125- entry .Redeemer (adapter )
126- }
147+ adapter , redeem := entry .Constructor ()
148+ if redeem != nil {
149+ return adapter , redeem
127150 }
128151
129152 return adapter , noopRedeemer
130153}
131154
155+ func (r * Registrar ) clearCache () {
156+ clear (r .marshalerCache )
157+ clear (r .unmarshalerCache )
158+ clear (r .orderedMarshalerCache )
159+ clear (r .orderedUnmarshalerCache )
160+ clear (r .orderedMapCache )
161+ }
162+
132163func (r * Registrar ) findFirstFor (capability ifaces.Capability , value any ) * ifaces.RegistryEntry {
133164 switch capability {
134165 case ifaces .CapabilityMarshalJSON :
@@ -146,13 +177,13 @@ func (r *Registrar) findFirstFor(capability ifaces.Capability, value any) *iface
146177 }
147178}
148179
149- func (r * Registrar ) findFirstInRegistryFor (reg registry , cache map [reflect.Type ]ifaces.RegistryEntry , capability ifaces.Capability , value any ) * ifaces.RegistryEntry {
180+ func (r * Registrar ) findFirstInRegistryFor (reg registry , cache map [reflect.Type ]* ifaces.RegistryEntry , capability ifaces.Capability , value any ) * ifaces.RegistryEntry {
150181 r .gmx .RLock ()
151182 if len (reg ) > 1 {
152183 if entry , ok := cache [reflect .TypeOf (value )]; ok {
153184 // cache hit
154185 r .gmx .RUnlock ()
155- return & entry
186+ return entry
156187 }
157188 }
158189
@@ -168,7 +199,7 @@ func (r *Registrar) findFirstInRegistryFor(reg registry, cache map[reflect.Type]
168199 cache [reflect .TypeOf (value )] = entry
169200 r .gmx .Unlock ()
170201
171- return & entry
202+ return entry
172203 }
173204
174205 // no adapter found
0 commit comments