This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new ba77190 CAMEL-12239 - Camel-Kubernetes: Renamed Openshift component with the openshift prefix - build configs renamed ba77190 is described below commit ba77190e79c73d346166d491bd2a9b0491e1849b Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Thu Feb 8 16:19:28 2018 +0100 CAMEL-12239 - Camel-Kubernetes: Renamed Openshift component with the openshift prefix - build configs renamed --- .../component/kubernetes/KubernetesEndpoint.java | 4 +-- .../kubernetes/nodes/KubernetesNodesEndpoint.java | 2 +- .../OpenshiftBuildConfigsComponent.java} | 8 ++--- .../OpenshiftBuildConfigsEndpoint.java} | 16 ++++----- .../OpenshiftBuildConfigsProducer.java} | 9 +++-- ...netes-build-configs => openshift-build-configs} | 2 +- ...precatedKubernetesBuildConfigsProducerTest.java | 41 ---------------------- .../OpenshiftBuildConfigsProducerTest.java} | 11 +++--- ...iftBuildConfigsComponentAutoConfiguration.java} | 32 ++++++++--------- ...enshiftBuildConfigsComponentConfiguration.java} | 6 ++-- .../src/main/resources/META-INF/spring.factories | 5 +-- 11 files changed, 48 insertions(+), 88 deletions(-) diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java index 8bc6720..4dd5162 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java @@ -19,7 +19,6 @@ package org.apache.camel.component.kubernetes; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.component.kubernetes.build_configs.KubernetesBuildConfigsProducer; import org.apache.camel.component.kubernetes.config_maps.KubernetesConfigMapsProducer; import org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesConsumer; import org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesProducer; @@ -36,6 +35,7 @@ import org.apache.camel.component.kubernetes.secrets.KubernetesSecretsProducer; import org.apache.camel.component.kubernetes.service_accounts.KubernetesServiceAccountsProducer; import org.apache.camel.component.kubernetes.services.KubernetesServicesConsumer; import org.apache.camel.component.kubernetes.services.KubernetesServicesProducer; +import org.apache.camel.component.openshift.build_configs.OpenshiftBuildConfigsProducer; import org.apache.camel.component.openshift.builds.OpenshiftBuildsProducer; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; @@ -107,7 +107,7 @@ public class KubernetesEndpoint extends AbstractKubernetesEndpoint { return new OpenshiftBuildsProducer(this); case KubernetesCategory.BUILD_CONFIGS: - return new KubernetesBuildConfigsProducer(this); + return new OpenshiftBuildConfigsProducer(this); default: throw new IllegalArgumentException("The " + category + " producer category doesn't exist"); diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java index a5c3d95..d169bdd 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java @@ -21,7 +21,6 @@ import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint; import org.apache.camel.component.kubernetes.KubernetesConfiguration; -import org.apache.camel.component.kubernetes.build_configs.KubernetesBuildConfigsProducer; import org.apache.camel.component.kubernetes.config_maps.KubernetesConfigMapsProducer; import org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesConsumer; import org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesProducer; @@ -36,6 +35,7 @@ import org.apache.camel.component.kubernetes.secrets.KubernetesSecretsProducer; import org.apache.camel.component.kubernetes.service_accounts.KubernetesServiceAccountsProducer; import org.apache.camel.component.kubernetes.services.KubernetesServicesConsumer; import org.apache.camel.component.kubernetes.services.KubernetesServicesProducer; +import org.apache.camel.component.openshift.build_configs.OpenshiftBuildConfigsProducer; import org.apache.camel.component.openshift.builds.OpenshiftBuildsProducer; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.util.ObjectHelper; diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/build_configs/KubernetesBuildConfigsComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsComponent.java similarity index 71% rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/build_configs/KubernetesBuildConfigsComponent.java rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsComponent.java index db20439..4cef6f4 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/build_configs/KubernetesBuildConfigsComponent.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsComponent.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.kubernetes.build_configs; +package org.apache.camel.component.openshift.build_configs; import org.apache.camel.component.kubernetes.AbstractKubernetesComponent; import org.apache.camel.component.kubernetes.KubernetesConfiguration; -public class KubernetesBuildConfigsComponent extends AbstractKubernetesComponent { +public class OpenshiftBuildConfigsComponent extends AbstractKubernetesComponent { - protected KubernetesBuildConfigsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) throws Exception { - KubernetesBuildConfigsEndpoint endpoint = new KubernetesBuildConfigsEndpoint(uri, this, config); + protected OpenshiftBuildConfigsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) throws Exception { + OpenshiftBuildConfigsEndpoint endpoint = new OpenshiftBuildConfigsEndpoint(uri, this, config); return endpoint; } } diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/build_configs/KubernetesBuildConfigsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpoint.java similarity index 66% rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/build_configs/KubernetesBuildConfigsEndpoint.java rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpoint.java index 155d5d7..cceda59 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/build_configs/KubernetesBuildConfigsEndpoint.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpoint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.kubernetes.build_configs; +package org.apache.camel.component.openshift.build_configs; import org.apache.camel.Consumer; import org.apache.camel.Processor; @@ -28,24 +28,24 @@ import org.slf4j.LoggerFactory; /** * The Kubernetes Build Config component provides a producer to execute kubernetes build config operations. */ -@UriEndpoint(firstVersion = "2.17.0", scheme = "kubernetes-build-configs", title = "Kubernetes Build Config", - syntax = "kubernetes-build-configs:masterUrl", producerOnly = true, label = "container,cloud,paas") -public class KubernetesBuildConfigsEndpoint extends AbstractKubernetesEndpoint { +@UriEndpoint(firstVersion = "2.17.0", scheme = "openshift-build-configs", title = "Openshift Build Config", + syntax = "openshift-build-configs:masterUrl", producerOnly = true, label = "container,cloud,paas") +public class OpenshiftBuildConfigsEndpoint extends AbstractKubernetesEndpoint { - private static final Logger LOG = LoggerFactory.getLogger(KubernetesBuildConfigsEndpoint.class); + private static final Logger LOG = LoggerFactory.getLogger(OpenshiftBuildConfigsEndpoint.class); - public KubernetesBuildConfigsEndpoint(String uri, KubernetesBuildConfigsComponent component, KubernetesConfiguration config) { + public OpenshiftBuildConfigsEndpoint(String uri, OpenshiftBuildConfigsComponent component, KubernetesConfiguration config) { super(uri, component, config); } @Override public Producer createProducer() throws Exception { - return new KubernetesBuildConfigsProducer(this); + return new OpenshiftBuildConfigsProducer(this); } @Override public Consumer createConsumer(Processor processor) throws Exception { - throw new IllegalArgumentException("The kubernetes-build-configs doesn't support consumer"); + throw new IllegalArgumentException("The openshift-build-configs doesn't support consumer"); } } diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/build_configs/KubernetesBuildConfigsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsProducer.java similarity index 94% rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/build_configs/KubernetesBuildConfigsProducer.java rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsProducer.java index 9fc22a2..2c855e8 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/build_configs/KubernetesBuildConfigsProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsProducer.java @@ -14,14 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.kubernetes.build_configs; +package org.apache.camel.component.openshift.build_configs; import java.util.Map; import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; -import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.openshift.api.model.Build; import io.fabric8.openshift.api.model.BuildConfig; @@ -40,11 +39,11 @@ import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class KubernetesBuildConfigsProducer extends DefaultProducer { +public class OpenshiftBuildConfigsProducer extends DefaultProducer { - private static final Logger LOG = LoggerFactory.getLogger(KubernetesBuildConfigsProducer.class); + private static final Logger LOG = LoggerFactory.getLogger(OpenshiftBuildConfigsProducer.class); - public KubernetesBuildConfigsProducer(AbstractKubernetesEndpoint endpoint) { + public OpenshiftBuildConfigsProducer(AbstractKubernetesEndpoint endpoint) { super(endpoint); } diff --git a/components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/kubernetes-build-configs b/components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/openshift-build-configs similarity index 89% rename from components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/kubernetes-build-configs rename to components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/openshift-build-configs index 7893186..59b5705 100644 --- a/components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/kubernetes-build-configs +++ b/components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/openshift-build-configs @@ -15,4 +15,4 @@ # limitations under the License. # -class=org.apache.camel.component.kubernetes.build_configs.KubernetesBuildConfigsComponent +class=org.apache.camel.component.openshift.build_configs.OpenshiftBuildConfigsComponent diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesBuildConfigsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesBuildConfigsProducerTest.java deleted file mode 100644 index 699ef73..0000000 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesBuildConfigsProducerTest.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.kubernetes.deprecated; - -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.kubernetes.producer.KubernetesBuildConfigsProducerTest; -import org.junit.Ignore; - -@Ignore -@Deprecated -public class DeprecatedKubernetesBuildConfigsProducerTest extends KubernetesBuildConfigsProducerTest { - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - from("direct:list") - .toF("kubernetes://%s?oauthToken=%s&category=buildConfigs&operation=listBuildConfigs", - host, authToken); - from("direct:listByLabels") - .toF("kubernetes://%s?oauthToken=%s&category=buildConfigs&operation=listBuildConfigsByLabels", - host, authToken); - } - }; - } -} diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java similarity index 85% rename from components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducerTest.java rename to components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java index 67e3817..e6dfc5c 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.kubernetes.producer; +package org.apache.camel.component.openshift.producer; import java.util.HashMap; import java.util.List; @@ -22,6 +22,7 @@ import java.util.Map; import io.fabric8.openshift.api.model.BuildConfig; import io.fabric8.openshift.api.model.BuildConfigListBuilder; +import io.fabric8.openshift.client.OpenShiftClient; import io.fabric8.openshift.client.server.mock.OpenShiftServer; import org.apache.camel.Exchange; @@ -33,7 +34,7 @@ import org.apache.camel.impl.JndiRegistry; import org.junit.Rule; import org.junit.Test; -public class KubernetesBuildConfigsProducerTest extends KubernetesTestSupport { +public class OpenshiftBuildConfigsProducerTest extends KubernetesTestSupport { @Rule public OpenShiftServer server = new OpenShiftServer(); @@ -41,7 +42,7 @@ public class KubernetesBuildConfigsProducerTest extends KubernetesTestSupport { @Override protected JndiRegistry createRegistry() throws Exception { JndiRegistry registry = super.createRegistry(); - registry.bind("client", server.getKubernetesClient()); + registry.bind("client", server.getKubernetesClient().adapt(OpenShiftClient.class)); return registry; } @@ -78,8 +79,8 @@ public class KubernetesBuildConfigsProducerTest extends KubernetesTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:list").to("kubernetes-build-configs:///?operation=listBuildConfigs&kubernetesClient=#client"); - from("direct:listByLabels").to("kubernetes-build-configs:///?kubernetesClient=#client&operation=listBuildConfigsByLabels"); + from("direct:list").to("openshift-build-configs:///?operation=listBuildConfigs&kubernetesClient=#client"); + from("direct:listByLabels").to("openshift-build-configs:///?kubernetesClient=#client&operation=listBuildConfigsByLabels"); } }; } diff --git a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/build_configs/springboot/KubernetesBuildConfigsComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentAutoConfiguration.java similarity index 80% rename from platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/build_configs/springboot/KubernetesBuildConfigsComponentAutoConfiguration.java rename to platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentAutoConfiguration.java index 6e6c974..af7a319 100644 --- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/build_configs/springboot/KubernetesBuildConfigsComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentAutoConfiguration.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.kubernetes.build_configs.springboot; +package org.apache.camel.component.openshift.build_configs.springboot; import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.Generated; import org.apache.camel.CamelContext; -import org.apache.camel.component.kubernetes.build_configs.KubernetesBuildConfigsComponent; +import org.apache.camel.component.openshift.build_configs.OpenshiftBuildConfigsComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spi.HasId; import org.apache.camel.spring.boot.CamelAutoConfiguration; @@ -51,35 +51,35 @@ import org.springframework.context.annotation.Lazy; @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration @Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, - KubernetesBuildConfigsComponentAutoConfiguration.GroupConditions.class}) + OpenshiftBuildConfigsComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, - KubernetesBuildConfigsComponentConfiguration.class}) -public class KubernetesBuildConfigsComponentAutoConfiguration { + OpenshiftBuildConfigsComponentConfiguration.class}) +public class OpenshiftBuildConfigsComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory - .getLogger(KubernetesBuildConfigsComponentAutoConfiguration.class); + .getLogger(OpenshiftBuildConfigsComponentAutoConfiguration.class); @Autowired private ApplicationContext applicationContext; @Autowired private CamelContext camelContext; @Autowired - private KubernetesBuildConfigsComponentConfiguration configuration; + private OpenshiftBuildConfigsComponentConfiguration configuration; @Autowired(required = false) - private List<ComponentCustomizer<KubernetesBuildConfigsComponent>> customizers; + private List<ComponentCustomizer<OpenshiftBuildConfigsComponent>> customizers; static class GroupConditions extends GroupCondition { public GroupConditions() { - super("camel.component", "camel.component.kubernetes-build-configs"); + super("camel.component", "camel.component.openshift-build-configs"); } } @Lazy - @Bean(name = "kubernetes-build-configs-component") - @ConditionalOnMissingBean(KubernetesBuildConfigsComponent.class) - public KubernetesBuildConfigsComponent configureKubernetesBuildConfigsComponent() + @Bean(name = "openshift-build-configs-component") + @ConditionalOnMissingBean(OpenshiftBuildConfigsComponent.class) + public OpenshiftBuildConfigsComponent configureOpenshiftBuildConfigsComponent() throws Exception { - KubernetesBuildConfigsComponent component = new KubernetesBuildConfigsComponent(); + OpenshiftBuildConfigsComponent component = new OpenshiftBuildConfigsComponent(); component.setCamelContext(camelContext); Map<String, Object> parameters = new HashMap<>(); IntrospectionSupport.getProperties(configuration, parameters, null, @@ -106,18 +106,18 @@ public class KubernetesBuildConfigsComponentAutoConfiguration { CamelPropertiesHelper.setCamelProperties(camelContext, component, parameters, false); if (ObjectHelper.isNotEmpty(customizers)) { - for (ComponentCustomizer<KubernetesBuildConfigsComponent> customizer : customizers) { + for (ComponentCustomizer<OpenshiftBuildConfigsComponent> customizer : customizers) { boolean useCustomizer = (customizer instanceof HasId) ? HierarchicalPropertiesEvaluator .evaluate( applicationContext.getEnvironment(), "camel.component.customizer", - "camel.component.kubernetes-build-configs.customizer", + "camel.component.openshift-build-configs.customizer", ((HasId) customizer).getId()) : HierarchicalPropertiesEvaluator .evaluate(applicationContext.getEnvironment(), "camel.component.customizer", - "camel.component.kubernetes-build-configs.customizer"); + "camel.component.openshift-build-configs.customizer"); if (useCustomizer) { LOGGER.debug("Configure component {}, with customizer {}", component, customizer); diff --git a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/build_configs/springboot/KubernetesBuildConfigsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentConfiguration.java similarity index 89% rename from platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/build_configs/springboot/KubernetesBuildConfigsComponentConfiguration.java rename to platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentConfiguration.java index 8d2d4b6..18fb475 100644 --- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/build_configs/springboot/KubernetesBuildConfigsComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.kubernetes.build_configs.springboot; +package org.apache.camel.component.openshift.build_configs.springboot; import javax.annotation.Generated; import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon; @@ -27,8 +27,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * Generated by camel-package-maven-plugin - do not edit this file! */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") -@ConfigurationProperties(prefix = "camel.component.kubernetes-build-configs") -public class KubernetesBuildConfigsComponentConfiguration +@ConfigurationProperties(prefix = "camel.component.openshift-build-configs") +public class OpenshiftBuildConfigsComponentConfiguration extends ComponentConfigurationPropertiesCommon { diff --git a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring.factories index b59dbc0..276298c 100644 --- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring.factories +++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring.factories @@ -26,12 +26,13 @@ org.apache.camel.component.kubernetes.springboot.KubernetesComponentAutoConfigur org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceAutoConfiguration,\ org.apache.camel.component.kubernetes.replication_controllers.springboot.KubernetesReplicationControllersComponentAutoConfiguration,\ org.apache.camel.component.kubernetes.persistent_volumes.springboot.KubernetesPersistentVolumesComponentAutoConfiguration,\ -org.apache.camel.component.kubernetes.build_configs.springboot.KubernetesBuildConfigsComponentAutoConfiguration,\ org.apache.camel.component.kubernetes.config_maps.springboot.KubernetesConfigMapsComponentAutoConfiguration,\ org.apache.camel.component.kubernetes.persistent_volumes_claims.springboot.KubernetesPersistentVolumesClaimsComponentAutoConfiguration,\ org.apache.camel.component.kubernetes.deployments.springboot.KubernetesDeploymentsComponentAutoConfiguration,\ org.apache.camel.component.kubernetes.service_accounts.springboot.KubernetesServiceAccountsComponentAutoConfiguration,\ -org.apache.camel.component.openshift.builds.springboot.OpenshiftBuildsComponentAutoConfiguration +org.apache.camel.component.openshift.builds.springboot.OpenshiftBuildsComponentAutoConfiguration,\ +org.apache.camel.component.openshift.build_configs.springboot.OpenshiftBuildConfigsComponentAutoConfiguration + -- To stop receiving notification emails like this one, please contact acosent...@apache.org.