chore(camel-k): Fix IntegrationSpec in Pipe/KameletBinding model

christophd · Aug 30, 2023 · 11b2818 · 11b2818
1 parent 0f743bc
commit 11b2818
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/...mel-k/src/main/java/org/citrusframework/yaks/camelk/actions/kamelet/CreatePipeAction.java b/...mel-k/src/main/java/org/citrusframework/yaks/camelk/actions/kamelet/CreatePipeAction.java
@@ -32,10 +32,10 @@
 import org.citrusframework.yaks.camelk.CamelKSettings;
 import org.citrusframework.yaks.camelk.jbang.CamelJBangSettings;
 import org.citrusframework.yaks.camelk.jbang.ProcessAndOutput;
+import org.citrusframework.yaks.camelk.model.IntegrationSpec;
 import org.citrusframework.yaks.camelk.model.Pipe;
 import org.citrusframework.yaks.camelk.model.PipeList;
 import org.citrusframework.yaks.camelk.model.PipeSpec;
-import org.citrusframework.yaks.camelk.model.Integration;
 import org.citrusframework.yaks.camelk.model.v1alpha1.KameletBinding;
 import org.citrusframework.yaks.camelk.model.v1alpha1.KameletBindingList;
 import org.citrusframework.yaks.kubernetes.KubernetesSupport;
@@ -57,7 +57,7 @@ public class CreatePipeAction extends AbstractKameletAction {
     private static final Logger LOG = LoggerFactory.getLogger(CreatePipeAction.class);
 
     private final String pipeName;
-    private final Integration integration;
+    private final IntegrationSpec integration;
     private final PipeSpec.Endpoint source;
     private final PipeSpec.Endpoint sink;
     private final Resource resource;
@@ -218,7 +218,7 @@ private void createLocalPipe(Pipe pipe, String name, TestContext context) {
     public static final class Builder extends AbstractKameletAction.Builder<CreatePipeAction, Builder> {
 
         private String pipeName;
-        private Integration integration;
+        private IntegrationSpec integration;
         private PipeSpec.Endpoint source;
         private PipeSpec.Endpoint sink;
         private Resource resource;
@@ -234,7 +234,7 @@ public Builder pipe(String pipeName) {
             return this;
         }
 
-        public Builder integration(Integration integration) {
+        public Builder integration(IntegrationSpec integration) {
             this.integration = integration;
             return this;
         }

diff --git a/java/steps/yaks-camel-k/src/main/java/org/citrusframework/yaks/camelk/model/Pipe.java b/java/steps/yaks-camel-k/src/main/java/org/citrusframework/yaks/camelk/model/Pipe.java
@@ -51,7 +51,7 @@ public Pipe() {
     public static class Builder {
         protected String name;
         private int replicas;
-        private Integration integration;
+        private IntegrationSpec integration;
         private PipeSpec.Endpoint source;
         private PipeSpec.Endpoint sink;
         private final List<PipeSpec.Endpoint> steps = new ArrayList<>();
@@ -61,7 +61,7 @@ public Builder name(String name) {
             return this;
         }
 
-        public Builder integration(Integration integration) {
+        public Builder integration(IntegrationSpec integration) {
             this.integration = integration;
             return this;
         }

diff --git a/java/steps/yaks-camel-k/src/main/java/org/citrusframework/yaks/camelk/model/PipeSpec.java b/java/steps/yaks-camel-k/src/main/java/org/citrusframework/yaks/camelk/model/PipeSpec.java
@@ -33,7 +33,7 @@
 public class PipeSpec implements KubernetesResource {
 
     @JsonProperty("integration")
-    private Integration integration;
+    private IntegrationSpec integration;
 
     @JsonProperty("source")
     private Endpoint source;
@@ -79,11 +79,11 @@ public void setSteps(Endpoint[] steps) {
         this.steps = steps;
     }
 
-    public void setIntegration(Integration integration) {
+    public void setIntegration(IntegrationSpec integration) {
         this.integration = integration;
     }
 
-    public Integration getIntegration() {
+    public IntegrationSpec getIntegration() {
         return integration;
     }
 

diff --git a/...-camel-k/src/main/java/org/citrusframework/yaks/camelk/model/v1alpha1/KameletBinding.java b/...-camel-k/src/main/java/org/citrusframework/yaks/camelk/model/v1alpha1/KameletBinding.java
@@ -22,7 +22,7 @@
 import io.fabric8.kubernetes.model.annotation.Version;
 import org.citrusframework.yaks.camelk.CamelKSettings;
 import org.citrusframework.yaks.camelk.CamelKSupport;
-import org.citrusframework.yaks.camelk.model.Integration;
+import org.citrusframework.yaks.camelk.model.IntegrationSpec;
 import org.citrusframework.yaks.camelk.model.Pipe;
 import org.citrusframework.yaks.camelk.model.PipeSpec;
 
@@ -47,7 +47,7 @@ public Builder name(String name) {
             return this;
         }
 
-        public Builder integration(Integration integration) {
+        public Builder integration(IntegrationSpec integration) {
             delegate.integration(integration);
             return this;
         }