Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Camel 3.7.1 ipr #1

Draft
wants to merge 3 commits into
base: camel-3.7.x
Choose a base branch
from
Draft

Camel 3.7.1 ipr #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d74724f
pom update version
TheAvalanche Jan 29, 2021
3f3a0d9
ectd repo initial commit
VitalyH Jan 29, 2021
769eb54
fixes to loading from etcd
TheAvalanche Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ...src/generated/resources/org/apache/camel/catalog/docs/salesforce-component.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ for details on how to generate the DTO.


// component options: START
The Salesforce component supports 74 options, which are listed below.
The Salesforce component supports 79 options, which are listed below.



Expand All @@ -697,6 +697,11 @@ The Salesforce component supports 74 options, which are listed below.
| *batchId* (common) | Bulk API Batch ID | | String
| *contentType* (common) | Bulk API content type, one of XML, CSV, ZIP_XML, ZIP_CSV. There are 6 enums and the value can be one of: XML, CSV, JSON, ZIP_XML, ZIP_CSV, ZIP_JSON | | ContentType
| *defaultReplayId* (common) | Default replayId setting if no value is found in initialReplayIdMap | -1 | Long
| *etCdRepoCacheDepth* (common) | ETCD repository cache size depth | | String
| *etcdRepoPassword* (common) | ETCD repository password | | String
| *etcdRepoPlaceholderValue* (common) | ETCD repository field for testing | | String
| *etcdRepoUri* (common) | ETCD repository URIs | | String
| *etcdRepoUsername* (common) | ETCD repository username | | String
| *format* (common) | Payload format to use for Salesforce API calls, either JSON or XML, defaults to JSON. There are 2 enums and the value can be one of: JSON, XML | | PayloadFormat
| *httpClient* (common) | Custom Jetty Http Client to use to connect to Salesforce. | | SalesforceHttpClient
| *httpClientConnectionTimeout* (common) | Connection timeout used by the HttpClient when connecting to the Salesforce server. | 60000 | long
Expand Down Expand Up @@ -796,7 +801,7 @@ with the following path and query parameters:
|===


=== Query Parameters (45 parameters):
=== Query Parameters (50 parameters):


[width="100%",cols="2,5,^1,2",options="header"]
Expand All @@ -809,6 +814,11 @@ with the following path and query parameters:
| *batchId* (common) | Bulk API Batch ID | | String
| *contentType* (common) | Bulk API content type, one of XML, CSV, ZIP_XML, ZIP_CSV. There are 6 enums and the value can be one of: XML, CSV, JSON, ZIP_XML, ZIP_CSV, ZIP_JSON | | ContentType
| *defaultReplayId* (common) | Default replayId setting if no value is found in initialReplayIdMap | -1 | Long
| *etCdRepoCacheDepth* (common) | ETCD repository cache size depth | | String
| *etcdRepoPassword* (common) | ETCD repository password | | String
| *etcdRepoPlaceholderValue* (common) | ETCD repository field for testing | | String
| *etcdRepoUri* (common) | ETCD repository URIs | | String
| *etcdRepoUsername* (common) | ETCD repository username | | String
| *format* (common) | Payload format to use for Salesforce API calls, either JSON or XML, defaults to JSON. There are 2 enums and the value can be one of: JSON, XML | | PayloadFormat
| *httpClient* (common) | Custom Jetty Http Client to use to connect to Salesforce. | | SalesforceHttpClient
| *includeDetails* (common) | Include details in Salesforce1 Analytics report, defaults to false. | | Boolean
Expand Down
110 changes: 109 additions & 1 deletion components/camel-salesforce/camel-salesforce-component/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
<version>3.7.1</version>
</parent>

<groupId>lv.ipr.camel</groupId>
<artifactId>camel-salesforce</artifactId>
<version>3.7.1-IPR-0.4</version>
<packaging>jar</packaging>
<name>Camel :: Salesforce</name>
<description>Camel Salesforce support</description>
Expand All @@ -49,6 +51,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
<version>3.7.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -160,6 +163,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
<version>3.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -170,6 +174,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-csv</artifactId>
<version>3.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -228,8 +233,15 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-catalog</artifactId>
<version>3.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mousio</groupId>
<artifactId>etcd4j</artifactId>
<version>2.18.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -256,6 +268,91 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bundle-plugin</artifactId>
<version>3.7.1</version>
<extensions>false</extensions>
<configuration>
<supportIncrementalBuild>true</supportIncrementalBuild>
<noWarningProjectTypes>pom</noWarningProjectTypes>
<excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
<instructions>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
<Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
<Import-Package>${camel.osgi.import}</Import-Package>
<Export-Package>${camel.osgi.export}</Export-Package>
<DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
<Private-Package>${camel.osgi.private.pkg}</Private-Package>
<Require-Capability>${camel.osgi.require.capability}</Require-Capability>
<Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
<Implementation-Title>Apache Camel</Implementation-Title>
<Implementation-Version>3.7.1</Implementation-Version>
<Karaf-Info>Camel;${project.artifactId}=3.7.1</Karaf-Info>
<_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
<_failok>${camel.osgi.failok}</_failok>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_plugin>
org.apache.felix.bundleplugin.BlueprintPlugin,
aQute.lib.spring.SpringXMLType,
org.apache.felix.bundleplugin.JpaPlugin,
org.apache.camel.maven.bundle.CamelPlugin
</_plugin>
</instructions>
</configuration>
<executions>
<execution>
<id>versions</id>
<phase>validate</phase>
<goals>
<goal>cleanVersions</goal>
</goals>
<configuration>
<versions>
<camel.osgi.version.clean>3.7.1</camel.osgi.version.clean>
</versions>
</configuration>
</execution>
<execution>
<id>bundle-manifest</id>
<phase>prepare-package</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-format-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
<version>3.7.1</version>
<configuration>
<!-- set to true to make build fail fast if missing documentation in docs files -->
<failFast>false</failFast>
</configuration>
<executions>
<execution>
<id>generate</id>
<goals>
<goal>generate</goal>
</goals>
<phase>process-classes</phase>
</execution>
<execution>
<id>generate-postcompile</id>
<goals>
<goal>generate-postcompile</goal>
</goals>
<phase>prepare-package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -282,7 +379,7 @@
</files>
<message><![CDATA[Salesforce Migration Tool required

You need to download the Salesforce Migration Tool (ZIP file) and
You need to download the Salesforce Migration Tool (ZIP file) and
extract the `ant-salesforce.jar` out of it to:

${salesforce.component.root}/it/resources/migration-tool/ant-salesforce.jar
Expand Down Expand Up @@ -442,4 +539,15 @@ https://developer.salesforce.com/page/Force.com_Migration_Tool]]></message>
</build>
</profile>
</profiles>

<distributionManagement>
<snapshotRepository>
<id>camel</id>
<url>https://pkgs.dev.azure.com/ideaportriga/streaming-platform/_packaging/camel/maven/v1</url>
</snapshotRepository>
<repository>
<id>camel</id>
<url>https://pkgs.dev.azure.com/ideaportriga/streaming-platform/_packaging/camel/maven/v1</url>
</repository>
</distributionManagement>
</project>
30 changes: 30 additions & 0 deletions ...c/generated/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj
case "contentType": getOrCreateConfig(target).setContentType(property(camelContext, org.apache.camel.component.salesforce.api.dto.bulk.ContentType.class, value)); return true;
case "defaultreplayid":
case "defaultReplayId": getOrCreateConfig(target).setDefaultReplayId(property(camelContext, java.lang.Long.class, value)); return true;
case "etcdrepocachedepth":
case "etCdRepoCacheDepth": getOrCreateConfig(target).setEtCdRepoCacheDepth(property(camelContext, java.lang.String.class, value)); return true;
case "etcdrepopassword":
case "etcdRepoPassword": getOrCreateConfig(target).setEtcdRepoPassword(property(camelContext, java.lang.String.class, value)); return true;
case "etcdrepoplaceholdervalue":
case "etcdRepoPlaceholderValue": getOrCreateConfig(target).setEtcdRepoPlaceholderValue(property(camelContext, java.lang.String.class, value)); return true;
case "etcdrepouri":
case "etcdRepoUri": getOrCreateConfig(target).setEtcdRepoUri(property(camelContext, java.lang.String.class, value)); return true;
case "etcdrepousername":
case "etcdRepoUsername": getOrCreateConfig(target).setEtcdRepoUsername(property(camelContext, java.lang.String.class, value)); return true;
case "format": getOrCreateConfig(target).setFormat(property(camelContext, org.apache.camel.component.salesforce.internal.PayloadFormat.class, value)); return true;
case "httpclient":
case "httpClient": getOrCreateConfig(target).setHttpClient(property(camelContext, org.apache.camel.component.salesforce.SalesforceHttpClient.class, value)); return true;
Expand Down Expand Up @@ -206,6 +216,16 @@ public Class<?> getOptionType(String name, boolean ignoreCase) {
case "contentType": return org.apache.camel.component.salesforce.api.dto.bulk.ContentType.class;
case "defaultreplayid":
case "defaultReplayId": return java.lang.Long.class;
case "etcdrepocachedepth":
case "etCdRepoCacheDepth": return java.lang.String.class;
case "etcdrepopassword":
case "etcdRepoPassword": return java.lang.String.class;
case "etcdrepoplaceholdervalue":
case "etcdRepoPlaceholderValue": return java.lang.String.class;
case "etcdrepouri":
case "etcdRepoUri": return java.lang.String.class;
case "etcdrepousername":
case "etcdRepoUsername": return java.lang.String.class;
case "format": return org.apache.camel.component.salesforce.internal.PayloadFormat.class;
case "httpclient":
case "httpClient": return org.apache.camel.component.salesforce.SalesforceHttpClient.class;
Expand Down Expand Up @@ -356,6 +376,16 @@ public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
case "contentType": return getOrCreateConfig(target).getContentType();
case "defaultreplayid":
case "defaultReplayId": return getOrCreateConfig(target).getDefaultReplayId();
case "etcdrepocachedepth":
case "etCdRepoCacheDepth": return getOrCreateConfig(target).getEtCdRepoCacheDepth();
case "etcdrepopassword":
case "etcdRepoPassword": return getOrCreateConfig(target).getEtcdRepoPassword();
case "etcdrepoplaceholdervalue":
case "etcdRepoPlaceholderValue": return getOrCreateConfig(target).getEtcdRepoPlaceholderValue();
case "etcdrepouri":
case "etcdRepoUri": return getOrCreateConfig(target).getEtcdRepoUri();
case "etcdrepousername":
case "etcdRepoUsername": return getOrCreateConfig(target).getEtcdRepoUsername();
case "format": return getOrCreateConfig(target).getFormat();
case "httpclient":
case "httpClient": return getOrCreateConfig(target).getHttpClient();
Expand Down
30 changes: 30 additions & 0 deletions ...rc/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj
case "contentType": target.getConfiguration().setContentType(property(camelContext, org.apache.camel.component.salesforce.api.dto.bulk.ContentType.class, value)); return true;
case "defaultreplayid":
case "defaultReplayId": target.getConfiguration().setDefaultReplayId(property(camelContext, java.lang.Long.class, value)); return true;
case "etcdrepocachedepth":
case "etCdRepoCacheDepth": target.getConfiguration().setEtCdRepoCacheDepth(property(camelContext, java.lang.String.class, value)); return true;
case "etcdrepopassword":
case "etcdRepoPassword": target.getConfiguration().setEtcdRepoPassword(property(camelContext, java.lang.String.class, value)); return true;
case "etcdrepoplaceholdervalue":
case "etcdRepoPlaceholderValue": target.getConfiguration().setEtcdRepoPlaceholderValue(property(camelContext, java.lang.String.class, value)); return true;
case "etcdrepouri":
case "etcdRepoUri": target.getConfiguration().setEtcdRepoUri(property(camelContext, java.lang.String.class, value)); return true;
case "etcdrepousername":
case "etcdRepoUsername": target.getConfiguration().setEtcdRepoUsername(property(camelContext, java.lang.String.class, value)); return true;
case "exceptionhandler":
case "exceptionHandler": target.setExceptionHandler(property(camelContext, org.apache.camel.spi.ExceptionHandler.class, value)); return true;
case "exchangepattern":
Expand Down Expand Up @@ -135,6 +145,16 @@ public Class<?> getOptionType(String name, boolean ignoreCase) {
case "contentType": return org.apache.camel.component.salesforce.api.dto.bulk.ContentType.class;
case "defaultreplayid":
case "defaultReplayId": return java.lang.Long.class;
case "etcdrepocachedepth":
case "etCdRepoCacheDepth": return java.lang.String.class;
case "etcdrepopassword":
case "etcdRepoPassword": return java.lang.String.class;
case "etcdrepoplaceholdervalue":
case "etcdRepoPlaceholderValue": return java.lang.String.class;
case "etcdrepouri":
case "etcdRepoUri": return java.lang.String.class;
case "etcdrepousername":
case "etcdRepoUsername": return java.lang.String.class;
case "exceptionhandler":
case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
case "exchangepattern":
Expand Down Expand Up @@ -230,6 +250,16 @@ public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
case "contentType": return target.getConfiguration().getContentType();
case "defaultreplayid":
case "defaultReplayId": return target.getConfiguration().getDefaultReplayId();
case "etcdrepocachedepth":
case "etCdRepoCacheDepth": return target.getConfiguration().getEtCdRepoCacheDepth();
case "etcdrepopassword":
case "etcdRepoPassword": return target.getConfiguration().getEtcdRepoPassword();
case "etcdrepoplaceholdervalue":
case "etcdRepoPlaceholderValue": return target.getConfiguration().getEtcdRepoPlaceholderValue();
case "etcdrepouri":
case "etcdRepoUri": return target.getConfiguration().getEtcdRepoUri();
case "etcdrepousername":
case "etcdRepoUsername": return target.getConfiguration().getEtcdRepoUsername();
case "exceptionhandler":
case "exceptionHandler": return target.getExceptionHandler();
case "exchangepattern":
Expand Down
Loading