You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by fm...@apache.org on 2026/05/04 17:37:21 UTC

(camel) branch main updated (87dfc87115c2 -> 765bbec52305)

This is an automated email from the ASF dual-hosted git repository.

Croway pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 87dfc87115c2 CAMEL-23405: camel-core - Remove ReifierStrategy (#22919)
     new e3fb7140709c chore: remove broken Spring XML sample-placeholder test
     new c5ec742b95fb chore: keep override to suppress inherited test from JUnit discovery
     new 765bbec52305 chore: align SpringTryCatchMisconfiguredTest with CAMEL-23402 toString change

The 3 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/spring/processor/SpringTryCatchMisconfiguredTest.java      | 2 +-
 .../org/apache/camel/spring/processor/samplingThrottler.xml          | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)


(camel) 02/03: chore: keep override to suppress inherited test from JUnit discovery

Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

Croway pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit c5ec742b95fbf3c7ba8ddf5e584e1994351a7f1f
Author: Croway <fe...@gmail.com>
AuthorDate: Mon May 4 18:15:46 2026 +0200

    chore: keep override to suppress inherited test from JUnit discovery
    
    The override without @Test prevents JUnit from discovering the
    parent's testSamplingWithPropertyPlaceholder, which has no
    corresponding Spring XML route.
---
 .../apache/camel/spring/processor/SpringSamplingThrottlerTest.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
index 1f3cc6f3e2ba..2489034351be 100644
--- a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
+++ b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
@@ -47,6 +47,11 @@ public class SpringSamplingThrottlerTest extends SamplingThrottlerTest {
         super.testSendLotsOfMessagesSimultaneouslyButOnly3GetThrough();
     }
 
+    @Override
+    public void testSamplingWithPropertyPlaceholder() throws Exception {
+        super.testSamplingWithPropertyPlaceholder();
+    }
+
     @Override
     public void testSamplingUsingMessageFrequency() throws Exception {
         super.testSamplingUsingMessageFrequency();


(camel) 03/03: chore: align SpringTryCatchMisconfiguredTest with CAMEL-23402 toString change

Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

Croway pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 765bbec523052fe3618744dc7a0fbf8332c9e3da
Author: Croway <fe...@gmail.com>
AuthorDate: Mon May 4 18:47:37 2026 +0200

    chore: align SpringTryCatchMisconfiguredTest with CAMEL-23402 toString change
    
    Co-Authored-By: Claude Opus 4.6 (1M context) <no...@anthropic.com>
---
 .../apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
index 286994d5943a..395f7bfdc52b 100644
--- a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
+++ b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
@@ -35,7 +35,7 @@ public class SpringTryCatchMisconfiguredTest extends ContextTestSupport {
         FailedToCreateRouteException ftce = assertIsInstanceOf(FailedToCreateRouteException.class, e1);
         IllegalArgumentException iae = assertIsInstanceOf(IllegalArgumentException.class, ftce.getCause());
         assertEquals(
-                "This doCatch should have a doTry as its parent on DoCatch[ [class java.io.IOException] -> [to[mock:fail]]]",
+                "This doCatch should have a doTry as its parent on DoCatch[java.io.IOException -> [to[mock:fail]]]",
                 iae.getMessage());
 
         Exception e2 = assertThrows(Exception.class, () -> {


(camel) 01/03: chore: remove broken Spring XML sample-placeholder test

Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

Croway pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit e3fb7140709c165e8974956a364626e137514fde
Author: Croway <fe...@gmail.com>
AuthorDate: Mon May 4 17:34:13 2026 +0200

    chore: remove broken Spring XML sample-placeholder test
    
    The testSamplingWithPropertyPlaceholder override and its XML route
    were added for CAMEL-23279 but never actually worked: the override
    drops @Test so JUnit never discovers it, and the XML route references
    {{sample.period}} without providing the property. The parent Java DSL
    test already covers the JIRA fix.
---
 .../apache/camel/spring/processor/SpringSamplingThrottlerTest.java   | 5 -----
 .../org/apache/camel/spring/processor/samplingThrottler.xml          | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
index 2489034351be..1f3cc6f3e2ba 100644
--- a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
+++ b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
@@ -47,11 +47,6 @@ public class SpringSamplingThrottlerTest extends SamplingThrottlerTest {
         super.testSendLotsOfMessagesSimultaneouslyButOnly3GetThrough();
     }
 
-    @Override
-    public void testSamplingWithPropertyPlaceholder() throws Exception {
-        super.testSamplingWithPropertyPlaceholder();
-    }
-
     @Override
     public void testSamplingUsingMessageFrequency() throws Exception {
         super.testSamplingUsingMessageFrequency();
diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/samplingThrottler.xml b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/samplingThrottler.xml
index db34a38dd3b1..29d09c89614e 100644
--- a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/samplingThrottler.xml
+++ b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/samplingThrottler.xml
@@ -41,11 +41,6 @@
             <sample messageFrequency="5"/>
             <to uri="mock:result"/>
         </route>
-        <route>
-            <from uri="direct:sample-placeholder"/>
-            <sample samplePeriod="{{sample.period}}"/>
-            <to uri="mock:result"/>
-        </route>
         <!-- END SNIPPET: e1 -->
 
     </camelContext>