[camel] branch master updated (5fd48e3 -> fbec9bc)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (5fd48e3 -> fbec9bc)

zregvart
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 5fd48e3  Upgrade Revapi Java to version 0.18.1
     new d97fa92  Remove unused import, cleanup
     new fbec9bc  Remove duplicate documentation paragraph

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/docs/salesforce-component.adoc        | 45 ----------------------
 .../apache/camel/swagger/RestSwaggerReader.java    |  1 -
 .../apache/camel/swagger/RestSwaggerSupport.java   |  2 +-
 3 files changed, 1 insertion(+), 47 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[camel] 01/02: Remove unused import, cleanup

zregvart
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit d97fa92bfe89f49fe46869ad162ef7cd227e48f2
Author: Zoran Regvart <[hidden email]>
AuthorDate: Sun Oct 7 17:20:38 2018 +0200

    Remove unused import, cleanup
---
 .../src/main/java/org/apache/camel/swagger/RestSwaggerReader.java       | 1 -
 .../src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index c0631b4..0177862 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -40,7 +40,6 @@ import io.swagger.models.Operation;
 import io.swagger.models.Path;
 import io.swagger.models.RefModel;
 import io.swagger.models.Response;
-import io.swagger.models.SecurityRequirement;
 import io.swagger.models.Swagger;
 import io.swagger.models.Tag;
 import io.swagger.models.auth.ApiKeyAuthDefinition;
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
index 33cd20a..d39f501 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
@@ -373,7 +373,7 @@ public class RestSwaggerSupport {
         }
 
         String proto = (String) headers.get(HEADER_X_FORWARDED_PROTO);
-        if(ObjectHelper.isNotEmpty(proto)) {
+        if (ObjectHelper.isNotEmpty(proto)) {
             String[] schemes = proto.split(",");
             for(String scheme : schemes) {
                 String trimmedScheme = scheme.trim();

Reply | Threaded
Open this post in threaded view
|

[camel] 02/02: Remove duplicate documentation paragraph

zregvart
In reply to this post by zregvart
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit fbec9bccd47fc754d9f06e125bd631f37505edf9
Author: Zoran Regvart <[hidden email]>
AuthorDate: Sun Oct 7 17:21:01 2018 +0200

    Remove duplicate documentation paragraph
---
 .../src/main/docs/salesforce-component.adoc        | 45 ----------------------
 1 file changed, 45 deletions(-)

diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index 061643b..d929b17 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -407,51 +407,6 @@ from("direct:fetchRecentItems")
             .log("${body.name} at ${body.attributes.url}");
 ----
 
-=== Working with approvals
-
-All the properties are named exactly the same as in the Salesforce REST API prefixed with `approval.`. You can set
-approval properties by setting `approval.PropertyName` of the Endpoint these will be used as template -- meaning
-that any property not present in either body or header will be taken from the Endpoint configuration. Or you can set
-the approval template on the Endpoint by assigning `approval` property to a reference onto a bean in the Registry.
-
-You can also provide header values using the same `approval.PropertyName` in the incoming message headers.
-
-And finally body can contain one `AprovalRequest` or an `Iterable` of `ApprovalRequest` objects to process as
-a batch.
-
-The important thing to remember is the priority of the values specified in these three mechanisms:
-
-. value in body takes precedence before any other
-. value in message header takes precedence before template value
-. value in template is set if no other value in header or body was given
-
-For example to send one record for approval using values in headers use:
-
-Given a route:
-
-[source,java]
-----
-from("direct:example1")//
-        .setHeader("approval.ContextId", simple("${body['contextId']}"))
-        .setHeader("approval.NextApproverIds", simple("${body['nextApproverIds']}"))
-        .to("salesforce:approval?"//
-            + "approvalActionType=Submit"//
-            + "&approvalComments=this is a test"//
-            + "&approvalProcessDefinitionNameOrId=Test_Account_Process"//
-            + "&approvalSkipEntryCriteria=true");
-----
-
-You could send a record for approval using:
-
-[source,java]
-----
-final Map<String, String> body = new HashMap<>();
-body.put("contextId", accountIds.iterator().next());
-body.put("nextApproverIds", userId);
-
-final ApprovalResult result = template.requestBody("direct:example1", body, ApprovalResult.class);
-----
-
 === Using Salesforce Composite API to submit SObject tree
 
 To create up to 200 records including parent-child relationships use `salesforce:composite-tree` operation. This