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-spring-boot.git
commit bd4de8d5e071b58687f59ad7dbf999f5ae7bc9ff Author: Claus Ibsen <[email protected]> AuthorDate: Fri May 8 10:13:47 2026 +0200 chore: upgrade okhttp3 in camel-salesforce-component (#23073) --- .../camel-salesforce-starter/pom.xml | 13 - .../salesforce/springboot/RawPayloadTest.java | 323 --------------------- 2 files changed, 336 deletions(-) diff --git a/components-starter/camel-salesforce-starter/pom.xml b/components-starter/camel-salesforce-starter/pom.xml index 2c62156c27b..ce51f28d8d2 100644 --- a/components-starter/camel-salesforce-starter/pom.xml +++ b/components-starter/camel-salesforce-starter/pom.xml @@ -39,12 +39,6 @@ <artifactId>camel-salesforce</artifactId> <version>${camel-version}</version> </dependency> - <dependency> - <groupId>com.squareup.okhttp3</groupId> - <artifactId>mockwebserver</artifactId> - <version>${squareup-okhttp-version}</version> - <scope>test</scope> - </dependency> <!-- forcing jetty-http since mockserver would include an older 12.0.x, not compatible, version --> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -58,13 +52,6 @@ <version>${jetty-version}</version> <scope>test</scope> </dependency> - <!-- forcing okhttp v3.x related to https://issues.apache.org/jira/browse/CAMEL-16336 --> - <dependency> - <groupId>com.squareup.okhttp3</groupId> - <artifactId>okhttp</artifactId> - <version>${squareup-okhttp-version}</version> - <scope>test</scope> - </dependency> <!-- force grpc-protobuf version https://issues.apache.org/jira/browse/CAMEL-23217 --> <dependency> <groupId>com.google.protobuf</groupId> diff --git a/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/RawPayloadTest.java b/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/RawPayloadTest.java deleted file mode 100644 index a0b27c55006..00000000000 --- a/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/RawPayloadTest.java +++ /dev/null @@ -1,323 +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.springboot; - -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.apache.camel.CamelContext; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.Route; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.salesforce.SalesforceComponent; -import org.apache.camel.component.salesforce.SalesforceEndpointConfig; -import org.apache.camel.component.salesforce.SalesforceLoginConfig; -import org.apache.camel.spring.boot.CamelAutoConfiguration; - -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - -import okhttp3.HttpUrl; -import okhttp3.mockwebserver.Dispatcher; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import okhttp3.mockwebserver.RecordedRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Bean; -import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.junit6.params.Parameters; -import org.apache.camel.test.spring.junit6.CamelSpringBootTest; -import org.eclipse.jetty.http.HttpHeader; - -@DirtiesContext -@CamelSpringBootTest -@SpringBootTest(classes = { CamelAutoConfiguration.class, RawPayloadTest.class, }) - -public class RawPayloadTest extends AbstractSalesforceTestBase { - - @Autowired - ProducerTemplate template; - - @Autowired - CamelContext camelContext; - - public static String format; - - public static String endpointUri; - - private static final String XML_RESPONSE = "<response/>"; - private static final String JSON_RESPONSE = "{ \"response\" : \"mock\" }"; - - private static HttpUrl loginUrl; - private static MockWebServer server; - - private static String lastFormat; - private static String expectedResponse; - private static String requestBody; - private static Map<String, Object> headers; - - private static Properties loadProperties() throws IOException { - Properties properties = new Properties(); - properties.load(RawPayloadTest.class.getClassLoader().getResourceAsStream("rawpayload.properties")); - return properties; - } - - @Override - @Bean("salesforce") - protected SalesforceComponent createComponent() throws Exception { - - // create the component - SalesforceComponent component = new SalesforceComponent(); - final SalesforceEndpointConfig config = new SalesforceEndpointConfig(); - config.setApiVersion(System.getProperty("apiVersion", salesforceApiVersionToUse())); - component.setConfig(config); - - SalesforceLoginConfig dummyLoginConfig = new SalesforceLoginConfig(); - dummyLoginConfig.setClientId("ignored"); - dummyLoginConfig.setClientSecret("ignored"); - dummyLoginConfig.setRefreshToken("ignored"); - dummyLoginConfig.setLoginUrl(loginUrl.toString()); - component.setLoginConfig(dummyLoginConfig); - - return component; - } - - @AfterAll - public static void shutDownServer() throws IOException { - // shutdown mock server - if (server != null) { - server.shutdown(); - } - } - - @BeforeAll - public static void startServer() throws IOException { - // format = _format; - // endpointUri = _endpointUri; - - // create mock server - server = new MockWebServer(); - - server.setDispatcher(new Dispatcher() { - @Override - public MockResponse dispatch(RecordedRequest recordedRequest) { - - Properties props; - try { - props = loadProperties(); - } catch (IOException ioe) { - throw new IllegalStateException(ioe); - } - if (recordedRequest.getPath().equals(props.getProperty("tokenpath"))) { - return new MockResponse().setResponseCode(200).setBody(String.format(""" - { - "access_token": "mock_token", - "instance_url": "%s", - "id": "https://login.salesforce.com/id/00D4100000xxxxxxxx/0054100000xxxxxxxx"; - } - """, loginUrl)); - } else { - return new MockResponse().setResponseCode(200) - .setHeader(HttpHeader.CONTENT_TYPE.toString(), - recordedRequest.getHeader(HttpHeader.CONTENT_TYPE.toString())) - .setBody("XML".equals(format) ? XML_RESPONSE : JSON_RESPONSE); - } - } - }); - - // start the server - server.start(); - loginUrl = server.url(""); - } - - private void setupRequestResponse(String format, String endpointUri) { - if (!format.equals(lastFormat)) { - // expected response and test request - final boolean isXml = "XML".equals(format); - expectedResponse = isXml ? XML_RESPONSE : JSON_RESPONSE; - if (isXml) { - requestBody = "<request/>"; - } else { - requestBody = "{ \"request\" : \"mock\" }"; - } - headers = new HashMap<>(); - headers.put("sObjectId", "mockId"); - headers.put("sObjectIdValue", "mockIdValue"); - headers.put("id", "mockId"); - headers.put(SalesforceEndpointConfig.APEX_QUERY_PARAM_PREFIX + "id", "mockId"); - - lastFormat = format; - } - } - - private void stopRoutes() throws Exception { - List<Route> routes = camelContext.getRoutes(); - for (Route route : routes) { - camelContext.getRouteController().stopRoute(route.getId()); - } - } - - @ParameterizedTest - @MethodSource("parameters") - - public void testRestApi(String format, String endpointUri) throws Exception { - RawPayloadTest.format = format; - RawPayloadTest.endpointUri = endpointUri; - setupRequestResponse(format, endpointUri); - stopRoutes(); - camelContext.addRoutes(new TestConfiguration(format, endpointUri).routeBuilder()); - final String responseBody = template.requestBodyAndHeaders(endpointUri, requestBody, headers, String.class); - assertNotNull(responseBody, "Null response for endpoint " + endpointUri); - assertEquals(expectedResponse, responseBody, "Unexpected response for endpoint " + endpointUri); - } - - // ************************************* - // Config - // ************************************* - - public class TestConfiguration { - String format; - String endpointUri; - - public TestConfiguration(String format, String endpointUri) { - this.format = format; - this.endpointUri = endpointUri; - } - - @Bean - public RouteBuilder routeBuilder() { - return new RouteBuilder() { - @Override - public void configure() { - - // testGetVersion - from("direct:getVersions").to("salesforce:getVersions?rawPayload=true&format=" + format); - - // testGetResources - from("direct:getResources").to("salesforce:getResources?rawPayload=true&format=" + format); - - // testGetGlobalObjects - from("direct:getGlobalObjects").to("salesforce:getGlobalObjects?rawPayload=true&format=" + format); - - // testGetBasicInfo - from("direct:getBasicInfo") - .to("salesforce:getBasicInfo?sObjectName=Merchandise__c&rawPayload=true&format=" + format); - - // testGetDescription - from("direct:getDescription").to( - "salesforce:getDescription?sObjectName=Merchandise__c&rawPayload=true&format=" + format); - - // testGetSObject - from("direct:getSObject").to( - "salesforce:getSObject?sObjectName=Merchandise__c&sObjectFields=Description__c,Price__c&rawPayload=true&format=" - + format); - - // testCreateSObject - from("direct:createSObject") - .to("salesforce:createSObject?sObjectName=Merchandise__c&rawPayload=true&format=" + format); - - // testUpdateSObject - from("direct:updateSObject") - .to("salesforce:updateSObject?sObjectName=Merchandise__c&rawPayload=true&format=" + format); - - // testDeleteSObject - from("direct:deleteSObject") - .to("salesforce:deleteSObject?sObjectName=Merchandise__c&rawPayload=true&format=" + format); - - // testGetSObjectWithId - from("direct:getSObjectWithId").to( - "salesforce:getSObjectWithId?sObjectName=Line_Item__c&sObjectIdName=Name&rawPayload=true&format=" - + format); - - // testUpsertSObject - from("direct:upsertSObject").to( - "salesforce:upsertSObject?sObjectName=Line_Item__c&sObjectIdName=Name&rawPayload=true&format=" - + format); - - // testDeleteSObjectWithId - from("direct:deleteSObjectWithId").to( - "salesforce:deleteSObjectWithId?sObjectName=Line_Item__c&sObjectIdName=Name&rawPayload=true&format=" - + format); - - // testGetBlobField - from("direct:getBlobField").to( - "salesforce:getBlobField?sObjectName=Document&sObjectBlobFieldName=Body&rawPayload=true&format=" - + format); - - // testQuery - from("direct:query") - .to("salesforce:query?sObjectQuery=SELECT name from Line_Item__c&rawPayload=true&format=" - + format); - - // testQueryAll - from("direct:queryAll") - .to("salesforce:queryAll?sObjectQuery=SELECT name from Line_Item__c&rawPayload=true&format=" - + format); - - // testSearch - from("direct:search") - .to("salesforce:search?sObjectSearch=FIND {Wee}&rawPayload=true&format=" + format); - - // testApexCall - from("direct:apexCallGet").to( - "salesforce:apexCall?apexMethod=GET&apexUrl=Merchandise/{id}&sObjectName=Merchandise__c&rawPayload=true&format=" - + format); - - from("direct:apexCallGetWithId") - .to("salesforce:apexCall/Merchandise/?apexMethod=GET&id=dummyId&rawPayload=true&format=" - + format); - - from("direct:apexCallPatch").to( - "salesforce:apexCall/Merchandise/?rawPayload=true&format=" + format + "&apexMethod=PATCH"); - - // testComposite (only JSON format is supported) - if (format.equalsIgnoreCase("json")) { - from("direct:composite").to("salesforce:composite?rawPayload=true&format=" + format - + "&sObjectName=foo&sObjectIdName=bar&compositeMethod=PATCH"); - } - } - }; - } - } - - @Parameters(name = "format = {0}, endpoint = {1}") - public static List<String[]> parameters() { - final String[] endpoints = { "direct:getVersions", "direct:getResources", "direct:getGlobalObjects", - "direct:getBasicInfo", "direct:getDescription", "direct:getSObject", "direct:createSObject", - "direct:updateSObject", "direct:deleteSObject", "direct:getSObjectWithId", "direct:upsertSObject", - "direct:deleteSObjectWithId", "direct:getBlobField", "direct:query", "direct:queryAll", "direct:search", - "direct:apexCallGet", "direct:apexCallGetWithId", "direct:apexCallPatch", "direct:composite" }; - - final String[] formats = { "XML", "JSON" }; - - return Stream.of(formats).flatMap(f -> Stream.of(endpoints).map(e -> new String[] { f, e })) - .filter(strings -> !(strings[0].equals("XML") && strings[1].equals("direct:composite"))) - .collect(Collectors.toList()); - } -}
