This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0af1f4f34455f3bd19a1561fd512d4843d07b41d Author: David Jencks <djen...@apache.org> AuthorDate: Tue Jan 25 23:15:01 2022 -0800 kamelets always use own RawMessage --- pkg/apis/camel/v1/zz_generated.deepcopy.go | 1 + pkg/apis/camel/v1alpha1/error_handler_types.go | 6 +++--- pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 2 +- pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 9 +++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go index ba10726..76fa84a 100644 --- a/pkg/apis/camel/v1/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/pkg/apis/camel/v1alpha1/error_handler_types.go b/pkg/apis/camel/v1alpha1/error_handler_types.go index af038cb..987f1f7 100644 --- a/pkg/apis/camel/v1alpha1/error_handler_types.go +++ b/pkg/apis/camel/v1alpha1/error_handler_types.go @@ -34,17 +34,17 @@ const ErrorHandlerAppPropertiesPrefix = "camel.beans.defaultErrorHandler" // ErrorHandlerSpec represents an unstructured object for an error handler type ErrorHandlerSpec struct { - v1.RawMessage `json:",omitempty"` + RawMessage `json:",omitempty"` } // ErrorHandlerParameters represent an unstructured object for error handler parameters type ErrorHandlerParameters struct { - v1.RawMessage `json:",omitempty"` + RawMessage `json:",omitempty"` } // BeanProperties represent an unstructured object properties to be set on a bean type BeanProperties struct { - v1.RawMessage `json:",omitempty"` + RawMessage `json:",omitempty"` } // +kubebuilder:object:generate=false diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go index a0c52c4..d06e028 100644 --- a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go +++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go @@ -63,7 +63,7 @@ const ( // EndpointProperties is a key/value struct represented as JSON raw to allow numeric/boolean values type EndpointProperties struct { - v1.RawMessage `json:",inline"` + RawMessage `json:",inline"` } // KameletBindingStatus -- diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go index a5c99f3..e6ec185 100644 --- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. @@ -31,7 +32,7 @@ func (in *BeanProperties) DeepCopyInto(out *BeanProperties) { *out = *in if in.RawMessage != nil { in, out := &in.RawMessage, &out.RawMessage - *out = make(v1.RawMessage, len(*in)) + *out = make(RawMessage, len(*in)) copy(*out, *in) } } @@ -88,7 +89,7 @@ func (in *EndpointProperties) DeepCopyInto(out *EndpointProperties) { *out = *in if in.RawMessage != nil { in, out := &in.RawMessage, &out.RawMessage - *out = make(v1.RawMessage, len(*in)) + *out = make(RawMessage, len(*in)) copy(*out, *in) } } @@ -145,7 +146,7 @@ func (in *ErrorHandlerParameters) DeepCopyInto(out *ErrorHandlerParameters) { *out = *in if in.RawMessage != nil { in, out := &in.RawMessage, &out.RawMessage - *out = make(v1.RawMessage, len(*in)) + *out = make(RawMessage, len(*in)) copy(*out, *in) } } @@ -186,7 +187,7 @@ func (in *ErrorHandlerSpec) DeepCopyInto(out *ErrorHandlerSpec) { *out = *in if in.RawMessage != nil { in, out := &in.RawMessage, &out.RawMessage - *out = make(v1.RawMessage, len(*in)) + *out = make(RawMessage, len(*in)) copy(*out, *in) } }