You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/02/07 14:14:03 UTC
[camel] branch master updated: CAMEL-12239 - Renamed Openshift
component with the openshift prefix - Build resource
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 67732c6 CAMEL-12239 - Renamed Openshift component with the openshift prefix - Build resource
67732c6 is described below
commit 67732c66a1d11722a2136a61a0e852a5d7f64914
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 7 14:51:37 2018 +0100
CAMEL-12239 - Renamed Openshift component with the openshift prefix - Build resource
---
...ponent.adoc => openshift-builds-component.adoc} | 11 +++---
.../component/kubernetes/KubernetesEndpoint.java | 4 +--
.../config_maps/KubernetesConfigMapsEndpoint.java | 18 ----------
.../kubernetes/nodes/KubernetesNodesEndpoint.java | 2 +-
.../KubernetesPersistentVolumesClaimsEndpoint.java | 18 ----------
.../kubernetes/pods/KubernetesPodsEndpoint.java | 17 ---------
.../KubernetesReplicationControllersEndpoint.java | 17 ---------
.../KubernetesResourcesQuotaEndpoint.java | 18 ----------
.../secrets/KubernetesSecretsEndpoint.java | 18 ----------
.../builds/OpenshiftBuildsComponent.java} | 6 ++--
.../builds/OpenshiftBuildsEndpoint.java} | 14 ++++----
.../builds/OpenshiftBuildsProducer.java} | 8 ++---
.../{kubernetes-builds => openshift-builds} | 2 +-
.../DeprecatedKubernetesBuildsProducerTest.java | 41 ----------------------
.../producer/OpenshiftBuildsProducerTest.java} | 11 +++---
...OpenshiftBuildsComponentAutoConfiguration.java} | 32 ++++++++---------
.../OpenshiftBuildsComponentConfiguration.java} | 10 +++---
.../src/main/resources/META-INF/spring.factories | 5 +--
18 files changed, 55 insertions(+), 197 deletions(-)
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-builds-component.adoc b/components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc
similarity index 89%
rename from components/camel-kubernetes/src/main/docs/kubernetes-builds-component.adoc
rename to components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc
index 455e66a..b12509f 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-builds-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc
@@ -1,5 +1,8 @@
-[[kubernetes-builds-component]]
+[[openshift-builds-component]]
+== Openshift Builds Component
== Kubernetes Builds Component
+*Available as of Camel version 2.17*
+
*Available as of Camel version 2.17*
@@ -10,17 +13,17 @@ provides a producer to execute kubernetes build operations.
### Component Options
// component options: START
-The Kubernetes Builds component has no options.
+The Openshift Builds component has no options.
// component options: END
### Endpoint Options
// endpoint options: START
-The Kubernetes Builds endpoint is configured using URI syntax:
+The Openshift Builds endpoint is configured using URI syntax:
----
-kubernetes-builds:masterUrl
+openshift-builds:masterUrl
----
with the following path and query parameters:
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 80ffacc..8bc6720 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
@@ -20,7 +20,6 @@ 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.builds.KubernetesBuildsProducer;
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;
@@ -37,6 +36,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.builds.OpenshiftBuildsProducer;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -104,7 +104,7 @@ public class KubernetesEndpoint extends AbstractKubernetesEndpoint {
return new KubernetesConfigMapsProducer(this);
case KubernetesCategory.BUILDS:
- return new KubernetesBuildsProducer(this);
+ return new OpenshiftBuildsProducer(this);
case KubernetesCategory.BUILD_CONFIGS:
return new KubernetesBuildConfigsProducer(this);
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
index 88c3a98..5a921de 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
@@ -21,25 +21,7 @@ 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.builds.KubernetesBuildsProducer;
-import org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesConsumer;
-import org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesProducer;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesConsumer;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesProducer;
-import org.apache.camel.component.kubernetes.persistent_volumes.KubernetesPersistentVolumesProducer;
-import org.apache.camel.component.kubernetes.persistent_volumes_claims.KubernetesPersistentVolumesClaimsProducer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsConsumer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsProducer;
-import org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersConsumer;
-import org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersProducer;
-import org.apache.camel.component.kubernetes.resources_quota.KubernetesResourcesQuotaProducer;
-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.spi.UriEndpoint;
-import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 9302905..a5c3d95 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
@@ -22,7 +22,6 @@ 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.builds.KubernetesBuildsProducer;
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;
@@ -37,6 +36,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.builds.OpenshiftBuildsProducer;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java
index a6e94ea..8572f51 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java
@@ -21,25 +21,7 @@ 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.builds.KubernetesBuildsProducer;
-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;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesConsumer;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesProducer;
-import org.apache.camel.component.kubernetes.persistent_volumes.KubernetesPersistentVolumesProducer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsConsumer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsProducer;
-import org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersConsumer;
-import org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersProducer;
-import org.apache.camel.component.kubernetes.resources_quota.KubernetesResourcesQuotaProducer;
-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.spi.UriEndpoint;
-import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java
index 3564043..7016123 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java
@@ -21,24 +21,7 @@ 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.builds.KubernetesBuildsProducer;
-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;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesConsumer;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesProducer;
-import org.apache.camel.component.kubernetes.persistent_volumes.KubernetesPersistentVolumesProducer;
-import org.apache.camel.component.kubernetes.persistent_volumes_claims.KubernetesPersistentVolumesClaimsProducer;
-import org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersConsumer;
-import org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersProducer;
-import org.apache.camel.component.kubernetes.resources_quota.KubernetesResourcesQuotaProducer;
-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.spi.UriEndpoint;
-import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java
index 713893f..3cdbf96 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java
@@ -21,24 +21,7 @@ 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.builds.KubernetesBuildsProducer;
-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;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesConsumer;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesProducer;
-import org.apache.camel.component.kubernetes.persistent_volumes.KubernetesPersistentVolumesProducer;
-import org.apache.camel.component.kubernetes.persistent_volumes_claims.KubernetesPersistentVolumesClaimsProducer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsConsumer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsProducer;
-import org.apache.camel.component.kubernetes.resources_quota.KubernetesResourcesQuotaProducer;
-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.spi.UriEndpoint;
-import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java
index 641578e..54ae782 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java
@@ -21,25 +21,7 @@ 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.builds.KubernetesBuildsProducer;
-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;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesConsumer;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesProducer;
-import org.apache.camel.component.kubernetes.persistent_volumes.KubernetesPersistentVolumesProducer;
-import org.apache.camel.component.kubernetes.persistent_volumes_claims.KubernetesPersistentVolumesClaimsProducer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsConsumer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsProducer;
-import org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersConsumer;
-import org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersProducer;
-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.spi.UriEndpoint;
-import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java
index 094de9e..651ae93 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java
@@ -21,25 +21,7 @@ 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.builds.KubernetesBuildsProducer;
-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;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesConsumer;
-import org.apache.camel.component.kubernetes.nodes.KubernetesNodesProducer;
-import org.apache.camel.component.kubernetes.persistent_volumes.KubernetesPersistentVolumesProducer;
-import org.apache.camel.component.kubernetes.persistent_volumes_claims.KubernetesPersistentVolumesClaimsProducer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsConsumer;
-import org.apache.camel.component.kubernetes.pods.KubernetesPodsProducer;
-import org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersConsumer;
-import org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersProducer;
-import org.apache.camel.component.kubernetes.resources_quota.KubernetesResourcesQuotaProducer;
-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.spi.UriEndpoint;
-import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/builds/KubernetesBuildsComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsComponent.java
similarity index 84%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/builds/KubernetesBuildsComponent.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsComponent.java
index 1927bdb..a4a85a9 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/builds/KubernetesBuildsComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsComponent.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.builds;
+package org.apache.camel.component.openshift.builds;
import org.apache.camel.component.kubernetes.AbstractKubernetesComponent;
import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
import org.apache.camel.component.kubernetes.KubernetesConfiguration;
-public class KubernetesBuildsComponent extends AbstractKubernetesComponent {
+public class OpenshiftBuildsComponent extends AbstractKubernetesComponent {
protected AbstractKubernetesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) throws Exception {
- KubernetesBuildsEndpoint endpoint = new KubernetesBuildsEndpoint(uri, this, config);
+ OpenshiftBuildsEndpoint endpoint = new OpenshiftBuildsEndpoint(uri, this, config);
return endpoint;
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/builds/KubernetesBuildsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpoint.java
similarity index 68%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/builds/KubernetesBuildsEndpoint.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpoint.java
index 03a7eb1..0f08fb0 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/builds/KubernetesBuildsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpoint.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.builds;
+package org.apache.camel.component.openshift.builds;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
@@ -26,20 +26,20 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * The Kubernetes Builds component provides a producer to execute kubernetes build operations.
+ * The Openshift Builds component provides a producer to execute openshift build operations.
*/
-@UriEndpoint(firstVersion = "2.17.0", scheme = "kubernetes-builds", title = "Kubernetes Builds", syntax = "kubernetes-builds:masterUrl", producerOnly = true, label = "container,cloud,paas")
-public class KubernetesBuildsEndpoint extends AbstractKubernetesEndpoint {
+@UriEndpoint(firstVersion = "2.17.0", scheme = "openshift-builds", title = "Openshift Builds", syntax = "openshift-builds:masterUrl", producerOnly = true, label = "container,cloud,paas")
+public class OpenshiftBuildsEndpoint extends AbstractKubernetesEndpoint {
- private static final Logger LOG = LoggerFactory.getLogger(KubernetesBuildsEndpoint.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OpenshiftBuildsEndpoint.class);
- public KubernetesBuildsEndpoint(String uri, KubernetesBuildsComponent component, KubernetesConfiguration config) {
+ public OpenshiftBuildsEndpoint(String uri, OpenshiftBuildsComponent component, KubernetesConfiguration config) {
super(uri, component, config);
}
@Override
public Producer createProducer() throws Exception {
- return new KubernetesBuildsProducer(this);
+ return new OpenshiftBuildsProducer(this);
}
@Override
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/builds/KubernetesBuildsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsProducer.java
similarity index 95%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/builds/KubernetesBuildsProducer.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsProducer.java
index 44d2634..82ab887 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/builds/KubernetesBuildsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsProducer.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.builds;
+package org.apache.camel.component.openshift.builds;
import java.util.Map;
@@ -39,11 +39,11 @@ import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class KubernetesBuildsProducer extends DefaultProducer {
+public class OpenshiftBuildsProducer extends DefaultProducer {
- private static final Logger LOG = LoggerFactory.getLogger(KubernetesBuildsProducer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OpenshiftBuildsProducer.class);
- public KubernetesBuildsProducer(AbstractKubernetesEndpoint endpoint) {
+ public OpenshiftBuildsProducer(AbstractKubernetesEndpoint endpoint) {
super(endpoint);
}
diff --git a/components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/kubernetes-builds b/components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/openshift-builds
similarity index 91%
rename from components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/kubernetes-builds
rename to components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/openshift-builds
index 944c980..0467d81 100644
--- a/components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/kubernetes-builds
+++ b/components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/openshift-builds
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.component.kubernetes.builds.KubernetesBuildsComponent
+class=org.apache.camel.component.openshift.builds.OpenshiftBuildsComponent
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesBuildsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesBuildsProducerTest.java
deleted file mode 100644
index 882fcc9..0000000
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesBuildsProducerTest.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.KubernetesBuildsProducerTest;
-import org.junit.Ignore;
-
-@Ignore
-@Deprecated
-public class DeprecatedKubernetesBuildsProducerTest extends KubernetesBuildsProducerTest {
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:list")
- .toF("kubernetes://%s?oauthToken=%s&category=builds&operation=listBuilds",
- host, authToken);
- from("direct:listByLabels")
- .toF("kubernetes://%s?oauthToken=%s&category=builds&operation=listBuildsByLabels",
- host, authToken);
- }
- };
- }
-}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java
similarity index 85%
rename from components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducerTest.java
rename to components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java
index 2505d84..7126ad4 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.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.Build;
import io.fabric8.openshift.api.model.BuildListBuilder;
+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 KubernetesBuildsProducerTest extends KubernetesTestSupport {
+public class OpenshiftBuildsProducerTest extends KubernetesTestSupport {
@Rule
public OpenShiftServer server = new OpenShiftServer();
@@ -41,7 +42,7 @@ public class KubernetesBuildsProducerTest 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 KubernetesBuildsProducerTest extends KubernetesTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:list").to("kubernetes-builds:///?operation=listBuilds&kubernetesClient=#client");
- from("direct:listByLabels").to("kubernetes-builds:///?operation=listBuildsByLabels&kubernetesClient=#client");
+ from("direct:list").to("openshift-builds:///?operation=listBuilds&kubernetesClient=#client");
+ from("direct:listByLabels").to("openshift-builds:///?operation=listBuildsByLabels&kubernetesClient=#client");
}
};
}
diff --git a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/builds/springboot/KubernetesBuildsComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentAutoConfiguration.java
similarity index 81%
rename from platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/builds/springboot/KubernetesBuildsComponentAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentAutoConfiguration.java
index 22adf73..84ab8ff 100644
--- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/builds/springboot/KubernetesBuildsComponentAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentAutoConfiguration.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.builds.springboot;
+package org.apache.camel.component.openshift.builds.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.builds.KubernetesBuildsComponent;
+import org.apache.camel.component.openshift.builds.OpenshiftBuildsComponent;
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,
- KubernetesBuildsComponentAutoConfiguration.GroupConditions.class})
+ OpenshiftBuildsComponentAutoConfiguration.GroupConditions.class})
@AutoConfigureAfter(CamelAutoConfiguration.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,
- KubernetesBuildsComponentConfiguration.class})
-public class KubernetesBuildsComponentAutoConfiguration {
+ OpenshiftBuildsComponentConfiguration.class})
+public class OpenshiftBuildsComponentAutoConfiguration {
private static final Logger LOGGER = LoggerFactory
- .getLogger(KubernetesBuildsComponentAutoConfiguration.class);
+ .getLogger(OpenshiftBuildsComponentAutoConfiguration.class);
@Autowired
private ApplicationContext applicationContext;
@Autowired
private CamelContext camelContext;
@Autowired
- private KubernetesBuildsComponentConfiguration configuration;
+ private OpenshiftBuildsComponentConfiguration configuration;
@Autowired(required = false)
- private List<ComponentCustomizer<KubernetesBuildsComponent>> customizers;
+ private List<ComponentCustomizer<OpenshiftBuildsComponent>> customizers;
static class GroupConditions extends GroupCondition {
public GroupConditions() {
- super("camel.component", "camel.component.kubernetes-builds");
+ super("camel.component", "camel.component.openshift-builds");
}
}
@Lazy
- @Bean(name = "kubernetes-builds-component")
- @ConditionalOnMissingBean(KubernetesBuildsComponent.class)
- public KubernetesBuildsComponent configureKubernetesBuildsComponent()
+ @Bean(name = "openshift-builds-component")
+ @ConditionalOnMissingBean(OpenshiftBuildsComponent.class)
+ public OpenshiftBuildsComponent configureOpenshiftBuildsComponent()
throws Exception {
- KubernetesBuildsComponent component = new KubernetesBuildsComponent();
+ OpenshiftBuildsComponent component = new OpenshiftBuildsComponent();
component.setCamelContext(camelContext);
Map<String, Object> parameters = new HashMap<>();
IntrospectionSupport.getProperties(configuration, parameters, null,
@@ -106,17 +106,17 @@ public class KubernetesBuildsComponentAutoConfiguration {
CamelPropertiesHelper.setCamelProperties(camelContext, component,
parameters, false);
if (ObjectHelper.isNotEmpty(customizers)) {
- for (ComponentCustomizer<KubernetesBuildsComponent> customizer : customizers) {
+ for (ComponentCustomizer<OpenshiftBuildsComponent> customizer : customizers) {
boolean useCustomizer = (customizer instanceof HasId)
? HierarchicalPropertiesEvaluator.evaluate(
applicationContext.getEnvironment(),
"camel.component.customizer",
- "camel.component.kubernetes-builds.customizer",
+ "camel.component.openshift-builds.customizer",
((HasId) customizer).getId())
: HierarchicalPropertiesEvaluator.evaluate(
applicationContext.getEnvironment(),
"camel.component.customizer",
- "camel.component.kubernetes-builds.customizer");
+ "camel.component.openshift-builds.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/builds/springboot/KubernetesBuildsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentConfiguration.java
similarity index 85%
rename from platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/builds/springboot/KubernetesBuildsComponentConfiguration.java
rename to platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentConfiguration.java
index 39a36b5..0f706ae 100644
--- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/builds/springboot/KubernetesBuildsComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentConfiguration.java
@@ -14,21 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.builds.springboot;
+package org.apache.camel.component.openshift.builds.springboot;
import javax.annotation.Generated;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * The Kubernetes Builds component provides a producer to execute kubernetes
- * build operations.
+ * The Openshift Builds component provides a producer to execute openshift build
+ * operations.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.kubernetes-builds")
-public class KubernetesBuildsComponentConfiguration
+@ConfigurationProperties(prefix = "camel.component.openshift-builds")
+public class OpenshiftBuildsComponentConfiguration
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 0454ac3..b59dbc0 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
@@ -20,7 +20,6 @@ org.apache.camel.component.kubernetes.services.springboot.KubernetesServicesComp
org.apache.camel.component.kubernetes.namespaces.springboot.KubernetesNamespacesComponentAutoConfiguration,\
org.apache.camel.component.kubernetes.resources_quota.springboot.KubernetesResourcesQuotaComponentAutoConfiguration,\
org.apache.camel.component.kubernetes.nodes.springboot.KubernetesNodesComponentAutoConfiguration,\
-org.apache.camel.component.kubernetes.builds.springboot.KubernetesBuildsComponentAutoConfiguration,\
org.apache.camel.component.kubernetes.pods.springboot.KubernetesPodsComponentAutoConfiguration,\
org.apache.camel.component.kubernetes.secrets.springboot.KubernetesSecretsComponentAutoConfiguration,\
org.apache.camel.component.kubernetes.springboot.KubernetesComponentAutoConfiguration,\
@@ -31,7 +30,9 @@ org.apache.camel.component.kubernetes.build_configs.springboot.KubernetesBuildCo
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.kubernetes.service_accounts.springboot.KubernetesServiceAccountsComponentAutoConfiguration,\
+org.apache.camel.component.openshift.builds.springboot.OpenshiftBuildsComponentAutoConfiguration
+
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.