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 086e4dea2aa6f506118b8fa82eb5ace313660328
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Fri Jun 7 11:52:39 2024 +0200
CAMEL-20838: avoid usages of restricted methods (camel-http)
- do not use overrides when JUnit's annotations suffice
- use appropriate methods for setting up/cleaning up resources
---
.../http/CamelComponentVerifierExtensionTest.java | 15 +-
.../component/http/CamelComponentVerifierTest.java | 8 +-
.../camel/component/http/FollowRedirectTest.java | 4 +-
.../component/http/HttpAuthenticationTest.java | 6 +-
.../apache/camel/component/http/HttpBodyTest.java | 6 +-
.../http/HttpBodyWithOtherProtocolNameTest.java | 5 +-
.../component/http/HttpBridgeEndpointTest.java | 6 +-
.../camel/component/http/HttpCamelHeadersTest.java | 6 +-
.../camel/component/http/HttpCharsetTest.java | 6 +-
.../camel/component/http/HttpCompressionTest.java | 6 +-
.../camel/component/http/HttpConcurrentTest.java | 6 +-
.../component/http/HttpDefaultPortNumberTest.java | 6 +-
.../component/http/HttpDisableStreamCacheTest.java | 6 +-
.../camel/component/http/HttpMethodsTest.java | 6 +-
.../component/http/HttpNoCamelHeaderTest.java | 6 +-
.../http/HttpNoConnectionRedeliveryTest.java | 6 +-
.../camel/component/http/HttpNoConnectionTest.java | 6 +-
.../http/HttpOAuth2AuthenticationTest.java | 4 +-
.../apache/camel/component/http/HttpPathTest.java | 6 +-
.../component/http/HttpPollingConsumerTest.java | 6 +-
.../http/HttpProducerBridgeEndpointTest.java | 270 ++++++++++-----------
.../http/HttpProducerConnectionCloseTest.java | 6 +-
.../http/HttpProducerContentLengthTest.java | 6 +-
.../http/HttpProducerContentTypeTest.java | 6 +-
.../HttpProducerContentTypeWithCharsetTest.java | 6 +-
.../HttpProducerContentTypeWithSemiColonTest.java | 6 +-
.../http/HttpProducerCustomHeaderTest.java | 6 +-
.../HttpProducerExplicitConnectionCloseTest.java | 6 +-
.../component/http/HttpProducerLoadManualIT.java | 6 +-
.../component/http/HttpProducerNullBodyTest.java | 6 +-
.../component/http/HttpProducerRestartTest.java | 6 +-
.../http/HttpProducerSelectMethodTest.java | 6 +-
.../HttpProducerTwoHeadersWithSameKeyTest.java | 6 +-
.../HttpProducerTwoParametersWithSameKeyTest.java | 6 +-
.../component/http/HttpProducerUserAgentTest.java | 9 +-
.../component/http/HttpProxyAndBasicAuthTest.java | 6 +-
.../camel/component/http/HttpProxyServerTest.java | 6 +-
.../component/http/HttpQueryParameterTest.java | 6 +-
.../apache/camel/component/http/HttpQueryTest.java | 6 +-
.../camel/component/http/HttpRedirectTest.java | 6 +-
.../component/http/HttpReferenceParameterTest.java | 8 +-
.../camel/component/http/HttpSOTimeoutTest.java | 7 +-
.../http/HttpSendDynamicAwareBasicAuthTest.java | 6 +-
.../http/HttpSendDynamicAwareEmptyPathTest.java | 6 +-
.../http/HttpSendDynamicAwareHeadersTest.java | 6 +-
.../http/HttpSendDynamicAwareMultiValueTest.java | 7 +-
.../http/HttpSendDynamicAwarePathHeaderTest.java | 6 +-
.../http/HttpSendDynamicAwareRawParameterTest.java | 6 +-
.../http/HttpSendDynamicAwareRawTest.java | 6 +-
.../component/http/HttpSendDynamicAwareTest.java | 6 +-
.../HttpSendDynamicAwareUriWithSpacesTest.java | 6 +-
.../HttpSendDynamicAwareUriWithoutSlashTest.java | 6 +-
.../camel/component/http/HttpSetHeaderIdsTest.java | 7 +-
.../component/http/HttpSquareBracketTest.java | 6 +-
.../http/HttpThrowExceptionOnFailureTest.java | 7 +-
.../camel/component/http/HttpToDSOTimeoutTest.java | 6 +-
.../component/http/HttpWithHttpUriHeaderTest.java | 7 +-
.../component/http/HttpsAuthenticationTest.java | 4 +-
.../apache/camel/component/http/HttpsGetTest.java | 2 +-
.../HttpsProducerWithSystemPropertiesTest.java | 6 +-
.../component/http/HttpsServerTestSupport.java | 7 +-
.../http/HttpsSslContextParametersGetTest.java | 5 +-
...psTwoComponentsSslContextParametersGetTest.java | 5 +-
...tpsTwoDifferentSslContextParametersGetTest.java | 5 +-
.../http/ManagedHttpProducerPoolStatsTest.java | 7 +-
.../http/rest/RestCamelComponentVerifierTest.java | 14 +-
66 files changed, 284 insertions(+), 393 deletions(-)
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierExtensionTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierExtensionTest.java
index 618f0356bdf..10c7ce113a6 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierExtensionTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierExtensionTest.java
@@ -48,9 +48,8 @@ public class CamelComponentVerifierExtensionTest extends
BaseHttpTest {
private HttpServer localServer;
private ComponentVerifierExtension verifier;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer = ServerBootstrap.bootstrap()
.setHttpProcessor(getHttpProcessor())
.register("/basic", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent()))
@@ -62,19 +61,21 @@ public class CamelComponentVerifierExtensionTest extends
BaseHttpTest {
.create();
localServer.start();
-
- Component component = context().getComponent("http");
- verifier =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
}
@Override
- public void doPostTearDown() throws Exception {
-
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
}
}
+ @BeforeEach
+ void setupVerifier() {
+ Component component = context().getComponent("http");
+ verifier =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
+ }
+
@Override
public boolean isUseRouteBuilder() {
return false;
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
index 38903ec120d..7c241e5df1e 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
@@ -47,9 +47,8 @@ public class CamelComponentVerifierTest extends BaseHttpTest {
private HttpServer localServer;
private ComponentVerifierExtension verifier;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer = ServerBootstrap.bootstrap()
.setHttpProcessor(getHttpProcessor())
.register("/basic", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent()))
@@ -61,13 +60,16 @@ public class CamelComponentVerifierTest extends
BaseHttpTest {
.create();
localServer.start();
+ }
+ @BeforeEach
+ void setupVerifier() {
HttpComponent component = context().getComponent("http",
HttpComponent.class);
verifier = component.getVerifier();
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/FollowRedirectTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/FollowRedirectTest.java
index d214940bc04..46ddc878cfc 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/FollowRedirectTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/FollowRedirectTest.java
@@ -21,7 +21,6 @@ import
org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -30,9 +29,8 @@ public class FollowRedirectTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpAuthenticationTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpAuthenticationTest.java
index fd0171a195b..ebd5c46e7aa 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpAuthenticationTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpAuthenticationTest.java
@@ -33,7 +33,6 @@ import
org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.protocol.ResponseContent;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -49,9 +48,8 @@ public class HttpAuthenticationTest extends BaseHttpTest {
private final String user = "camel";
private final String password = "password";
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -62,7 +60,7 @@ public class HttpAuthenticationTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyTest.java
index a3c0447508e..e274d5fe14c 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyTest.java
@@ -26,7 +26,6 @@ import
org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.camel.component.http.handler.HeaderValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static
com.github.dockerjava.zerodep.shaded.org.apache.hc.core5.http.ContentType.IMAGE_JPEG;
@@ -40,9 +39,8 @@ public class HttpBodyTest extends BaseHttpTest {
private HttpServer localServer;
private String endpointUrl;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
Map<String, String> expectedHeaders = new HashMap<>();
expectedHeaders.put(CONTENT_TYPE, IMAGE_JPEG.getMimeType());
@@ -59,7 +57,7 @@ public class HttpBodyTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyWithOtherProtocolNameTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyWithOtherProtocolNameTest.java
index 9ed7145826e..5b1eba7b15a 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyWithOtherProtocolNameTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyWithOtherProtocolNameTest.java
@@ -17,11 +17,12 @@
package org.apache.camel.component.http;
import org.apache.camel.CamelContext;
+import org.junit.jupiter.api.BeforeEach;
public class HttpBodyWithOtherProtocolNameTest extends HttpBodyTest {
- @Override
- public void doPreSetup() throws Exception {
+ @BeforeEach
+ public void setupProtocol() {
setProtocolString("newHttp://");
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
index 890ddb19008..78bde17193b 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
@@ -21,7 +21,6 @@ import
org.apache.camel.component.http.handler.BasicRawQueryValidationHandler;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.Exchange.HTTP_QUERY;
@@ -35,9 +34,8 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
private HttpServer localServer;
private String url;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -50,7 +48,7 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersTest.java
index 550424973e2..ab87a4662fc 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersTest.java
@@ -29,7 +29,6 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -40,9 +39,8 @@ public class HttpCamelHeadersTest extends BaseHttpTest {
protected HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
Map<String, String> expectedHeaders = new HashMap<>();
expectedHeaders.put("TestHeader", "test");
expectedHeaders.put(ACCEPT_LANGUAGE, "pl");
@@ -58,7 +56,7 @@ public class HttpCamelHeadersTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCharsetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCharsetTest.java
index 353d4c17ce9..85304f14a62 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCharsetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCharsetTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.POST;
@@ -34,9 +33,8 @@ public class HttpCharsetTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -45,7 +43,7 @@ public class HttpCharsetTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCompressionTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCompressionTest.java
index f3c785d597b..e6c37a196d5 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCompressionTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCompressionTest.java
@@ -47,7 +47,6 @@ import org.apache.hc.core5.http.io.entity.HttpEntityWrapper;
import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.http.common.HttpMethods.POST;
@@ -61,9 +60,8 @@ public class HttpCompressionTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
Map<String, String> expectedHeaders = new HashMap<>();
expectedHeaders.put(CONTENT_TYPE, TEXT_PLAIN.getMimeType());
expectedHeaders.put(CONTENT_ENCODING, "gzip");
@@ -78,7 +76,7 @@ public class HttpCompressionTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpConcurrentTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpConcurrentTest.java
index 6b18e23b25d..a2411aced71 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpConcurrentTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpConcurrentTest.java
@@ -29,7 +29,6 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -40,9 +39,8 @@ public class HttpConcurrentTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -59,7 +57,7 @@ public class HttpConcurrentTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java
index 446f0e8a2c2..9021e173f70 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java
@@ -24,7 +24,6 @@ import
org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.client5.http.HttpHostConnectException;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -38,9 +37,8 @@ public class HttpDefaultPortNumberTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -49,7 +47,7 @@ public class HttpDefaultPortNumberTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java
index 1fa9f91bd8e..f0722c0bb9b 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.http.common.HttpMethods.GET;
@@ -37,9 +36,8 @@ public class HttpDisableStreamCacheTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -48,7 +46,7 @@ public class HttpDisableStreamCacheTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
index 4515f8922f5..ff2fa18fb23 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
@@ -24,7 +24,6 @@ import
org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.DELETE;
@@ -46,9 +45,8 @@ public class HttpMethodsTest extends BaseHttpTest {
private String baseUrl;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -70,7 +68,7 @@ public class HttpMethodsTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoCamelHeaderTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoCamelHeaderTest.java
index 0380cdf5cb5..3bebe5fecd6 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoCamelHeaderTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoCamelHeaderTest.java
@@ -21,7 +21,6 @@ import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -34,9 +33,8 @@ public class HttpNoCamelHeaderTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -59,7 +57,7 @@ public class HttpNoCamelHeaderTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java
index ffa76dbfcf4..c0ffffc3219 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java
@@ -24,7 +24,6 @@ import
org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.util.TimeValue;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -37,9 +36,8 @@ public class HttpNoConnectionRedeliveryTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -48,7 +46,7 @@ public class HttpNoConnectionRedeliveryTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
index 0150b260efd..2712f5a81bd 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
@@ -23,7 +23,6 @@ import
org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.util.TimeValue;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
@@ -39,9 +38,8 @@ public class HttpNoConnectionTest extends BaseHttpTest {
private String endpointUrl;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -52,7 +50,7 @@ public class HttpNoConnectionTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpOAuth2AuthenticationTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpOAuth2AuthenticationTest.java
index f926fd734ed..06e4c33d439 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpOAuth2AuthenticationTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpOAuth2AuthenticationTest.java
@@ -25,7 +25,6 @@ import
org.apache.camel.component.http.handler.OAuth2TokenRequestHandler;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,9 +37,8 @@ public class HttpOAuth2AuthenticationTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
Map<String, String> expectedHeaders = new HashMap<>();
expectedHeaders.put("Authorization", "Bearer " + FAKE_TOKEN);
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPathTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPathTest.java
index 84e0f93e4a1..2ffc8ee25e4 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPathTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPathTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -31,9 +30,8 @@ public class HttpPathTest extends BaseHttpTest {
private String endpointUrl;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -48,7 +46,7 @@ public class HttpPathTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java
index 1a12ec9f295..a697576838e 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.http.handler.DelayValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -37,9 +36,8 @@ public class HttpPollingConsumerTest extends BaseHttpTest {
private final String password = "password";
private String endpointUrl;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -50,7 +48,7 @@ public class HttpPollingConsumerTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerBridgeEndpointTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerBridgeEndpointTest.java
index b1b2b635671..6f013de6e41 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerBridgeEndpointTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerBridgeEndpointTest.java
@@ -1,136 +1,134 @@
-/*
- * 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.http;
-
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.component.http.handler.HeaderValidationHandler;
-import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
-import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-public class HttpProducerBridgeEndpointTest extends BaseHttpTest {
-
- private static final Instant INSTANT =
Instant.parse("2021-06-10T14:42:00Z");
- private static final String STRING = "text";
- private static final Integer INTEGER = 1;
- private static final Long LONG = 999999999999999L;
- private static final Boolean BOOLEAN = true;
- private static final String QUERY
- = "qp1=" + INSTANT + "&qp2=" + STRING + "&qp3=" + INTEGER +
"&qp4=" + LONG + "&qp5=" + BOOLEAN;
-
- private HttpServer localServer;
-
- @BeforeEach
- @Override
- public void doPreSetup() throws Exception {
- String[] absentHeaders = new String[] { "qp1", "qp2", "qp3", "qp4",
"qp5" };
- Map<String, String> noBridgeExpectedHeaders = new HashMap<>();
- noBridgeExpectedHeaders.put("qp1", INSTANT.toString());
- noBridgeExpectedHeaders.put("qp2", STRING);
- noBridgeExpectedHeaders.put("qp3", INTEGER.toString());
- noBridgeExpectedHeaders.put("qp4", LONG.toString());
- noBridgeExpectedHeaders.put("qp5", BOOLEAN.toString());
-
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
-
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
- .setSslContext(getSSLContext())
- .register("/bridged",
- new HeaderValidationHandler(
- "GET",
- QUERY,
- null,
- getExpectedContent(),
- null,
- Arrays.asList(absentHeaders)))
- .register("/notbridged",
- new HeaderValidationHandler(
- "GET",
- QUERY,
- null,
- getExpectedContent(),
- noBridgeExpectedHeaders))
- .create();
-
- localServer.start();
- }
-
- @Override
- public void doPostTearDown() throws Exception {
-
- if (localServer != null) {
- localServer.stop();
- }
- }
-
- @Test
- public void testHttpProducerBridgeEndpointSkipRequestHeaders() throws
Exception {
-
- HttpComponent component = context.getComponent("http",
HttpComponent.class);
- component.setConnectionTimeToLive(1000L);
-
- HttpEndpoint endpoint = (HttpEndpoint) component
- .createEndpoint("http://localhost:"; +
localServer.getLocalPort() + "/bridged?bridgeEndpoint=true");
- HttpProducer producer = new HttpProducer(endpoint);
-
- Exchange exchange = producer.createExchange();
- exchange.getIn().setBody(null);
- exchange.getIn().setHeader(Exchange.HTTP_QUERY, QUERY);
- exchange.getIn().setHeader("qp1", INSTANT);
- exchange.getIn().setHeader("qp2", STRING);
- exchange.getIn().setHeader("qp3", INTEGER);
- exchange.getIn().setHeader("qp4", LONG);
- exchange.getIn().setHeader("qp5", BOOLEAN);
-
- producer.start();
- producer.process(exchange);
- producer.stop();
-
- assertExchange(exchange);
- }
-
- @Test
- public void testHttpProducerNoBridgeEndpointRequestHeaders() throws
Exception {
-
- HttpComponent component = context.getComponent("http",
HttpComponent.class);
- component.setConnectionTimeToLive(1000L);
-
- HttpEndpoint endpoint = (HttpEndpoint) component
- .createEndpoint("http://localhost:"; +
localServer.getLocalPort() + "/notbridged");
- HttpProducer producer = new HttpProducer(endpoint);
-
- Exchange exchange = producer.createExchange();
- exchange.getIn().setBody(null);
- exchange.getIn().setHeader(Exchange.HTTP_QUERY, QUERY);
- exchange.getIn().setHeader("qp1", INSTANT);
- exchange.getIn().setHeader("qp2", STRING);
- exchange.getIn().setHeader("qp3", INTEGER);
- exchange.getIn().setHeader("qp4", LONG);
- exchange.getIn().setHeader("qp5", BOOLEAN);
-
- producer.start();
- producer.process(exchange);
- producer.stop();
-
- assertExchange(exchange);
- }
-}
+/*
+ * 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.http;
+
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.component.http.handler.HeaderValidationHandler;
+import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
+import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
+import org.junit.jupiter.api.Test;
+
+public class HttpProducerBridgeEndpointTest extends BaseHttpTest {
+
+ private static final Instant INSTANT =
Instant.parse("2021-06-10T14:42:00Z");
+ private static final String STRING = "text";
+ private static final Integer INTEGER = 1;
+ private static final Long LONG = 999999999999999L;
+ private static final Boolean BOOLEAN = true;
+ private static final String QUERY
+ = "qp1=" + INSTANT + "&qp2=" + STRING + "&qp3=" + INTEGER +
"&qp4=" + LONG + "&qp5=" + BOOLEAN;
+
+ private HttpServer localServer;
+
+ @Override
+ public void setupResources() throws Exception {
+ String[] absentHeaders = new String[] { "qp1", "qp2", "qp3", "qp4",
"qp5" };
+ Map<String, String> noBridgeExpectedHeaders = new HashMap<>();
+ noBridgeExpectedHeaders.put("qp1", INSTANT.toString());
+ noBridgeExpectedHeaders.put("qp2", STRING);
+ noBridgeExpectedHeaders.put("qp3", INTEGER.toString());
+ noBridgeExpectedHeaders.put("qp4", LONG.toString());
+ noBridgeExpectedHeaders.put("qp5", BOOLEAN.toString());
+
+ localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
+ .setSslContext(getSSLContext())
+ .register("/bridged",
+ new HeaderValidationHandler(
+ "GET",
+ QUERY,
+ null,
+ getExpectedContent(),
+ null,
+ Arrays.asList(absentHeaders)))
+ .register("/notbridged",
+ new HeaderValidationHandler(
+ "GET",
+ QUERY,
+ null,
+ getExpectedContent(),
+ noBridgeExpectedHeaders))
+ .create();
+
+ localServer.start();
+ }
+
+ @Override
+ public void cleanupResources() throws Exception {
+
+ if (localServer != null) {
+ localServer.stop();
+ }
+ }
+
+ @Test
+ public void testHttpProducerBridgeEndpointSkipRequestHeaders() throws
Exception {
+
+ HttpComponent component = context.getComponent("http",
HttpComponent.class);
+ component.setConnectionTimeToLive(1000L);
+
+ HttpEndpoint endpoint = (HttpEndpoint) component
+ .createEndpoint("http://localhost:"; +
localServer.getLocalPort() + "/bridged?bridgeEndpoint=true");
+ HttpProducer producer = new HttpProducer(endpoint);
+
+ Exchange exchange = producer.createExchange();
+ exchange.getIn().setBody(null);
+ exchange.getIn().setHeader(Exchange.HTTP_QUERY, QUERY);
+ exchange.getIn().setHeader("qp1", INSTANT);
+ exchange.getIn().setHeader("qp2", STRING);
+ exchange.getIn().setHeader("qp3", INTEGER);
+ exchange.getIn().setHeader("qp4", LONG);
+ exchange.getIn().setHeader("qp5", BOOLEAN);
+
+ producer.start();
+ producer.process(exchange);
+ producer.stop();
+
+ assertExchange(exchange);
+ }
+
+ @Test
+ public void testHttpProducerNoBridgeEndpointRequestHeaders() throws
Exception {
+
+ HttpComponent component = context.getComponent("http",
HttpComponent.class);
+ component.setConnectionTimeToLive(1000L);
+
+ HttpEndpoint endpoint = (HttpEndpoint) component
+ .createEndpoint("http://localhost:"; +
localServer.getLocalPort() + "/notbridged");
+ HttpProducer producer = new HttpProducer(endpoint);
+
+ Exchange exchange = producer.createExchange();
+ exchange.getIn().setBody(null);
+ exchange.getIn().setHeader(Exchange.HTTP_QUERY, QUERY);
+ exchange.getIn().setHeader("qp1", INSTANT);
+ exchange.getIn().setHeader("qp2", STRING);
+ exchange.getIn().setHeader("qp3", INTEGER);
+ exchange.getIn().setHeader("qp4", LONG);
+ exchange.getIn().setHeader("qp5", BOOLEAN);
+
+ producer.start();
+ producer.process(exchange);
+ producer.stop();
+
+ assertExchange(exchange);
+ }
+}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerConnectionCloseTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerConnectionCloseTest.java
index d820235b09c..22722dc1eb9 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerConnectionCloseTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerConnectionCloseTest.java
@@ -25,7 +25,6 @@ import org.apache.camel.spi.Registry;
import org.apache.hc.core5.http.HeaderElements;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -41,9 +40,8 @@ public class HttpProducerConnectionCloseTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -52,7 +50,7 @@ public class HttpProducerConnectionCloseTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentLengthTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentLengthTest.java
index 26eed0e2a1e..3380420aa3c 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentLengthTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentLengthTest.java
@@ -24,7 +24,6 @@ import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -39,9 +38,8 @@ public class HttpProducerContentLengthTest extends
BaseHttpTest {
private String endpointUrl;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -76,7 +74,7 @@ public class HttpProducerContentLengthTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeTest.java
index 99f2fa571ad..0597ddbe555 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeTest.java
@@ -23,7 +23,6 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -39,9 +38,8 @@ public class HttpProducerContentTypeTest extends BaseHttpTest
{
private String endpointUrl;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -59,7 +57,7 @@ public class HttpProducerContentTypeTest extends BaseHttpTest
{
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithCharsetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithCharsetTest.java
index 72630ab5950..62e12eb05ce 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithCharsetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithCharsetTest.java
@@ -23,7 +23,6 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -40,9 +39,8 @@ public class HttpProducerContentTypeWithCharsetTest extends
BaseHttpTest {
private String endpointUrl;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -61,7 +59,7 @@ public class HttpProducerContentTypeWithCharsetTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithSemiColonTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithSemiColonTest.java
index 9999882520e..d9aa91e84b7 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithSemiColonTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithSemiColonTest.java
@@ -23,7 +23,6 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -39,9 +38,8 @@ public class HttpProducerContentTypeWithSemiColonTest extends
BaseHttpTest {
private String endpointUrl;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -59,7 +57,7 @@ public class HttpProducerContentTypeWithSemiColonTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerCustomHeaderTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerCustomHeaderTest.java
index 2fcfbfedd9e..3844c63a1c3 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerCustomHeaderTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerCustomHeaderTest.java
@@ -24,7 +24,6 @@ import
org.apache.camel.component.http.handler.HeaderValidationHandler;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
public class HttpProducerCustomHeaderTest extends BaseHttpTest {
@@ -33,9 +32,8 @@ public class HttpProducerCustomHeaderTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
Map<String, String> expectedHeaders = new HashMap<>();
expectedHeaders.put(HttpHeaders.HOST, CUSTOM_HOST);
@@ -62,7 +60,7 @@ public class HttpProducerCustomHeaderTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
index c4c59b246b7..7298c42a2a0 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
@@ -21,7 +21,6 @@ import
org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.HeaderElements;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -34,9 +33,8 @@ public class HttpProducerExplicitConnectionCloseTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -45,7 +43,7 @@ public class HttpProducerExplicitConnectionCloseTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerLoadManualIT.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerLoadManualIT.java
index 66d4cd1df7e..7d058e42b90 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerLoadManualIT.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerLoadManualIT.java
@@ -28,7 +28,6 @@ import
org.apache.camel.component.http.handler.DrinkValidationHandler;
import org.apache.camel.util.StopWatch;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -43,9 +42,8 @@ public class HttpProducerLoadManualIT extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -54,7 +52,7 @@ public class HttpProducerLoadManualIT extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerNullBodyTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerNullBodyTest.java
index 01704a80cdd..c7545f8ae16 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerNullBodyTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerNullBodyTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.Exchange;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -33,9 +32,8 @@ public class HttpProducerNullBodyTest extends BaseHttpTest {
private String endpointUrl;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -52,7 +50,7 @@ public class HttpProducerNullBodyTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerRestartTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerRestartTest.java
index c32c75f30ed..142e8316b84 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerRestartTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerRestartTest.java
@@ -24,7 +24,6 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,9 +34,8 @@ public class HttpProducerRestartTest extends BaseHttpTest {
private String endpointUrl;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -54,7 +52,7 @@ public class HttpProducerRestartTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
index 2bdebb4555e..fa17e2a6a0f 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -38,9 +37,8 @@ public class HttpProducerSelectMethodTest extends
BaseHttpTest {
private Exchange exchange;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -55,7 +53,7 @@ public class HttpProducerSelectMethodTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoHeadersWithSameKeyTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoHeadersWithSameKeyTest.java
index 78302769ed9..b8a80dff886 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoHeadersWithSameKeyTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoHeadersWithSameKeyTest.java
@@ -26,7 +26,6 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -40,9 +39,8 @@ public class HttpProducerTwoHeadersWithSameKeyTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -74,7 +72,7 @@ public class HttpProducerTwoHeadersWithSameKeyTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoParametersWithSameKeyTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoParametersWithSameKeyTest.java
index bdbd75e1dec..5ea4d94c44b 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoParametersWithSameKeyTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoParametersWithSameKeyTest.java
@@ -24,7 +24,6 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,9 +37,8 @@ public class HttpProducerTwoParametersWithSameKeyTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -58,7 +56,7 @@ public class HttpProducerTwoParametersWithSameKeyTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerUserAgentTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerUserAgentTest.java
index c0bac218b81..e665f50043d 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerUserAgentTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerUserAgentTest.java
@@ -36,9 +36,8 @@ public class HttpProducerUserAgentTest extends BaseHttpTest {
private String endpointUrl;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -51,14 +50,16 @@ public class HttpProducerUserAgentTest extends BaseHttpTest
{
localServer.start();
endpointUrl = "http://localhost:"; + localServer.getLocalPort();
+ }
+ @BeforeEach
+ void setupUserAgent() {
HttpComponent http = context.getComponent("http", HttpComponent.class);
http.setUserAgent("MyAgent");
}
@Override
- public void doPostTearDown() throws Exception {
-
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyAndBasicAuthTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyAndBasicAuthTest.java
index 18a9c775760..7289443d6de 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyAndBasicAuthTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyAndBasicAuthTest.java
@@ -32,7 +32,6 @@ import
org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.protocol.ResponseContent;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -46,9 +45,8 @@ public class HttpProxyAndBasicAuthTest extends BaseHttpTest {
private final String proxyUser = "proxyuser";
private final String proxyPassword = "proxypassword";
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
proxy =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -61,7 +59,7 @@ public class HttpProxyAndBasicAuthTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (proxy != null) {
proxy.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyServerTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyServerTest.java
index 83510cd2adf..baa2ce1f523 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyServerTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyServerTest.java
@@ -33,7 +33,6 @@ import
org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.protocol.ResponseContent;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -43,9 +42,8 @@ public class HttpProxyServerTest extends BaseHttpTest {
private HttpServer proxy;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
Map<String, String> expectedHeaders = new HashMap<>();
// Don't test anymore the Proxy-Connection header as it is highly
discouraged, so its support has been removed
// https://issues.apache.org/jira/browse/HTTPCLIENT-1957
@@ -60,7 +58,7 @@ public class HttpProxyServerTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (proxy != null) {
proxy.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryParameterTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryParameterTest.java
index a7c62e4aab4..fa204b1c50e 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryParameterTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryParameterTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.handler.DrinkQueryValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -31,9 +30,8 @@ public class HttpQueryParameterTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -43,7 +41,7 @@ public class HttpQueryParameterTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryTest.java
index f3cd6d24f20..502238dce17 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -31,9 +30,8 @@ public class HttpQueryTest extends BaseHttpTest {
private String baseUrl;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -48,7 +46,7 @@ public class HttpQueryTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRedirectTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRedirectTest.java
index d88893309b6..0a44c1afe71 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRedirectTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRedirectTest.java
@@ -27,7 +27,6 @@ import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -42,9 +41,8 @@ public class HttpRedirectTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -56,7 +54,7 @@ public class HttpRedirectTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java
index 0988c20c230..486ff8e0535 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java
@@ -50,14 +50,18 @@ public class HttpReferenceParameterTest extends
CamelTestSupport {
private HttpContext testHttpContext;
@Override
- public void doPreSetup() throws Exception {
+ public final void doPreSetup() throws Exception {
+ super.doPreSetup();
+
this.testBinding = new TestHttpBinding();
this.testConfigurer = new TestClientConfigurer();
this.testHttpContext = new BasicHttpContext();
}
@Override
- protected void doPostSetup() throws Exception {
+ protected final void doPostSetup() throws Exception {
+ super.doPostSetup();
+
this.endpoint1 = context.getEndpoint(TEST_URI_1, HttpEndpoint.class);
this.endpoint2 = context.getEndpoint(TEST_URI_2, HttpEndpoint.class);
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java
index 1f8991e6874..ece20feccae 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java
@@ -22,7 +22,6 @@ import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -32,9 +31,8 @@ public class HttpSOTimeoutTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -43,8 +41,7 @@ public class HttpSOTimeoutTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
-
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareBasicAuthTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareBasicAuthTest.java
index 1af4509e10e..f47222cbc82 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareBasicAuthTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareBasicAuthTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.handler.DrinkAuthValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -34,9 +33,8 @@ public class HttpSendDynamicAwareBasicAuthTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -58,7 +56,7 @@ public class HttpSendDynamicAwareBasicAuthTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareEmptyPathTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareEmptyPathTest.java
index 60cc3304a42..1fb51b5cf60 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareEmptyPathTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareEmptyPathTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.handler.DrinkValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -31,9 +30,8 @@ public class HttpSendDynamicAwareEmptyPathTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -42,7 +40,7 @@ public class HttpSendDynamicAwareEmptyPathTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareHeadersTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareHeadersTest.java
index 714ed8ed9c8..c7a66302bcc 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareHeadersTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareHeadersTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -32,9 +31,8 @@ public class HttpSendDynamicAwareHeadersTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -44,7 +42,7 @@ public class HttpSendDynamicAwareHeadersTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareMultiValueTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareMultiValueTest.java
index 88bdd91b3da..d9373911a08 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareMultiValueTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareMultiValueTest.java
@@ -26,7 +26,6 @@ import org.apache.hc.client5.http.classic.HttpClient;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,9 +35,8 @@ public class HttpSendDynamicAwareMultiValueTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer = ServerBootstrap.bootstrap()
.setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy())
@@ -50,8 +48,7 @@ public class HttpSendDynamicAwareMultiValueTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
-
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwarePathHeaderTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwarePathHeaderTest.java
index 93eea4fc661..72662acec02 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwarePathHeaderTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwarePathHeaderTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.handler.DrinkValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -32,9 +31,8 @@ public class HttpSendDynamicAwarePathHeaderTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -43,7 +41,7 @@ public class HttpSendDynamicAwarePathHeaderTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawParameterTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawParameterTest.java
index bb0c030049d..00ba621261e 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawParameterTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawParameterTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,9 +30,8 @@ public class HttpSendDynamicAwareRawParameterTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer = ServerBootstrap.bootstrap()
.setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy())
@@ -45,7 +43,7 @@ public class HttpSendDynamicAwareRawParameterTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawTest.java
index dec1dcbf766..52ba635aa27 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.handler.DrinkValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -36,9 +35,8 @@ public class HttpSendDynamicAwareRawTest extends BaseHttpTest
{
@BindToRegistry("pw")
private String pw = "se+%ret.$";
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -50,7 +48,7 @@ public class HttpSendDynamicAwareRawTest extends BaseHttpTest
{
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareTest.java
index f81463907a8..583304b3322 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.handler.DrinkValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -32,9 +31,8 @@ public class HttpSendDynamicAwareTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -44,7 +42,7 @@ public class HttpSendDynamicAwareTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithSpacesTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithSpacesTest.java
index 18fc9a20ecd..430e644429c 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithSpacesTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithSpacesTest.java
@@ -25,7 +25,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,9 +34,8 @@ public class HttpSendDynamicAwareUriWithSpacesTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -46,7 +44,7 @@ public class HttpSendDynamicAwareUriWithSpacesTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
index fe6ba374f81..b2224bf8139 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
@@ -25,7 +25,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,9 +34,8 @@ public class HttpSendDynamicAwareUriWithoutSlashTest extends
BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -46,7 +44,7 @@ public class HttpSendDynamicAwareUriWithoutSlashTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSetHeaderIdsTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSetHeaderIdsTest.java
index 2ba2c212731..88e8e286cce 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSetHeaderIdsTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSetHeaderIdsTest.java
@@ -25,16 +25,14 @@ import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.entity.StringEntity;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
public class HttpSetHeaderIdsTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -47,8 +45,7 @@ public class HttpSetHeaderIdsTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
-
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSquareBracketTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSquareBracketTest.java
index 8b9eb124440..9e07374a885 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSquareBracketTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSquareBracketTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -31,9 +30,8 @@ public class HttpSquareBracketTest extends BaseHttpTest {
private String baseUrl;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -48,7 +46,7 @@ public class HttpSquareBracketTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java
index 5af8d72ac42..aeef23ec389 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java
@@ -25,7 +25,6 @@ import
org.apache.camel.http.base.HttpOperationFailedException;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -40,9 +39,8 @@ public class HttpThrowExceptionOnFailureTest extends
BaseHttpTest {
private String baseUrl;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -53,8 +51,7 @@ public class HttpThrowExceptionOnFailureTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
-
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpToDSOTimeoutTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpToDSOTimeoutTest.java
index c86d014dbe2..664009e02f2 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpToDSOTimeoutTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpToDSOTimeoutTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -33,9 +32,8 @@ public class HttpToDSOTimeoutTest extends BaseHttpTest {
private String baseUrl;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -58,7 +56,7 @@ public class HttpToDSOTimeoutTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpWithHttpUriHeaderTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpWithHttpUriHeaderTest.java
index 37e4117ceef..55b65d755b4 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpWithHttpUriHeaderTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpWithHttpUriHeaderTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -29,9 +28,8 @@ public class HttpWithHttpUriHeaderTest extends BaseHttpTest {
private HttpServer localServer;
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -40,8 +38,7 @@ public class HttpWithHttpUriHeaderTest extends BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
-
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
index be43b4d2166..49a8f3d1d13 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
@@ -60,7 +60,7 @@ public class HttpsAuthenticationTest extends BaseHttpsTest {
private HttpContext basicAuthContexts = basicAuthContext();
@Override
- public void doPreSetup() throws Exception {
+ public final void doPreSetup() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -71,7 +71,7 @@ public class HttpsAuthenticationTest extends BaseHttpsTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
index 561cf247252..11f0885816a 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
@@ -47,7 +47,7 @@ public class HttpsGetTest extends BaseHttpsTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsProducerWithSystemPropertiesTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsProducerWithSystemPropertiesTest.java
index 3abb0b056c5..dea1a121ac9 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsProducerWithSystemPropertiesTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsProducerWithSystemPropertiesTest.java
@@ -33,7 +33,6 @@ import
org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.ssl.SSLContexts;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
@@ -79,9 +78,8 @@ public class HttpsProducerWithSystemPropertiesTest extends
BaseHttpTest {
System.clearProperty("javax.net.ssl.keyStore");
}
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
URL serverKeystoreUurl =
HttpsServerTestSupport.class.getResource("/localhost.p12");
URL serverTrustStoreUrl =
HttpsServerTestSupport.class.getResource("/localhost.p12");
SSLContext sslcontext = SSLContexts.custom()
@@ -105,7 +103,7 @@ public class HttpsProducerWithSystemPropertiesTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsServerTestSupport.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsServerTestSupport.java
index 43cf1e25e3a..a286f2f31e9 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsServerTestSupport.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsServerTestSupport.java
@@ -25,23 +25,20 @@ import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManagerFactory;
-import org.junit.jupiter.api.BeforeEach;
-
public abstract class HttpsServerTestSupport extends HttpServerTestSupport {
private static final String KEYSTORE = "/localhost.p12";
private static final String PASSWORD = "changeit";
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
System.setProperty("javax.net.ssl.trustStorePassword", PASSWORD);
final URL keystoreResourceUrl =
HttpsServerTestSupport.class.getResource(KEYSTORE);
System.setProperty("javax.net.ssl.trustStore", new
File(keystoreResourceUrl.toURI()).getAbsolutePath());
}
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
System.clearProperty("javax.net.ssl.trustStorePassword");
System.clearProperty("javax.net.ssl.trustStore");
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsSslContextParametersGetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsSslContextParametersGetTest.java
index 807dee4cf38..e0e9db96147 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsSslContextParametersGetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsSslContextParametersGetTest.java
@@ -29,7 +29,7 @@ public class HttpsSslContextParametersGetTest extends
HttpsGetTest {
private HttpServer localServer;
@Override
- public void doPreSetup() throws Exception {
+ public final void doPreSetup() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -38,8 +38,7 @@ public class HttpsSslContextParametersGetTest extends
HttpsGetTest {
}
@Override
- public void doPostTearDown() throws Exception {
-
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
index db3789c7e04..897906ceec9 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
@@ -48,7 +48,7 @@ public class HttpsTwoComponentsSslContextParametersGetTest
extends BaseHttpsTest
private HttpComponent httpComponent1 = new HttpComponent();
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext()).create();
@@ -56,8 +56,7 @@ public class HttpsTwoComponentsSslContextParametersGetTest
extends BaseHttpsTest
}
@Override
- public void doPostTearDown() throws Exception {
-
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoDifferentSslContextParametersGetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoDifferentSslContextParametersGetTest.java
index d8061ed2f75..98f81daa408 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoDifferentSslContextParametersGetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoDifferentSslContextParametersGetTest.java
@@ -44,7 +44,7 @@ public class HttpsTwoDifferentSslContextParametersGetTest
extends BaseHttpsTest
private SSLContextParameters sslContextParameters2 = new
SSLContextParameters();
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext()).create();
@@ -52,8 +52,7 @@ public class HttpsTwoDifferentSslContextParametersGetTest
extends BaseHttpsTest
}
@Override
- public void doPostTearDown() throws Exception {
-
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/ManagedHttpProducerPoolStatsTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/ManagedHttpProducerPoolStatsTest.java
index 71803226393..b92faf71b66 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/ManagedHttpProducerPoolStatsTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/ManagedHttpProducerPoolStatsTest.java
@@ -26,7 +26,6 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -42,9 +41,8 @@ public class ManagedHttpProducerPoolStatsTest extends
BaseHttpTest {
return true;
}
- @BeforeEach
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
@@ -56,8 +54,7 @@ public class ManagedHttpProducerPoolStatsTest extends
BaseHttpTest {
}
@Override
- public void doPostTearDown() throws Exception {
-
+ public void cleanupResources() {
if (localServer != null) {
localServer.stop();
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/rest/RestCamelComponentVerifierTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/rest/RestCamelComponentVerifierTest.java
index 3d729a66f51..9cbe3e7589e 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/rest/RestCamelComponentVerifierTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/rest/RestCamelComponentVerifierTest.java
@@ -45,9 +45,8 @@ public class RestCamelComponentVerifierTest extends
BaseHttpTest {
private Map<String, Object> parameters;
private ComponentVerifierExtension verifier;
- @BeforeEach
@Override
- public void doPostSetup() throws Exception {
+ public void setupResources() throws Exception {
localServer = ServerBootstrap.bootstrap()
.setHttpProcessor(getHttpProcessor())
.register("/verify", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent()))
@@ -55,17 +54,20 @@ public class RestCamelComponentVerifierTest extends
BaseHttpTest {
localServer.start();
- RestComponent component = context().getComponent("rest",
RestComponent.class);
- verifier = component.getVerifier();
-
parameters = new HashMap<>();
parameters.put("producerComponentName", "http");
parameters.put("host", "http://localhost:"; +
localServer.getLocalPort());
parameters.put("path", "verify");
}
+ @BeforeEach
+ public void setupVerifier() {
+ RestComponent component = context().getComponent("rest",
RestComponent.class);
+ verifier = component.getVerifier();
+ }
+
@Override
- public void doPostTearDown() throws Exception {
+ public void cleanupResources() throws Exception {
if (localServer != null) {
localServer.stop();
