This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new e884743e501 CAMEL-18317: camel-salesforce: Add `subscribe` operation. e884743e501 is described below commit e884743e501587fbdc2b02e98cad05bc6367807f Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Aug 8 17:30:53 2022 +0200 CAMEL-18317: camel-salesforce: Add `subscribe` operation. This allows endpoint syntax to have a mandatory operationName. --- .../component/salesforce/SalesforceComponentVerifierExtension.java | 6 +++--- .../salesforce/SalesforceComponentVerifierExtensionTest.java | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtension.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtension.java index 017332444fc..fe872230a2a 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtension.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtension.java @@ -54,11 +54,11 @@ public class SalesforceComponentVerifierExtension extends DefaultComponentVerifi ResultBuilder builder = ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.PARAMETERS) .errors(ResultErrorHelper .requiresAny(parameters, - OptionsGroup.withName(AuthenticationType.USERNAME_PASSWORD).options("clientId", "clientSecret", + OptionsGroup.withName(AuthenticationType.USERNAME_PASSWORD).options("operationName", "clientId", "clientSecret", "userName", "password", "!refreshToken", "!keystore"), - OptionsGroup.withName(AuthenticationType.REFRESH_TOKEN).options("clientId", "clientSecret", + OptionsGroup.withName(AuthenticationType.REFRESH_TOKEN).options("operationName", "clientId", "clientSecret", "refreshToken", "!password", "!keystore"), - OptionsGroup.withName(AuthenticationType.JWT).options("clientId", "userName", "keystore", + OptionsGroup.withName(AuthenticationType.JWT).options("operationName", "clientId", "userName", "keystore", "!password", "!refreshToken"))); // Validate using the catalog diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtensionTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtensionTest.java index 1d6182e1eaa..a9a8e71e336 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtensionTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtensionTest.java @@ -48,6 +48,7 @@ public class SalesforceComponentVerifierExtensionTest extends CamelTestSupport { @Test public void testUsernamePasswordParameters() { HashMap<String, Object> parameters = new HashMap<>(); + parameters.put("operationName", "subscribe"); parameters.put("clientId", "clientId"); parameters.put("clientSecret", "clientSecret"); parameters.put("userName", "userName"); @@ -62,6 +63,7 @@ public class SalesforceComponentVerifierExtensionTest extends CamelTestSupport { @Test public void testRefreshTokenParameters() { Map<String, Object> parameters = new HashMap<>(); + parameters.put("operationName", "subscribe"); parameters.put("clientId", "clientId"); parameters.put("clientSecret", "clientSecret"); parameters.put("refreshToken", "refreshToken"); @@ -75,6 +77,7 @@ public class SalesforceComponentVerifierExtensionTest extends CamelTestSupport { @Test public void testWrongParameters() { HashMap<String, Object> parameters = new HashMap<>(); + parameters.put("operationName", "subscribe"); parameters.put("clientId", "clientId"); parameters.put("clientSecret", "clientSecret"); parameters.put("password", "password");