Return back

oapi-codegen · Nov 14, 2023 · b036170 · b036170
1 parent d92a037
commit b036170
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/jsonmerge.go b/jsonmerge.go
@@ -24,3 +24,11 @@ func JSONMerge(data, patch json.RawMessage) (json.RawMessage, error) {
 	}
 	return merged, nil
 }
+
+// JsonMerge merges two JSON representation into a single object. `data` is the
+// existing representation and `patch` is the new data to be merged in
+//
+// Deprecated: Use JSONMerge instead.
+func JsonMerge(data, patch json.RawMessage) (json.RawMessage, error) {
+	return JSONMerge(data, patch)
+}
diff --git a/strictmiddleware/nethttp/main.go b/strictmiddleware/nethttp/main.go
@@ -8,3 +8,9 @@ import (
 type StrictHTTPHandlerFunc func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (response interface{}, err error)
 
 type StrictHTTPMiddlewareFunc func(f StrictHTTPHandlerFunc, operationID string) StrictHTTPHandlerFunc
+
+// Deprecated: Use StrictHTTPHandlerFunc instead.
+type StrictHttpHandlerFunc func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (response interface{}, err error)
+
+// Deprecated: Use StrictHTTPMiddlewareFunc instead.
+type StrictHttpMiddlewareFunc func(f StrictHttpHandlerFunc, operationID string) StrictHttpHandlerFunc