@@ -103,8 +103,8 @@ func pruneAryNulls(ary *partialArray, options *ApplyOptions) *partialArray {
103
103
return ary
104
104
}
105
105
106
- var errBadJSONDoc = fmt .Errorf ("Invalid JSON Document" )
107
- var errBadJSONPatch = fmt .Errorf ("Invalid JSON Patch" )
106
+ var ErrBadJSONDoc = fmt .Errorf ("Invalid JSON Document" )
107
+ var ErrBadJSONPatch = fmt .Errorf ("Invalid JSON Patch" )
108
108
var errBadMergeTypes = fmt .Errorf ("Mismatched JSON Documents" )
109
109
110
110
// MergeMergePatches merges two merge patches together, such that
@@ -121,11 +121,11 @@ func MergePatch(docData, patchData []byte) ([]byte, error) {
121
121
122
122
func doMergePatch (docData , patchData []byte , mergeMerge bool ) ([]byte , error ) {
123
123
if ! json .Valid (docData ) {
124
- return nil , errBadJSONDoc
124
+ return nil , ErrBadJSONDoc
125
125
}
126
126
127
127
if ! json .Valid (patchData ) {
128
- return nil , errBadJSONPatch
128
+ return nil , ErrBadJSONPatch
129
129
}
130
130
131
131
options := NewApplyOptions ()
@@ -143,15 +143,15 @@ func doMergePatch(docData, patchData []byte, mergeMerge bool) ([]byte, error) {
143
143
patchErr := patch .UnmarshalJSON (patchData )
144
144
145
145
if isSyntaxError (docErr ) {
146
- return nil , errBadJSONDoc
146
+ return nil , ErrBadJSONDoc
147
147
}
148
148
149
149
if isSyntaxError (patchErr ) {
150
150
return patchData , nil
151
151
}
152
152
153
153
if docErr == nil && doc .obj == nil {
154
- return nil , errBadJSONDoc
154
+ return nil , ErrBadJSONDoc
155
155
}
156
156
157
157
if patchErr == nil && patch .obj == nil {
@@ -175,15 +175,15 @@ func doMergePatch(docData, patchData []byte, mergeMerge bool) ([]byte, error) {
175
175
if json .Valid (patchData ) {
176
176
return patchData , nil
177
177
}
178
- return nil , errBadJSONPatch
178
+ return nil , ErrBadJSONPatch
179
179
}
180
180
181
181
pruneAryNulls (patchAry , options )
182
182
183
183
out , patchErr := json .Marshal (patchAry .nodes )
184
184
185
185
if patchErr != nil {
186
- return nil , errBadJSONPatch
186
+ return nil , ErrBadJSONPatch
187
187
}
188
188
189
189
return out , nil
@@ -256,12 +256,12 @@ func createObjectMergePatch(originalJSON, modifiedJSON []byte) ([]byte, error) {
256
256
257
257
err := unmarshal (originalJSON , & originalDoc )
258
258
if err != nil {
259
- return nil , errBadJSONDoc
259
+ return nil , ErrBadJSONDoc
260
260
}
261
261
262
262
err = unmarshal (modifiedJSON , & modifiedDoc )
263
263
if err != nil {
264
- return nil , errBadJSONDoc
264
+ return nil , ErrBadJSONDoc
265
265
}
266
266
267
267
dest , err := getDiff (originalDoc , modifiedDoc )
@@ -286,17 +286,17 @@ func createArrayMergePatch(originalJSON, modifiedJSON []byte) ([]byte, error) {
286
286
287
287
err := unmarshal (originalJSON , & originalDocs )
288
288
if err != nil {
289
- return nil , errBadJSONDoc
289
+ return nil , ErrBadJSONDoc
290
290
}
291
291
292
292
err = unmarshal (modifiedJSON , & modifiedDocs )
293
293
if err != nil {
294
- return nil , errBadJSONDoc
294
+ return nil , ErrBadJSONDoc
295
295
}
296
296
297
297
total := len (originalDocs )
298
298
if len (modifiedDocs ) != total {
299
- return nil , errBadJSONDoc
299
+ return nil , ErrBadJSONDoc
300
300
}
301
301
302
302
result := []json.RawMessage {}
0 commit comments