Skip to content

Commit 84a4bb1

Browse files
authored
Merge pull request #209 from skitt/export-errs-v5
Export errBadJSONDoc and errBadJSONPatch errors
2 parents bd18525 + 7a7a88a commit 84a4bb1

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

v5/merge.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ func pruneAryNulls(ary *partialArray, options *ApplyOptions) *partialArray {
103103
return ary
104104
}
105105

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")
108108
var errBadMergeTypes = fmt.Errorf("Mismatched JSON Documents")
109109

110110
// MergeMergePatches merges two merge patches together, such that
@@ -121,11 +121,11 @@ func MergePatch(docData, patchData []byte) ([]byte, error) {
121121

122122
func doMergePatch(docData, patchData []byte, mergeMerge bool) ([]byte, error) {
123123
if !json.Valid(docData) {
124-
return nil, errBadJSONDoc
124+
return nil, ErrBadJSONDoc
125125
}
126126

127127
if !json.Valid(patchData) {
128-
return nil, errBadJSONPatch
128+
return nil, ErrBadJSONPatch
129129
}
130130

131131
options := NewApplyOptions()
@@ -143,15 +143,15 @@ func doMergePatch(docData, patchData []byte, mergeMerge bool) ([]byte, error) {
143143
patchErr := patch.UnmarshalJSON(patchData)
144144

145145
if isSyntaxError(docErr) {
146-
return nil, errBadJSONDoc
146+
return nil, ErrBadJSONDoc
147147
}
148148

149149
if isSyntaxError(patchErr) {
150150
return patchData, nil
151151
}
152152

153153
if docErr == nil && doc.obj == nil {
154-
return nil, errBadJSONDoc
154+
return nil, ErrBadJSONDoc
155155
}
156156

157157
if patchErr == nil && patch.obj == nil {
@@ -175,15 +175,15 @@ func doMergePatch(docData, patchData []byte, mergeMerge bool) ([]byte, error) {
175175
if json.Valid(patchData) {
176176
return patchData, nil
177177
}
178-
return nil, errBadJSONPatch
178+
return nil, ErrBadJSONPatch
179179
}
180180

181181
pruneAryNulls(patchAry, options)
182182

183183
out, patchErr := json.Marshal(patchAry.nodes)
184184

185185
if patchErr != nil {
186-
return nil, errBadJSONPatch
186+
return nil, ErrBadJSONPatch
187187
}
188188

189189
return out, nil
@@ -256,12 +256,12 @@ func createObjectMergePatch(originalJSON, modifiedJSON []byte) ([]byte, error) {
256256

257257
err := unmarshal(originalJSON, &originalDoc)
258258
if err != nil {
259-
return nil, errBadJSONDoc
259+
return nil, ErrBadJSONDoc
260260
}
261261

262262
err = unmarshal(modifiedJSON, &modifiedDoc)
263263
if err != nil {
264-
return nil, errBadJSONDoc
264+
return nil, ErrBadJSONDoc
265265
}
266266

267267
dest, err := getDiff(originalDoc, modifiedDoc)
@@ -286,17 +286,17 @@ func createArrayMergePatch(originalJSON, modifiedJSON []byte) ([]byte, error) {
286286

287287
err := unmarshal(originalJSON, &originalDocs)
288288
if err != nil {
289-
return nil, errBadJSONDoc
289+
return nil, ErrBadJSONDoc
290290
}
291291

292292
err = unmarshal(modifiedJSON, &modifiedDocs)
293293
if err != nil {
294-
return nil, errBadJSONDoc
294+
return nil, ErrBadJSONDoc
295295
}
296296

297297
total := len(originalDocs)
298298
if len(modifiedDocs) != total {
299-
return nil, errBadJSONDoc
299+
return nil, ErrBadJSONDoc
300300
}
301301

302302
result := []json.RawMessage{}

0 commit comments

Comments
 (0)