You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2026/01/27 09:55:36 UTC
(camel) 50/50: (chores): ensure usage of text blocks camel-salesforce
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 42b655de35327896ae0733ae12b36834ea201425
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 26 20:34:44 2026 +0000
(chores): ensure usage of text blocks camel-salesforce
---
.../salesforce/api/dto/PlatformEventTest.java | 13 ++---
.../salesforce/api/dto/RecentItemTest.java | 20 ++++----
.../salesforce/api/dto/approval/ApprovalsTest.java | 23 ++++-----
.../dto/composite/SObjectBatchResponseTest.java | 37 +++++++-------
.../api/dto/composite/SObjectTreeResponseTest.java | 56 +++++++++++-----------
.../salesforce/internal/LoginTokenTest.java | 21 ++++----
.../salesforce/internal/SalesforceSessionTest.java | 18 +++----
7 files changed, 98 insertions(+), 90 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/PlatformEventTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/PlatformEventTest.java
index fe8778d1915d..e08af1b29c2a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/PlatformEventTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/PlatformEventTest.java
@@ -32,12 +32,13 @@ public class PlatformEventTest {
public void shouldDeserialize() throws IOException {
final ObjectMapper mapper = JsonUtils.createObjectMapper();
- final PlatformEvent platformEvent = mapper.readValue("{\n" + //
- " \"CreatedDate\": \"2017-04-14T13:35:23Z\", \n" + //
- " \"CreatedById\": \"005B00000031mqb\", \n" + //
- " \"Order_Number__c\": \"10013\", \n" + //
- " \"Type__c\": \"Placed\"\n" + //
- "}",
+ final PlatformEvent platformEvent = mapper.readValue("""
+ {
+ "CreatedDate": "2017-04-14T13:35:23Z",\s
+ "CreatedById": "005B00000031mqb",\s
+ "Order_Number__c": "10013",\s
+ "Type__c": "Placed"
+ }""",
PlatformEvent.class);
assertThat(platformEvent.getCreated()).isEqualTo(ZonedDateTime.parse("2017-04-14T13:35:23Z"));
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/RecentItemTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/RecentItemTest.java
index 843a9c889698..7e06a6d37657 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/RecentItemTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/RecentItemTest.java
@@ -33,16 +33,16 @@ public class RecentItemTest {
public void shouldDeserializeFromJSON() throws IOException {
final ObjectMapper mapper = JsonUtils.createObjectMapper();
- final Object read = mapper.readerFor(RecentItem.class).readValue("{ \n" + //
- " \"attributes\" : \n" + //
- " { \n" + //
- " \"type\" : \"Account\", \n" + //
- " \"url\" : \"/services/data/v28.0/sobjects/Account/a06U000000CelH0IAJ\" \n"
- + //
- " }, \n" + //
- " \"Id\" : \"a06U000000CelH0IAJ\", \n" + //
- " \"Name\" : \"Acme\" \n" + //
- "}");
+ final Object read = mapper.readerFor(RecentItem.class).readValue("""
+ {\s
+ "attributes" :\s
+ {\s
+ "type" : "Account",\s
+ "url" : "/services/data/v28.0/sobjects/Account/a06U000000CelH0IAJ"\s
+ },\s
+ "Id" : "a06U000000CelH0IAJ",\s
+ "Name" : "Acme"\s
+ }""");
assertThat("RecentItem should deserialize from JSON", read, instanceOf(RecentItem.class));
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalsTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalsTest.java
index 16b7761887da..ffeb72c9c02e 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalsTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalsTest.java
@@ -38,17 +38,18 @@ public class ApprovalsTest {
public void shouldDeserialize() throws JsonProcessingException, IOException {
final ObjectMapper mapper = JsonUtils.createObjectMapper();
- final Object read = mapper.readerFor(Approvals.class).readValue("{\n" + //
- " \"approvals\" : {\n" + //
- " \"Account\" : [ {\n" + //
- " \"description\" : null,\n" + //
- " \"id\" : \"04aD00000008Py9\",\n" + //
- " \"name\" : \"Account Approval Process\",\n" + //
- " \"object\" : \"Account\",\n" + //
- " \"sortOrder\" : 1\n" + //
- " } ]\n" + //
- " }\n" + //
- "}");
+ final Object read = mapper.readerFor(Approvals.class).readValue("""
+ {
+ "approvals" : {
+ "Account" : [ {
+ "description" : null,
+ "id" : "04aD00000008Py9",
+ "name" : "Account Approval Process",
+ "object" : "Account",
+ "sortOrder" : 1
+ } ]
+ }
+ }""");
assertThat("Should deserialize Approvals", read, instanceOf(Approvals.class));
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchResponseTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchResponseTest.java
index ba62c3f423a2..276e836b9800 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchResponseTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchResponseTest.java
@@ -34,24 +34,25 @@ public class SObjectBatchResponseTest {
@Test
public void shouldDeserializeFromJson() throws IOException {
- final String json = "{\n"//
- + " \"hasErrors\" : false,\n"//
- + " \"results\" : [{\n"//
- + " \"statusCode\" : 204,\n"//
- + " \"result\" : null\n"//
- + " },{\n"//
- + " \"statusCode\" : 200,\n"//
- + " \"result\": {\n"//
- + " \"attributes\" : {\n"//
- + " \"type\" : \"Account\",\n"//
- + " \"url\" : \"/services/data/v34.0/sobjects/Account/001D000000K0fXOIAZ\"\n"//
- + " },\n"//
- + " \"Name\" : \"NewName\",\n"//
- + " \"BillingPostalCode\" : \"94105\",\n"//
- + " \"Id\" : \"001D000000K0fXOIAZ\"\n"//
- + " }\n"//
- + " }]\n"//
- + "}";
+ final String json = """
+ {
+ "hasErrors" : false,
+ "results" : [{
+ "statusCode" : 204,
+ "result" : null
+ },{
+ "statusCode" : 200,
+ "result": {
+ "attributes" : {
+ "type" : "Account",
+ "url" : "/services/data/v34.0/sobjects/Account/001D000000K0fXOIAZ"
+ },
+ "Name" : "NewName",
+ "BillingPostalCode" : "94105",
+ "Id" : "001D000000K0fXOIAZ"
+ }
+ }]
+ }""";
final ObjectMapper mapper = JsonUtils.createObjectMapper();
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTreeResponseTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTreeResponseTest.java
index 59902ee7521a..abea2199f493 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTreeResponseTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTreeResponseTest.java
@@ -36,22 +36,23 @@ public class SObjectTreeResponseTest {
@Test
public void shouldDeserializeJsonFromSalesforceExample() throws Exception {
- final String json = "{\n"//
- + " \"hasErrors\" : false,\n"//
- + " \"results\" : [{\n"//
- + " \"referenceId\" : \"ref1\",\n"//
- + " \"id\" : \"001D000000K0fXOIAZ\"\n"//
- + " },{\n"//
- + " \"referenceId\" : \"ref4\",\n"//
- + " \"id\" : \"001D000000K0fXPIAZ\"\n"//
- + " },{\n"//
- + " \"referenceId\" : \"ref2\",\n"//
- + " \"id\" : \"003D000000QV9n2IAD\"\n"//
- + " },{\n"//
- + " \"referenceId\" : \"ref3\",\n"//
- + " \"id\" : \"003D000000QV9n3IAD\"\n"//
- + " }]\n"//
- + "}";
+ final String json = """
+ {
+ "hasErrors" : false,
+ "results" : [{
+ "referenceId" : "ref1",
+ "id" : "001D000000K0fXOIAZ"
+ },{
+ "referenceId" : "ref4",
+ "id" : "001D000000K0fXPIAZ"
+ },{
+ "referenceId" : "ref2",
+ "id" : "003D000000QV9n2IAD"
+ },{
+ "referenceId" : "ref3",
+ "id" : "003D000000QV9n3IAD"
+ }]
+ }""";
final ObjectMapper mapper = JsonUtils.createObjectMapper();
@@ -72,17 +73,18 @@ public class SObjectTreeResponseTest {
@Test
public void shouldDeserializeJsonFromSalesforceFailureExample() throws Exception {
- final String json = "{\n"//
- + " \"hasErrors\" : true,\n"//
- + " \"results\" : [{\n"//
- + " \"referenceId\" : \"ref2\",\n"//
- + " \"errors\" : [{\n"//
- + " \"statusCode\" : \"INVALID_EMAIL_ADDRESS\",\n"//
- + " \"message\" : \"Email: invalid email address: 123\",\n"//
- + " \"fields\" : [ \"Email\" ]\n"//
- + " }]\n"//
- + " }]\n"//
- + "}";
+ final String json = """
+ {
+ "hasErrors" : true,
+ "results" : [{
+ "referenceId" : "ref2",
+ "errors" : [{
+ "statusCode" : "INVALID_EMAIL_ADDRESS",
+ "message" : "Email: invalid email address: 123",
+ "fields" : [ "Email" ]
+ }]
+ }]
+ }""";
final ObjectMapper mapper = JsonUtils.createObjectMapper();
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java
index 9c09c158d1f0..a4d2111a689e 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java
@@ -30,15 +30,18 @@ public class LoginTokenTest {
@Test
public void testLoginTokenWithUnknownFields() throws Exception {
- String salesforceOAuthResponse = "{\n"
- + " \"access_token\": \"00XXXXXXXXXXXX!ARMAQKg_lg_hGaRElvizVFBQHoCpvX8tzwGnROQ0_MDPXSceMeZHtm3JHkPmMhlgK0Km3rpJkwxwHInd_8o022KsDy.p4O.X\",\n"
- + " \"is_readonly\": \"false\",\n"
- + " \"signature\": \"XXXXXXXXXX+MYU+JrOXPSbpHa2ihMpSvUqow1iTPh7Q=\",\n"
- + " \"instance_url\": \"https://xxxxxxxx--xxxxxxx.cs5.my.salesforce.com\",\n"
- + " \"id\": \"https://test.salesforce.com/id/00DO00000054tO8MAI/005O0000001cmmdIAA\",\n"
- + " \"token_type\": \"Bearer\",\n"
- + " \"issued_at\": \"1442798068621\",\n"
- + " \"an_unrecognised_field\": \"foo\"\n" + "}";
+ String salesforceOAuthResponse
+ = """
+ {
+ "access_token": "00XXXXXXXXXXXX!ARMAQKg_lg_hGaRElvizVFBQHoCpvX8tzwGnROQ0_MDPXSceMeZHtm3JHkPmMhlgK0Km3rpJkwxwHInd_8o022KsDy.p4O.X",
+ "is_readonly": "false",
+ "signature": "XXXXXXXXXX+MYU+JrOXPSbpHa2ihMpSvUqow1iTPh7Q=",
+ "instance_url": "https://xxxxxxxx--xxxxxxx.cs5.my.salesforce.com",
+ "id": "https://test.salesforce.com/id/00DO00000054tO8MAI/005O0000001cmmdIAA",
+ "token_type": "Bearer",
+ "issued_at": "1442798068621",
+ "an_unrecognised_field": "foo"
+ }""";
ObjectMapper mapper = JsonUtils.createObjectMapper();
Exception e = null;
LoginToken token = null;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SalesforceSessionTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SalesforceSessionTest.java
index c4494932d434..7fdef9adb59c 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SalesforceSessionTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SalesforceSessionTest.java
@@ -100,15 +100,15 @@ public class SalesforceSessionTest {
when(request.send()).thenReturn(response);
when(response.getStatus()).thenReturn(HttpStatus.OK_200);
- when(response.getContentAsString()).thenReturn("{\n" +
- " \"access_token\": \"00D4100000xxxxx!faketoken\",\n" +
- " \"instance_url\": \"https://eu11.salesforce.com\",\n" +
- " \"id\": \"https://login.salesforce.com/id/00D4100000xxxxxxxx/0054100000xxxxxxxx\",\n"
- +
- " \"token_type\": \"Bearer\",\n" +
- " \"issued_at\": \"1674496911543\",\n" +
- " \"signature\": \"/ai5/F+LXEocLQZKdO4uwLblDszPUibL/Dfcn82R9VI=\"\n" +
- "}");
+ when(response.getContentAsString()).thenReturn("""
+ {
+ "access_token": "00D4100000xxxxx!faketoken",
+ "instance_url": "https://eu11.salesforce.com",
+ "id": "https://login.salesforce.com/id/00D4100000xxxxxxxx/0054100000xxxxxxxx",
+ "token_type": "Bearer",
+ "issued_at": "1674496911543",
+ "signature": "/ai5/F+LXEocLQZKdO4uwLblDszPUibL/Dfcn82R9VI="
+ }""");
session.login(null);
return session;