This is an automated email from the ASF dual-hosted git repository.
gfournier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aadc927a2461f73702e7f888573a3479588d09e9
Author: Gaelle Fournier <gaelle.fournier.w...@gmail.com>
AuthorDate: Thu Sep 26 10:04:20 2024 +0200
CAMEL-21152: clean new trait model
---
.../commands/kubernetes/traits/model/Builder.java | 17 ++---------
.../commands/kubernetes/traits/model/Camel.java | 33 ++--------------------
.../kubernetes/traits/model/Container.java | 17 ++---------
.../kubernetes/traits/model/Environment.java | 17 ++---------
.../commands/kubernetes/traits/model/Ingress.java | 19 ++-----------
.../commands/kubernetes/traits/model/Knative.java | 29 ++++++-------------
.../kubernetes/traits/model/KnativeService.java | 25 ++++------------
.../commands/kubernetes/traits/model/Mount.java | 17 ++---------
.../commands/kubernetes/traits/model/Openapi.java | 17 ++---------
.../commands/kubernetes/traits/model/Route.java | 17 ++---------
.../commands/kubernetes/traits/model/Service.java | 17 ++---------
.../kubernetes/traits/model/ServiceBinding.java | 17 ++---------
12 files changed, 36 insertions(+), 206 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Builder.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Builder.java
index 376c0c4db7e..cdd99c0df20 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Builder.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Builder.java
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
- "annotations", "baseImage", "configuration", "enabled",
"incrementalImageBuild", "limitCPU", "limitMemory",
+ "annotations", "baseImage", "enabled", "incrementalImageBuild",
"limitCPU", "limitMemory",
"mavenProfiles", "nodeSelector", "orderStrategy", "platforms",
"properties", "requestCPU", "requestMemory", "strategy",
"tasks", "tasksFilter", "tasksLimitCPU", "tasksLimitMemory",
"tasksRequestCPU", "tasksRequestMemory", "verbose" })
public class Builder {
@@ -44,13 +44,8 @@ public class Builder {
@JsonSetter(
nulls = Nulls.SKIP)
private String baseImage;
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("enabled")
- @JsonPropertyDescription("Deprecated: no longer in use.")
+ @JsonPropertyDescription("Can be used to enable or disable a trait.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@@ -164,14 +159,6 @@ public class Builder {
this.baseImage = baseImage;
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public Boolean getEnabled() {
return this.enabled;
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Camel.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Camel.java
index 271f8001f84..019ed7a937f 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Camel.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Camel.java
@@ -27,41 +27,22 @@ import com.fasterxml.jackson.annotation.JsonSetter;
import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "configuration", "enabled", "properties",
"runtimeVersion" })
+@JsonPropertyOrder({ "enabled", "properties", "runtimeVersion" })
public class Camel {
-
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("enabled")
- @JsonPropertyDescription("Deprecated: no longer in use.")
+ @JsonPropertyDescription("Can be used to enable or disable a trait.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@JsonProperty("properties")
- @JsonPropertyDescription("A list of properties to be provided to the
Integration runtime")
+ @JsonPropertyDescription("A list of properties to be provided to the camel
route runtime")
@JsonSetter(
nulls = Nulls.SKIP)
private List<String> properties;
- @JsonProperty("runtimeVersion")
- @JsonPropertyDescription("The camel-k-runtime version to use for the
integration. It overrides the default version set in the Integration Platform.
You can use a fixed version (for example \"3.2.3\") or a semantic version (for
example \"3.x\") which will try to resolve to the best matching Catalog
existing on the cluster.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private String runtimeVersion;
public Camel() {
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public Boolean getEnabled() {
return this.enabled;
}
@@ -77,12 +58,4 @@ public class Camel {
public void setProperties(List<String> properties) {
this.properties = properties;
}
-
- public String getRuntimeVersion() {
- return this.runtimeVersion;
- }
-
- public void setRuntimeVersion(String runtimeVersion) {
- this.runtimeVersion = runtimeVersion;
- }
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Container.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Container.java
index 1010b991887..8ea32143213 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Container.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Container.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
- "allowPrivilegeEscalation", "auto", "capabilitiesAdd",
"capabilitiesDrop", "configuration", "enabled", "expose",
+ "allowPrivilegeEscalation", "auto", "capabilitiesAdd",
"capabilitiesDrop", "enabled", "expose",
"image", "imagePullPolicy", "limitCPU", "limitMemory", "name", "port",
"portName", "requestCPU", "requestMemory",
"runAsNonRoot", "runAsUser", "seccompProfileType", "servicePort",
"servicePortName" })
public class Container {
@@ -53,13 +53,8 @@ public class Container {
@JsonSetter(
nulls = Nulls.SKIP)
private List<String> capabilitiesDrop;
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("enabled")
- @JsonPropertyDescription("Deprecated: no longer in use.")
+ @JsonPropertyDescription("Can be used to enable or disable a trait.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@@ -174,14 +169,6 @@ public class Container {
this.capabilitiesDrop = capabilitiesDrop;
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public Boolean getEnabled() {
return this.enabled;
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Environment.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Environment.java
index 75fd8344e9a..da2dd01c596 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Environment.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Environment.java
@@ -27,20 +27,15 @@ import com.fasterxml.jackson.annotation.JsonSetter;
import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "configuration", "containerMeta", "enabled", "httpProxy",
"vars" })
+@JsonPropertyOrder({ "containerMeta", "enabled", "httpProxy", "vars" })
public class Environment {
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("containerMeta")
@JsonPropertyDescription("Enables injection of `NAMESPACE` and `POD_NAME`
environment variables (default `true`)")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean containerMeta;
@JsonProperty("enabled")
- @JsonPropertyDescription("Deprecated: no longer in use.")
+ @JsonPropertyDescription("Can be used to enable or disable a trait.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@@ -58,14 +53,6 @@ public class Environment {
public Environment() {
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public Boolean getContainerMeta() {
return this.containerMeta;
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Ingress.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Ingress.java
index df9174418ef..9df60b485d5 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Ingress.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Ingress.java
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
- "annotations", "auto", "configuration", "enabled", "host", "path",
"pathType", "tlsHosts", "tlsSecretName" })
+ "annotations", "auto", "enabled", "host", "path", "pathType",
"tlsHosts", "tlsSecretName" })
public class Ingress {
@JsonProperty("annotations")
@JsonPropertyDescription("The annotations added to the ingress. This can
be used to set controller specific annotations, e.g., when using the NGINX
Ingress controller: See
https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx-configuration/annotations.md";)
@@ -38,17 +38,12 @@ public class Ingress {
nulls = Nulls.SKIP)
private Map<String, String> annotations;
@JsonProperty("auto")
- @JsonPropertyDescription("To automatically add an ingress whenever the
integration uses an HTTP endpoint consumer.")
+ @JsonPropertyDescription("To automatically add an ingress whenever the
camel route uses an HTTP endpoint consumer.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean auto;
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("enabled")
- @JsonPropertyDescription("Can be used to enable or disable a trait. All
traits share this common property.")
+ @JsonPropertyDescription("Can be used to enable or disable a trait.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@@ -97,14 +92,6 @@ public class Ingress {
this.auto = auto;
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public Boolean getEnabled() {
return this.enabled;
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Knative.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Knative.java
index 87ed7ba3ffd..3410f64b3be 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Knative.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Knative.java
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
- "auto", "channelSinks", "channelSources", "config", "configuration",
"enabled", "endpointSinks", "endpointSources",
+ "auto", "channelSinks", "channelSources", "config", "enabled",
"endpointSinks", "endpointSources",
"eventSinks", "eventSources", "filterEventType",
"filterSourceChannels", "filters", "namespaceLabel", "sinkBinding" })
public class Knative {
@JsonProperty("auto")
@@ -37,12 +37,12 @@ public class Knative {
nulls = Nulls.SKIP)
private Boolean auto;
@JsonProperty("channelSinks")
- @JsonPropertyDescription("List of channels used as destination of
integration routes. Can contain simple channel names or full Camel URIs.")
+ @JsonPropertyDescription("List of channels used as destination of camel
routes. Can contain simple channel names or full Camel URIs.")
@JsonSetter(
nulls = Nulls.SKIP)
private List<String> channelSinks;
@JsonProperty("channelSources")
- @JsonPropertyDescription("List of channels used as source of integration
routes. Can contain simple channel names or full Camel URIs.")
+ @JsonPropertyDescription("List of channels used as source of camel routes.
Can contain simple channel names or full Camel URIs.")
@JsonSetter(
nulls = Nulls.SKIP)
private List<String> channelSources;
@@ -51,33 +51,28 @@ public class Knative {
@JsonSetter(
nulls = Nulls.SKIP)
private String config;
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("enabled")
@JsonPropertyDescription("Can be used to enable or disable a trait. All
traits share this common property.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@JsonProperty("endpointSinks")
- @JsonPropertyDescription("List of endpoints used as destination of
integration routes. Can contain simple endpoint names or full Camel URIs.")
+ @JsonPropertyDescription("List of endpoints used as destination of camel
routes. Can contain simple endpoint names or full Camel URIs.")
@JsonSetter(
nulls = Nulls.SKIP)
private List<String> endpointSinks;
@JsonProperty("endpointSources")
- @JsonPropertyDescription("List of channels used as source of integration
routes.")
+ @JsonPropertyDescription("List of channels used as source of camel
routes.")
@JsonSetter(
nulls = Nulls.SKIP)
private List<String> endpointSources;
@JsonProperty("eventSinks")
- @JsonPropertyDescription("List of event types that the integration will
produce. Can contain simple event types or full Camel URIs (to use a specific
broker).")
+ @JsonPropertyDescription("List of event types that the camel route will
produce. Can contain simple event types or full Camel URIs (to use a specific
broker).")
@JsonSetter(
nulls = Nulls.SKIP)
private List<String> eventSinks;
@JsonProperty("eventSources")
- @JsonPropertyDescription("List of event types that the integration will be
subscribed to. Can contain simple event types or full Camel URIs (to use a
specific broker different from \"default\").")
+ @JsonPropertyDescription("List of event types that the camel route will be
subscribed to. Can contain simple event types or full Camel URIs (to use a
specific broker different from \"default\").")
@JsonSetter(
nulls = Nulls.SKIP)
private List<String> eventSources;
@@ -102,7 +97,7 @@ public class Knative {
nulls = Nulls.SKIP)
private Boolean namespaceLabel;
@JsonProperty("sinkBinding")
- @JsonPropertyDescription("Allows binding the integration to a sink via a
Knative SinkBinding resource. This can be used when the integration targets a
single sink. It's enabled by default when the integration targets a single sink
(except when the integration is owned by a Knative source).")
+ @JsonPropertyDescription("Allows binding the camel route to a sink via a
Knative SinkBinding resource. This can be used when the camel route targets a
single sink. It's enabled by default when the integration targets a single sink
(except when the integration is owned by a Knative source).")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean sinkBinding;
@@ -142,14 +137,6 @@ public class Knative {
this.config = config;
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public Boolean getEnabled() {
return this.enabled;
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/KnativeService.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/KnativeService.java
index 21129e1f6a6..269e7fb5767 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/KnativeService.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/KnativeService.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
- "annotations", "auto", "autoscalingMetric", "autoscalingTarget",
"class", "configuration", "enabled", "maxScale",
+ "annotations", "auto", "autoscalingMetric", "autoscalingTarget",
"class", "enabled", "maxScale",
"minScale", "rolloutDuration", "timeoutSeconds", "visibility" })
public class KnativeService {
@JsonProperty("annotations")
@@ -38,7 +38,7 @@ public class KnativeService {
nulls = Nulls.SKIP)
private Map<String, String> annotations;
@JsonProperty("auto")
- @JsonPropertyDescription("Automatically deploy the integration as Knative
service when all conditions hold: \n * Integration is using the Knative profile
* All routes are either starting from an HTTP based consumer or a passive
consumer (e.g. `direct` is a passive consumer)")
+ @JsonPropertyDescription("Automatically deploy the camel rouyte as Knative
service when all conditions hold: \n * Camel route is using the Knative profile
* All routes are either starting from an HTTP based consumer or a passive
consumer (e.g. `direct` is a passive consumer)")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean auto;
@@ -57,23 +57,18 @@ public class KnativeService {
@JsonSetter(
nulls = Nulls.SKIP)
private Class _class;
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("enabled")
- @JsonPropertyDescription("Can be used to enable or disable a trait. All
traits share this common property.")
+ @JsonPropertyDescription("Can be used to enable or disable a trait.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@JsonProperty("maxScale")
- @JsonPropertyDescription("An upper bound for the number of Pods that can
be running in parallel for the integration. Knative has its own cap value that
depends on the installation. \n Refer to the Knative documentation for more
information.")
+ @JsonPropertyDescription("An upper bound for the number of Pods that can
be running in parallel for the camel route. Knative has its own cap value that
depends on the installation. \n Refer to the Knative documentation for more
information.")
@JsonSetter(
nulls = Nulls.SKIP)
private Long maxScale;
@JsonProperty("minScale")
- @JsonPropertyDescription("The minimum number of Pods that should be
running at any time for the integration. It's **zero** by default, meaning that
the integration is scaled down to zero when not used for a configured amount of
time. \n Refer to the Knative documentation for more information.")
+ @JsonPropertyDescription("The minimum number of Pods that should be
running at any time for the camel route. It's **zero** by default, meaning that
the camel route is scaled down to zero when not used for a configured amount of
time. \n Refer to the Knative documentation for more information.")
@JsonSetter(
nulls = Nulls.SKIP)
private Long minScale;
@@ -83,7 +78,7 @@ public class KnativeService {
nulls = Nulls.SKIP)
private String rolloutDuration;
@JsonProperty("timeoutSeconds")
- @JsonPropertyDescription("The maximum duration in seconds that the request
instance is allowed to respond to a request. This field propagates to the
integration pod's terminationGracePeriodSeconds \n Refer to the Knative
documentation for more information.")
+ @JsonPropertyDescription("The maximum duration in seconds that the request
instance is allowed to respond to a request. This field propagates to the camel
route pod's terminationGracePeriodSeconds \n Refer to the Knative documentation
for more information.")
@JsonSetter(
nulls = Nulls.SKIP)
private Long timeoutSeconds;
@@ -136,14 +131,6 @@ public class KnativeService {
this._class = _class;
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public Boolean getEnabled() {
return this.enabled;
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Mount.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Mount.java
index ad638075acb..3b6ef3408a8 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Mount.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Mount.java
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
- "configs", "configuration", "emptyDirs", "enabled", "hotReload",
"resources", "scanKameletsImplicitLabelSecrets",
+ "configs", "emptyDirs", "enabled", "hotReload", "resources",
"scanKameletsImplicitLabelSecrets",
"volumes" })
public class Mount {
@JsonProperty("configs")
@@ -36,18 +36,13 @@ public class Mount {
@JsonSetter(
nulls = Nulls.SKIP)
private List<String> configs;
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("emptyDirs")
@JsonPropertyDescription("A list of EmptyDir volumes to be mounted.
Syntax: [name:/container/path]")
@JsonSetter(
nulls = Nulls.SKIP)
private List<String> emptyDirs;
@JsonProperty("enabled")
- @JsonPropertyDescription("Deprecated: no longer in use.")
+ @JsonPropertyDescription("Can be used to enable or disable a trait.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@@ -83,14 +78,6 @@ public class Mount {
this.configs = configs;
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public List<String> getEmptyDirs() {
return this.emptyDirs;
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Openapi.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Openapi.java
index 2283863e0cf..3e3cf5f2a21 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Openapi.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Openapi.java
@@ -27,20 +27,15 @@ import com.fasterxml.jackson.annotation.JsonSetter;
import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "configmaps", "configuration", "enabled" })
+@JsonPropertyOrder({ "configmaps", "enabled" })
public class Openapi {
@JsonProperty("configmaps")
@JsonPropertyDescription("The configmaps holding the spec of the OpenAPI")
@JsonSetter(
nulls = Nulls.SKIP)
private List<String> configmaps;
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("enabled")
- @JsonPropertyDescription("Deprecated: no longer in use.")
+ @JsonPropertyDescription("Can be used to enable or disable a trait.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@@ -56,14 +51,6 @@ public class Openapi {
this.configmaps = configmaps;
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public Boolean getEnabled() {
return this.enabled;
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Route.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Route.java
index 107783b88a0..40c3785481a 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Route.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Route.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
- "annotations", "configuration", "enabled", "host", "tlsCACertificate",
"tlsCACertificateSecret", "tlsCertificate",
+ "annotations", "enabled", "host", "tlsCACertificate",
"tlsCACertificateSecret", "tlsCertificate",
"tlsCertificateSecret", "tlsDestinationCACertificate",
"tlsDestinationCACertificateSecret",
"tlsInsecureEdgeTerminationPolicy", "tlsKey", "tlsKeySecret",
"tlsTermination" })
public class Route {
@@ -38,13 +38,8 @@ public class Route {
@JsonSetter(
nulls = Nulls.SKIP)
private Map<String, String> annotations;
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("enabled")
- @JsonPropertyDescription("Can be used to enable or disable a trait. All
traits share this common property.")
+ @JsonPropertyDescription("Can be used to enable or disable a trait.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@@ -115,14 +110,6 @@ public class Route {
this.annotations = annotations;
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public Boolean getEnabled() {
return this.enabled;
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Service.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Service.java
index 356d8eea642..e93ce659672 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Service.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/Service.java
@@ -26,20 +26,15 @@ import com.fasterxml.jackson.annotation.JsonValue;
import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "auto", "configuration", "enabled", "nodePort", "type" })
+@JsonPropertyOrder({ "auto", "enabled", "nodePort", "type" })
public class Service {
@JsonProperty("auto")
@JsonPropertyDescription("To automatically detect from the code if a
Service needs to be created.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean auto;
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("enabled")
- @JsonPropertyDescription("Can be used to enable or disable a trait. All
traits share this common property.")
+ @JsonPropertyDescription("Can be used to enable or disable a trait.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@@ -65,14 +60,6 @@ public class Service {
this.auto = auto;
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public Boolean getEnabled() {
return this.enabled;
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/ServiceBinding.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/ServiceBinding.java
index 735991d9429..f157e457bc2 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/ServiceBinding.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/model/ServiceBinding.java
@@ -27,15 +27,10 @@ import com.fasterxml.jackson.annotation.JsonSetter;
import com.fasterxml.jackson.annotation.Nulls;
@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "configuration", "enabled", "services" })
+@JsonPropertyOrder({ "enabled", "services" })
public class ServiceBinding {
- @JsonProperty("configuration")
- @JsonPropertyDescription("Legacy trait configuration parameters.
Deprecated: for backward compatibility.")
- @JsonSetter(
- nulls = Nulls.SKIP)
- private Configuration configuration;
@JsonProperty("enabled")
- @JsonPropertyDescription("Can be used to enable or disable a trait. All
traits share this common property.")
+ @JsonPropertyDescription("Can be used to enable or disable a trait.")
@JsonSetter(
nulls = Nulls.SKIP)
private Boolean enabled;
@@ -48,14 +43,6 @@ public class ServiceBinding {
public ServiceBinding() {
}
- public Configuration getConfiguration() {
- return this.configuration;
- }
-
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- }
-
public Boolean getEnabled() {
return this.enabled;
}
