This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch camel-spring-boot-3.21.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit b6a9c014a49d742851a0e51915b6ba84a8e7de0e Author: Freeman Fang <freeman.f...@gmail.com> AuthorDate: Fri Oct 20 10:54:06 2023 -0400 fix broken camel-cxf test (cherry picked from commit 5f62899a4f4e947cc5adb81ed56dcbc2851a0c5d) --- .../apache/camel/component/cxf/soap/springboot/CxfBeanScopeTest.java | 4 ++-- .../component/cxf/soap/springboot/CxfMessageHeaderTimeoutTest.java | 4 ++-- .../apache/camel/component/cxf/soap/springboot/CxfTimeoutTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfBeanScopeTest.java b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfBeanScopeTest.java index 6e6b0bd4183..4a3fedf5488 100644 --- a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfBeanScopeTest.java +++ b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfBeanScopeTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.cxf.soap.springboot; -import java.net.SocketTimeoutException; +import java.net.http.HttpTimeoutException; import java.util.ArrayList; import java.util.List; @@ -131,7 +131,7 @@ public class CxfBeanScopeTest { Exchange reply = sendJaxWsMessage(endpointUri); Exception e = reply.getException(); assertNotNull(e, "We should get the exception cause here"); - assertTrue(e instanceof SocketTimeoutException, "We should get the socket time out exception here"); + assertTrue(e instanceof HttpTimeoutException, "We should get the time out exception here"); } @Autowired diff --git a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfMessageHeaderTimeoutTest.java b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfMessageHeaderTimeoutTest.java index 27dded0c7ae..3cbc16ff563 100644 --- a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfMessageHeaderTimeoutTest.java +++ b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfMessageHeaderTimeoutTest.java @@ -19,7 +19,7 @@ package org.apache.camel.component.cxf.soap.springboot; -import java.net.SocketTimeoutException; +import java.net.http.HttpTimeoutException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -108,7 +108,7 @@ public class CxfMessageHeaderTimeoutTest { Exchange reply = sendJaxWsMessage(endpointUri); Exception e = reply.getException(); assertNotNull(e, "We should get the exception cause here"); - assertTrue(e instanceof SocketTimeoutException, "We should get the socket time out exception here"); + assertTrue(e instanceof HttpTimeoutException, "We should get the time out exception here"); } protected Exchange sendJaxWsMessage(String endpointUri) throws InterruptedException { diff --git a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfTimeoutTest.java b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfTimeoutTest.java index 80663f9ac65..9d8641cc266 100644 --- a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfTimeoutTest.java +++ b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfTimeoutTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.cxf.soap.springboot; -import java.net.SocketTimeoutException; +import java.net.http.HttpTimeoutException; import java.util.ArrayList; import java.util.List; @@ -124,7 +124,7 @@ public class CxfTimeoutTest { Exchange reply = sendJaxWsMessage(endpointUri); Exception e = reply.getException(); assertNotNull(e, "We should get the exception cause here"); - assertTrue(e instanceof SocketTimeoutException, "We should get the socket time out exception here"); + assertTrue(e instanceof HttpTimeoutException, "We should get the time out exception here"); } @Autowired