You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2024/05/12 12:01:34 UTC
(camel) branch main updated (0b0125b8b7f -> e68770d81ec)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 0b0125b8b7f (chores) camel-file: code cleanup
new f01d2262785 (chores) camel-jetty: tentative isolation adjustment for reduced flakiness
new e68770d81ec (chores) camel-jetty: avoid unnecessary overwrite of the parent template
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/jetty/rest/RestJettyAcceptTest.java | 5 +++--
.../camel/component/jetty/rest/RestJettyContentTypeTest.java | 5 +++--
...stJettyInvalidContentTypeClientRequestValidationTest.java | 12 +++++++-----
.../RestJettyInvalidJSonClientRequestValidationTest.java | 5 +++--
.../component/jetty/rest/RestJettyRequiredBodyTest.java | 9 +++++----
.../jetty/rest/RestJettyRequiredHttpHeaderTest.java | 7 +++++--
.../jetty/rest/RestJettyRequiredQueryParameterTest.java | 9 +++++----
7 files changed, 31 insertions(+), 21 deletions(-)
(camel) 01/02: (chores) camel-jetty: tentative isolation adjustment for reduced flakiness
Posted by or...@apache.org.
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 f01d2262785a353897ab2b96fe77fa8fd4266e74
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun May 12 13:40:41 2024 +0200
(chores) camel-jetty: tentative isolation adjustment for reduced flakiness
---
.../camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java
index c54ea32abb5..a9e79a78804 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java
@@ -18,16 +18,19 @@ package org.apache.camel.component.jetty.rest;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
+import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
import org.apache.camel.http.base.HttpOperationFailedException;
import org.apache.camel.model.rest.RestParamType;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+@Isolated("Run isolatedly to reduce flakiness on the CI")
public class RestJettyRequiredHttpHeaderTest extends BaseJettyTest {
@Test
(camel) 02/02: (chores) camel-jetty: avoid unnecessary overwrite of the parent template
Posted by or...@apache.org.
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 e68770d81ec22a18ae4b84f21c0ff9bc53b2bb85
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun May 12 13:45:08 2024 +0200
(chores) camel-jetty: avoid unnecessary overwrite of the parent template
---
.../camel/component/jetty/rest/RestJettyAcceptTest.java | 5 +++--
.../camel/component/jetty/rest/RestJettyContentTypeTest.java | 5 +++--
...stJettyInvalidContentTypeClientRequestValidationTest.java | 12 +++++++-----
.../RestJettyInvalidJSonClientRequestValidationTest.java | 5 +++--
.../component/jetty/rest/RestJettyRequiredBodyTest.java | 9 +++++----
.../jetty/rest/RestJettyRequiredHttpHeaderTest.java | 4 ++--
.../jetty/rest/RestJettyRequiredQueryParameterTest.java | 9 +++++----
7 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java
index 364263e5edf..64b0280fe49 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jetty.rest;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
+import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
import org.apache.camel.http.base.HttpOperationFailedException;
@@ -50,13 +51,13 @@ public class RestJettyAcceptTest extends BaseJettyTest {
@Test
public void testJettyProducerAcceptInvalid() {
- fluentTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
+ FluentProducerTemplate requestTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
.withHeader("Accept", "application/xml")
.withHeader(Exchange.HTTP_METHOD, "post")
.withBody("{ \"name\": \"Donald Duck\" }")
.to("http://localhost:" + getPort() + "/users/123/update");
- Exception ex = assertThrows(CamelExecutionException.class, () -> fluentTemplate.request(String.class));
+ Exception ex = assertThrows(CamelExecutionException.class, () -> requestTemplate.request(String.class));
HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause());
assertEquals(406, cause.getStatusCode());
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java
index f77dd9bf1ce..eee167c1b97 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jetty.rest;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
+import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
import org.apache.camel.http.base.HttpOperationFailedException;
@@ -49,12 +50,12 @@ public class RestJettyContentTypeTest extends BaseJettyTest {
@Test
public void testJettyProducerContentTypeInvalid() {
- fluentTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/xml")
+ FluentProducerTemplate requestTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/xml")
.withHeader(Exchange.HTTP_METHOD, "post")
.withBody("<name>Donald Duck</name>")
.to("http://localhost:" + getPort() + "/users/123/update");
- Exception ex = assertThrows(CamelExecutionException.class, () -> fluentTemplate.request(String.class));
+ Exception ex = assertThrows(CamelExecutionException.class, () -> requestTemplate.request(String.class));
HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause());
assertEquals(415, cause.getStatusCode());
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidContentTypeClientRequestValidationTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidContentTypeClientRequestValidationTest.java
index 3735095cd40..d9efb0a4fae 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidContentTypeClientRequestValidationTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidContentTypeClientRequestValidationTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jetty.rest;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
+import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
import org.apache.camel.http.base.HttpOperationFailedException;
@@ -32,12 +33,13 @@ public class RestJettyInvalidContentTypeClientRequestValidationTest extends Base
@Test
public void testJettyInvalidContentType() {
- fluentTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json; charset=utf-8")
- .withHeader(Exchange.HTTP_METHOD, "post")
- .withBody("{\"name\": \"Donald\"}")
- .to("http://localhost:" + getPort() + "/users/123/update");
+ FluentProducerTemplate requestTemplate
+ = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json; charset=utf-8")
+ .withHeader(Exchange.HTTP_METHOD, "post")
+ .withBody("{\"name\": \"Donald\"}")
+ .to("http://localhost:" + getPort() + "/users/123/update");
- Exception ex = assertThrows(CamelExecutionException.class, () -> fluentTemplate.request(String.class));
+ Exception ex = assertThrows(CamelExecutionException.class, () -> requestTemplate.request(String.class));
// we send json but the service accepts only text/plain, so we get a 415
HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause());
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java
index 2dcb50121f3..0e55687fa0b 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jetty.rest;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
+import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
import org.apache.camel.http.base.HttpOperationFailedException;
@@ -32,12 +33,12 @@ public class RestJettyInvalidJSonClientRequestValidationTest extends BaseJettyTe
@Test
public void testJettyInvalidJSon() {
- fluentTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
+ FluentProducerTemplate requestTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
.withHeader(Exchange.HTTP_METHOD, "post")
.withBody("{\"name\": \"Donald\"") // the body is invalid as the ending } is missing
.to("http://localhost:" + getPort() + "/users/123/update");
- Exception ex = assertThrows(CamelExecutionException.class, () -> fluentTemplate.request(String.class));
+ Exception ex = assertThrows(CamelExecutionException.class, () -> requestTemplate.request(String.class));
HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause());
assertEquals(400, cause.getStatusCode());
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java
index 104b375b595..054ecd12090 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jetty.rest;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
+import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
import org.apache.camel.http.base.HttpOperationFailedException;
@@ -42,12 +43,12 @@ public class RestJettyRequiredBodyTest extends BaseJettyTest {
@Test
public void testJettyInvalidNullBody() {
- fluentTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
+ FluentProducerTemplate requestTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
.withHeader("Accept", "application/json")
.withHeader(Exchange.HTTP_METHOD, "post")
.to("http://localhost:" + getPort() + "/users/123/update");
- Exception ex = assertThrows(CamelExecutionException.class, () -> fluentTemplate.request(String.class));
+ Exception ex = assertThrows(CamelExecutionException.class, () -> requestTemplate.request(String.class));
HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause());
assertEquals(400, cause.getStatusCode());
@@ -56,13 +57,13 @@ public class RestJettyRequiredBodyTest extends BaseJettyTest {
@Test
public void testJettyInvalidEmptyBody() {
- fluentTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
+ FluentProducerTemplate requestTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
.withHeader("Accept", "application/json")
.withHeader(Exchange.HTTP_METHOD, "post")
.withBody(" ")
.to("http://localhost:" + getPort() + "/users/123/update");
- Exception ex = assertThrows(CamelExecutionException.class, () -> fluentTemplate.request(String.class));
+ Exception ex = assertThrows(CamelExecutionException.class, () -> requestTemplate.request(String.class));
HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause());
assertEquals(400, cause.getStatusCode());
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java
index a9e79a78804..88341e7bba0 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java
@@ -45,13 +45,13 @@ public class RestJettyRequiredHttpHeaderTest extends BaseJettyTest {
@Test
public void testJettyInvalid() {
- fluentTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
+ FluentProducerTemplate requestTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
.withHeader("Accept", "application/json")
.withHeader(Exchange.HTTP_METHOD, "post")
.withBody("{ \"name\": \"Donald Duck\" }")
.to("http://localhost:" + getPort() + "/users/123/update");
- Exception ex = assertThrows(CamelExecutionException.class, () -> fluentTemplate.request(String.class));
+ Exception ex = assertThrows(CamelExecutionException.class, () -> requestTemplate.request(String.class));
HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause());
assertEquals(400, cause.getStatusCode());
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java
index 4c5aaece713..18e0f5dbffd 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jetty.rest;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
+import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
import org.apache.camel.http.base.HttpOperationFailedException;
@@ -42,13 +43,13 @@ public class RestJettyRequiredQueryParameterTest extends BaseJettyTest {
@Test
public void testJettyMissing() {
- fluentTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
+ FluentProducerTemplate requestTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
.withHeader("Accept", "application/json")
.withHeader(Exchange.HTTP_METHOD, "post")
.withBody("{ \"name\": \"Donald Duck\" }")
.to("http://localhost:" + getPort() + "/users/123/update");
- Exception ex = assertThrows(CamelExecutionException.class, () -> fluentTemplate.request(String.class));
+ Exception ex = assertThrows(CamelExecutionException.class, () -> requestTemplate.request(String.class));
HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause());
assertEquals(400, cause.getStatusCode());
@@ -57,13 +58,13 @@ public class RestJettyRequiredQueryParameterTest extends BaseJettyTest {
@Test
public void testJettyNotAllowed() {
- fluentTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
+ FluentProducerTemplate requestTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE, "application/json")
.withHeader("Accept", "application/json")
.withHeader(Exchange.HTTP_METHOD, "post")
.withBody("{ \"name\": \"Donald Duck\" }")
.to("http://localhost:" + getPort() + "/users/123/update?country=se");
- Exception ex = assertThrows(CamelExecutionException.class, () -> fluentTemplate.request(String.class));
+ Exception ex = assertThrows(CamelExecutionException.class, () -> requestTemplate.request(String.class));
HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause());
assertEquals(400, cause.getStatusCode());