Skip to content

Commit b036170

Browse files
committed
Return back
1 parent d92a037 commit b036170

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

jsonmerge.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,11 @@ func JSONMerge(data, patch json.RawMessage) (json.RawMessage, error) {
2424
}
2525
return merged, nil
2626
}
27+
28+
// JsonMerge merges two JSON representation into a single object. `data` is the
29+
// existing representation and `patch` is the new data to be merged in
30+
//
31+
// Deprecated: Use JSONMerge instead.
32+
func JsonMerge(data, patch json.RawMessage) (json.RawMessage, error) {
33+
return JSONMerge(data, patch)
34+
}

strictmiddleware/nethttp/main.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,9 @@ import (
88
type StrictHTTPHandlerFunc func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (response interface{}, err error)
99

1010
type StrictHTTPMiddlewareFunc func(f StrictHTTPHandlerFunc, operationID string) StrictHTTPHandlerFunc
11+
12+
// Deprecated: Use StrictHTTPHandlerFunc instead.
13+
type StrictHttpHandlerFunc func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (response interface{}, err error)
14+
15+
// Deprecated: Use StrictHTTPMiddlewareFunc instead.
16+
type StrictHttpMiddlewareFunc func(f StrictHttpHandlerFunc, operationID string) StrictHttpHandlerFunc

0 commit comments

Comments
 (0)