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 2020/07/02 08:42:12 UTC
[camel-kafka-connector] branch master updated: Revert the
work-around for CAMEL-15063 (#312)
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-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new e33ff84 Revert the work-around for CAMEL-15063 (#312)
e33ff84 is described below
commit e33ff84e1c0fcd891cda29ac32b81c4ffc548595
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Thu Jul 2 10:42:05 2020 +0200
Revert the work-around for CAMEL-15063 (#312)
Removes the custom Salesforce component and the related generator
settings for the Salesforce connector
---
...mel-kafka-connector-fix-dependencies.properties | 3 --
.../salesforce/SalesforceComponentCKC.java | 39 ----------------------
.../salesforce/CamelSalesforceSinkTask.java | 1 -
.../salesforce/CamelSalesforceSourceTask.java | 1 -
4 files changed, 44 deletions(-)
diff --git a/connectors/camel-kafka-connector-fix-dependencies.properties b/connectors/camel-kafka-connector-fix-dependencies.properties
index a20c62a..7efa17b 100644
--- a/connectors/camel-kafka-connector-fix-dependencies.properties
+++ b/connectors/camel-kafka-connector-fix-dependencies.properties
@@ -26,8 +26,5 @@ camel-sjms2=org.apache.activemq:activemq-client::compile
exclude_camel-sjms2=
additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
-#XXX: temporary workaround waiting for https://issues.apache.org/jira/browse/CAMEL-15063 in camel 3.4.0
-additional_properties_camel-salesforce=camel.beans.salesforce=#class:org.apache.camel.component.salesforce.SalesforceComponentCKC
-
# issue 259: https://github.com/apache/camel-kafka-connector/issues/259
camel-elasticsearch-rest=org.slf4j:log4j-over-slf4j
diff --git a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java
deleted file mode 100644
index d6c9020..0000000
--- a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java
+++ /dev/null
@@ -1,39 +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.salesforce;
-
-import org.apache.camel.spi.PropertyConfigurer;
-
-//XXX: temporary workaround waiting for https://issues.apache.org/jira/browse/CAMEL-15063 in camel 3.4.0
-public class SalesforceComponentCKC extends SalesforceComponent {
-
- @Override
- protected void doStart() throws Exception {
- super.doStart();
- getConfig().setHttpClient(getHttpClient());
- }
-
- @Override
- public PropertyConfigurer getComponentPropertyConfigurer() {
- return new SalesforceComponentConfigurer();
- }
-
- @Override
- public PropertyConfigurer getEndpointPropertyConfigurer() {
- return new SalesforceEndpointConfigurer();
- }
-}
diff --git a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkTask.java b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkTask.java
index 2840c2a..17d3783 100644
--- a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkTask.java
+++ b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkTask.java
@@ -34,7 +34,6 @@ public class CamelSalesforceSinkTask extends CamelSinkTask {
protected Map<String, String> getDefaultConfig() {
return new HashMap<String, String>() {{
put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "salesforce");
- put("camel.beans.salesforce", "#class:org.apache.camel.component.salesforce.SalesforceComponentCKC");
}};
}
}
\ No newline at end of file
diff --git a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceTask.java b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceTask.java
index 2d6f17d..01e3b55 100644
--- a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceTask.java
+++ b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceTask.java
@@ -34,7 +34,6 @@ public class CamelSalesforceSourceTask extends CamelSourceTask {
protected Map<String, String> getDefaultConfig() {
return new HashMap<String, String>() {{
put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "salesforce");
- put("camel.beans.salesforce", "#class:org.apache.camel.component.salesforce.SalesforceComponentCKC");
}};
}
}
\ No newline at end of file