chore: updated camel-k CRD java objects.

valdar · May 23, 2019 · a48320a · a48320a
1 parent 6d967c8
commit a48320a
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 27 deletions.
diff --git a/...r/src/main/java/io/syndesis/server/controller/integration/camelk/crd/IntegrationSpec.java b/...r/src/main/java/io/syndesis/server/controller/integration/camelk/crd/IntegrationSpec.java
@@ -37,7 +37,7 @@ public interface IntegrationSpec {
 //        Context            string                          `json:"context,omitempty"`
 //        Dependencies       []string                        `json:"dependencies,omitempty"`
 //        Profile            TraitProfile                    `json:"profile,omitempty"`
-//        Traits             map[string]IntegrationTraitSpec `json:"traits,omitempty"`
+//        Traits             map[string]TraitSpec            `json:"traits,omitempty"`
 //        Configuration      []ConfigurationSpec             `json:"configuration,omitempty"`
 //        Repositories       []string                        `json:"repositories,omitempty"`
 //        ServiceAccountName string                          `json:"serviceAccountName,omitempty"`
@@ -65,7 +65,7 @@ default List<String> getDependencies() {
     String getProfile();
 
     @Value.Default
-    default Map<String,IntegrationTraitSpec> getTraits() {
+    default Map<String, TraitSpec> getTraits() {
         return Collections.emptyMap();
     }
 

diff --git a/...tion/camelk/crd/IntegrationTraitSpec.java → ...ler/integration/camelk/crd/TraitSpec.java b/...tion/camelk/crd/IntegrationTraitSpec.java → ...ler/integration/camelk/crd/TraitSpec.java
@@ -24,11 +24,11 @@
 
 @Value.Immutable
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonDeserialize(builder = IntegrationTraitSpec.Builder.class)
+@JsonDeserialize(builder = TraitSpec.Builder.class)
 // Immutables generates code that fails these checks
 @SuppressWarnings({ "ArrayEquals", "ArrayHashCode", "ArrayToString" })
-public interface IntegrationTraitSpec {
-//    type IntegrationTraitSpec struct {
+public interface TraitSpec {
+//    type TraitSpec struct {
 //        Configuration map[string]string `json:"configuration,omitempty"`
 //    }
 

diff --git a/.../io/syndesis/server/controller/integration/camelk/customizer/AbstractTraitCustomizer.java b/.../io/syndesis/server/controller/integration/camelk/customizer/AbstractTraitCustomizer.java
@@ -21,13 +21,13 @@
 import io.syndesis.common.model.integration.IntegrationDeployment;
 import io.syndesis.server.controller.integration.camelk.crd.Integration;
 import io.syndesis.server.controller.integration.camelk.crd.IntegrationSpec;
-import io.syndesis.server.controller.integration.camelk.crd.IntegrationTraitSpec;
+import io.syndesis.server.controller.integration.camelk.crd.TraitSpec;
 import io.syndesis.server.openshift.Exposure;
 
 abstract class AbstractTraitCustomizer implements CamelKIntegrationCustomizer {
     @Override
     public Integration customize(IntegrationDeployment deployment, Integration integration, EnumSet<Exposure> exposure) {
-        Map<String, IntegrationTraitSpec> traits = computeTraits(integration, exposure);
+        Map<String, TraitSpec> traits = computeTraits(integration, exposure);
         if (!traits.isEmpty()) {
             IntegrationSpec.Builder spec = new IntegrationSpec.Builder();
             if (integration.getSpec() != null) {
@@ -42,5 +42,5 @@ public Integration customize(IntegrationDeployment deployment, Integration integ
         return integration;
     }
 
-    protected abstract Map<String, IntegrationTraitSpec> computeTraits(Integration integration, EnumSet<Exposure> exposure);
+    protected abstract Map<String, TraitSpec> computeTraits(Integration integration, EnumSet<Exposure> exposure);
 }
diff --git a/...a/io/syndesis/server/controller/integration/camelk/customizer/CamelVersionCustomizer.java b/...a/io/syndesis/server/controller/integration/camelk/customizer/CamelVersionCustomizer.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 
 import io.syndesis.server.controller.integration.camelk.crd.Integration;
-import io.syndesis.server.controller.integration.camelk.crd.IntegrationTraitSpec;
+import io.syndesis.server.controller.integration.camelk.crd.TraitSpec;
 import io.syndesis.server.endpoint.v1.VersionService;
 import io.syndesis.server.openshift.Exposure;
 import org.springframework.stereotype.Component;
@@ -37,10 +37,10 @@ public CamelVersionCustomizer(VersionService versionService) {
     }
 
     @Override
-    protected Map<String, IntegrationTraitSpec> computeTraits(Integration integration, EnumSet<Exposure> exposure) {
+    protected Map<String, TraitSpec> computeTraits(Integration integration, EnumSet<Exposure> exposure) {
         return Collections.singletonMap(
             "camel",
-            new IntegrationTraitSpec.Builder()
+            new TraitSpec.Builder()
                 .putConfiguration("version", versionService.getCamelVersion())
                 .putConfiguration("runtime-version", versionService.getCamelkRuntimeVersion())
                 .build()

diff --git a/.../java/io/syndesis/server/controller/integration/camelk/customizer/ExposureCustomizer.java b/.../java/io/syndesis/server/controller/integration/camelk/customizer/ExposureCustomizer.java
@@ -21,7 +21,7 @@
 import io.syndesis.common.model.integration.IntegrationDeployment;
 import io.syndesis.server.controller.integration.camelk.crd.Integration;
 import io.syndesis.server.controller.integration.camelk.crd.IntegrationSpec;
-import io.syndesis.server.controller.integration.camelk.crd.IntegrationTraitSpec;
+import io.syndesis.server.controller.integration.camelk.crd.TraitSpec;
 import io.syndesis.server.openshift.Exposure;
 import io.syndesis.server.openshift.OpenShiftService;
 import org.springframework.stereotype.Component;
@@ -41,7 +41,7 @@ public Integration customize(IntegrationDeployment deployment, Integration integ
         if (exposure.contains(Exposure.SERVICE)) {
             spec.putTraits(
                 "service",
-                new IntegrationTraitSpec.Builder()
+                new TraitSpec.Builder()
                     .putConfiguration("enabled", "true")
                     .putConfiguration("auto", "false")
                     .putConfiguration("port", Integer.toString(OpenShiftService.INTEGRATION_SERVICE_PORT))
@@ -52,7 +52,7 @@ public Integration customize(IntegrationDeployment deployment, Integration integ
         if (exposure.contains(Exposure.ROUTE)) {
             spec.putTraits(
                 "route",
-                new IntegrationTraitSpec.Builder()
+                new TraitSpec.Builder()
                     .putConfiguration("enabled", "true")
                     .putConfiguration("tls-termination", "edge")
                     .build()

diff --git a/...n/java/io/syndesis/server/controller/integration/camelk/customizer/JolokiaCustomizer.java b/...n/java/io/syndesis/server/controller/integration/camelk/customizer/JolokiaCustomizer.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 
 import io.syndesis.server.controller.integration.camelk.crd.Integration;
-import io.syndesis.server.controller.integration.camelk.crd.IntegrationTraitSpec;
+import io.syndesis.server.controller.integration.camelk.crd.TraitSpec;
 import io.syndesis.server.openshift.Exposure;
 import org.springframework.stereotype.Component;
 
@@ -30,10 +30,10 @@
 @Component
 public class JolokiaCustomizer extends AbstractTraitCustomizer {
     @Override
-    protected Map<String, IntegrationTraitSpec> computeTraits(Integration integration, EnumSet<Exposure> exposure) {
+    protected Map<String, TraitSpec> computeTraits(Integration integration, EnumSet<Exposure> exposure) {
         return Collections.singletonMap(
             "jolokia",
-            new IntegrationTraitSpec.Builder()
+            new TraitSpec.Builder()
                 .putConfiguration("enabled", "true")
                 .putConfiguration("port", "8778")
                 .build()

diff --git a/...n/java/io/syndesis/server/controller/integration/camelk/customizer/KnativeCustomizer.java b/...n/java/io/syndesis/server/controller/integration/camelk/customizer/KnativeCustomizer.java
@@ -22,7 +22,7 @@
 import io.syndesis.common.model.integration.IntegrationDeployment;
 import io.syndesis.server.controller.integration.camelk.crd.Integration;
 import io.syndesis.server.controller.integration.camelk.crd.IntegrationSpec;
-import io.syndesis.server.controller.integration.camelk.crd.IntegrationTraitSpec;
+import io.syndesis.server.controller.integration.camelk.crd.TraitSpec;
 import io.syndesis.server.openshift.Exposure;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
@@ -78,7 +78,7 @@ protected void customizeSourceSink(IntegrationDeployment deployment, Integration
             spec = spec.from(integration.getSpec());
         }
         integration.setSpec(
-            spec.putTraits(KNATIVE_TRAIT, new IntegrationTraitSpec.Builder()
+            spec.putTraits(KNATIVE_TRAIT, new TraitSpec.Builder()
                 .putConfiguration("enabled", "true")
                 .putConfiguration("channel-sources", channelSources)
                 .putConfiguration("channel-sinks", channelSinks)
@@ -97,12 +97,12 @@ protected void customizeService(IntegrationDeployment deployment, Integration in
             }
             integration.setSpec(
                 spec.putTraits(KNATIVE_SERVICE_TRAIT,
-                    new IntegrationTraitSpec.Builder()
+                    new TraitSpec.Builder()
                         .putConfiguration("enabled", "true")
                         .putConfiguration("min-scale", "0")
                         .build()
                 ).putTraits(DEPLOYER_TRAIT,
-                    new IntegrationTraitSpec.Builder()
+                    new TraitSpec.Builder()
                         .putConfiguration("kind", KNATIVE_SERVICE_TRAIT)
                         .build()
                 ).build()

diff --git a/...ain/java/io/syndesis/server/controller/integration/camelk/customizer/OwnerCustomizer.java b/...ain/java/io/syndesis/server/controller/integration/camelk/customizer/OwnerCustomizer.java
@@ -16,7 +16,7 @@
 package io.syndesis.server.controller.integration.camelk.customizer;
 
 import io.syndesis.server.controller.integration.camelk.crd.Integration;
-import io.syndesis.server.controller.integration.camelk.crd.IntegrationTraitSpec;
+import io.syndesis.server.controller.integration.camelk.crd.TraitSpec;
 import io.syndesis.server.openshift.Exposure;
 import io.syndesis.server.openshift.OpenShiftService;
 import org.springframework.stereotype.Component;
@@ -60,7 +60,7 @@ public class OwnerCustomizer extends AbstractTraitCustomizer {
     ));
 
     @Override
-    protected Map<String, IntegrationTraitSpec> computeTraits(Integration integration, EnumSet<Exposure> exposure) {
+    protected Map<String, TraitSpec> computeTraits(Integration integration, EnumSet<Exposure> exposure) {
         List<String> labels = new ArrayList<>(LABELS);
         List<String> annotations = new ArrayList<>(ANNOTATIONS);
 
@@ -71,7 +71,7 @@ protected Map<String, IntegrationTraitSpec> computeTraits(Integration integratio
 
         return Collections.singletonMap(
             "owner",
-            new IntegrationTraitSpec.Builder()
+            new TraitSpec.Builder()
                 .putConfiguration("target-labels", String.join(",", labels))
                 .putConfiguration("target-annotations", String.join(",", annotations))
                 .build()

diff --git a/...ava/io/syndesis/server/controller/integration/camelk/customizer/PrometheusCustomizer.java b/...ava/io/syndesis/server/controller/integration/camelk/customizer/PrometheusCustomizer.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 
 import io.syndesis.server.controller.integration.camelk.crd.Integration;
-import io.syndesis.server.controller.integration.camelk.crd.IntegrationTraitSpec;
+import io.syndesis.server.controller.integration.camelk.crd.TraitSpec;
 import io.syndesis.server.openshift.Exposure;
 import org.springframework.stereotype.Component;
 
@@ -30,10 +30,10 @@
 @Component
 public class PrometheusCustomizer extends AbstractTraitCustomizer {
     @Override
-    protected Map<String, IntegrationTraitSpec> computeTraits(Integration integration, EnumSet<Exposure> exposure) {
+    protected Map<String, TraitSpec> computeTraits(Integration integration, EnumSet<Exposure> exposure) {
         return Collections.singletonMap(
             "prometheus",
-            new IntegrationTraitSpec.Builder()
+            new TraitSpec.Builder()
                 .putConfiguration("enabled", "true")
                 .putConfiguration("port", "9779")
                 .putConfiguration("service-monitor", "false")