CAMEL-22549: Remove verbose inline comments, keep only non-obvious ones

gnodet · claude · gnodet · commit 411f1b362bcc · 2026-04-08T09:27:10.000+02:00
Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchMessageTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchMessageTest.java
@@ -64,7 +64,6 @@ public void testDipatchMessageOneway() throws Exception {
         Exchange exchange = sendJaxWsDispatchMessage(name, true);
         assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully");
 
-        // Oneway operation should not produce a response
         assertFalse(ExchangeHelper.hasResponse(exchange), "The oneway response must not have a response message");
     }
 
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchPayloadTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchPayloadTest.java
@@ -68,7 +68,6 @@ public void testDispatchPayloadOneway() throws Exception {
         Exchange exchange = sendJaxWsDispatchPayload(name, true);
         assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully");
 
-        // Oneway operation should not produce a response
         assertFalse(ExchangeHelper.hasResponse(exchange), "The oneway response must not have a response message");
     }
 
diff --git a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
@@ -262,7 +262,6 @@ protected ConduitInitiator getConduitInitiator() {
     }
 
     protected void propagateResponseHeadersToCamel(Message outMessage, Exchange camelExchange) {
-        // ensure response message exists before propagating headers
         if (!ExchangeHelper.hasResponse(camelExchange)) {
             ExchangeHelper.setResponse(camelExchange, new DefaultMessage(camelExchange.getContext()));
         }
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -355,7 +355,7 @@ protected void populateResponse(
             HeaderFilterStrategy strategy, int responseCode)
             throws IOException, ClassNotFoundException {
 
-        // create a fresh OUT message for the response (don't reuse IN which has request headers)
+        // separate response from request so response headers don't mix with request headers
         ExchangeHelper.setResponse(exchange, new DefaultMessage(exchange.getContext()));
         Message answer = exchange.getMessage();
         populateResponseCode(answer, httpResponse, responseCode);
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
@@ -34,7 +34,6 @@ public void testCreateNodeWithAuthentication() {
         Exchange exchange = createExchangeWithBody("<message>hello!</message>");
         Exchange out = template.send("direct:a", exchange);
         assertNotNull(out);
-        // On login failure, no response message should be created (no JCR node UUID produced)
         assertFalse(ExchangeHelper.hasResponse(out), "Should not have a response on login failure");
         assertTrue(out.getException() instanceof LoginException, "Wrong exception type");
     }
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
@@ -183,7 +183,6 @@ protected void doProcess(Exchange exchange) throws Exception {
                 maybeDisconnectOnTimeout();
                 throw new ExchangeTimedOutException(exchange, timeout);
             } else {
-                // set the result on the exchange
                 MinaPayloadHelper.setPayload(exchange, handler.getMessage());
             }
         }
diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java
@@ -35,15 +35,13 @@ public void testMvelExpressions() {
         assertExpression("request.headers.foo", "abc");
     }
 
-    // hasOut() is deprecated but these tests validate exchange state after routing
     @SuppressWarnings("deprecation")
     @Test
     public void testGetOutFalseKeepsNullOutMessage() {
         assertExpression("exchange.hasOut()", false);
         assertFalse(exchange.hasOut());
     }
 
-    // hasOut() is deprecated but these tests validate exchange state after routing
     @SuppressWarnings("deprecation")
     @Test
     public void testResponseCreatesOutMessage() {
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
@@ -254,8 +254,7 @@ protected Message getResponseMessage(Exchange exchange, ChannelHandlerContext ct
 
         // set the result on either IN or OUT on the original exchange depending on its pattern
         if (ExchangeHelper.isOutCapable(exchange)) {
-            // for OutCapable, create OUT first so setPayload populates it via getMessage()
-            // (unmarshal inside setPayload will replace OUT with its own, which is fine)
+            // DefaultExchangeHolder unmarshals its own OUT, so only pre-create one for normal payloads
             if (!(body instanceof DefaultExchangeHolder)) {
                 ExchangeHelper.setResponse(exchange, exchange.getIn().copy());
             }
diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
@@ -49,15 +49,13 @@ public void testClassMethodExpression() {
         assertExpression("@org.apache.camel.language.ognl.Animal1@getClassName()", "Animal");
     }
 
-    // hasOut() is deprecated but these tests validate exchange state after routing
     @SuppressWarnings("deprecation")
     @Test
     public void testGetOutFalseKeepsNullOutMessage() {
         assertExpression("exchange.hasOut()", false);
         assertFalse(exchange.hasOut());
     }
 
-    // hasOut() is deprecated but these tests validate exchange state after routing
     @SuppressWarnings("deprecation")
     @Test
     public void testResponseCreatesOutMessage() {
diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
@@ -90,7 +90,6 @@ public void withoutHeader() throws Exception {
 
     @Test
     public void removeCamelInternalHeaderAttributes() throws Exception {
-        // Create a fresh response message (old getOut() created an empty OUT; getMessage() returns IN which has extra headers)
         ExchangeHelper.setResponse(exchange, new DefaultMessage(exchange.getContext()));
         exchange.getMessage().getHeaders().put(SpringWebserviceConstants.SPRING_WS_SOAP_ACTION, "mustBeRemoved");
         exchange.getMessage().getHeaders().put(SpringWebserviceConstants.SPRING_WS_ADDRESSING_ACTION, "mustBeRemoved");
@@ -116,7 +115,6 @@ public void removeCamelInternalHeaderAttributes() throws Exception {
 
     @Test
     public void consumerWithHeader() throws Exception {
-        // Create a fresh response message (old getOut() created an empty OUT; getMessage() returns IN which has extra headers)
         ExchangeHelper.setResponse(exchange, new DefaultMessage(exchange.getContext()));
         exchange.getMessage().getHeaders().put("headerAttributeKey", "testAttributeValue");
         exchange.getMessage().getHeaders().put("headerAttributeElement", new QName("http://shouldBeInHeader", "myElement"));
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredProducer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredProducer.java
@@ -81,10 +81,6 @@ public void execute(StatementWrapper ps) throws SQLException, DataAccessExceptio
                 } else {
                     Object result = ps.executeStatement();
 
-                    // Note: the previous code using getOut() would create an OUT message (with null body)
-                    // even when result was null, which unintentionally cleared the message body.
-                    // Using getMessage() preserves the original body when the procedure returns no result,
-                    // which is the correct behavior.
                     if (result != null) {
                         if (!getEndpoint().isNoop()) {
                             if (getEndpoint().getOutputHeader() != null) {
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -224,7 +224,6 @@ protected Exchange prepareExchange(Exchange exchange) {
             // to cause side effects of the original exchange
             // (the original thread will run in parallel)
             answer = ExchangeHelper.createCorrelatedCopy(exchange, false);
-            // move OUT to IN (pipes and filters)
             ExchangeHelper.prepareOutToIn(answer);
             // set MEP to InOnly as this onCompletion is a fire and forget
             answer.setPattern(ExchangePattern.InOnly);
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/WireTapProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/WireTapProcessor.java
@@ -254,7 +254,6 @@ private Exchange configureCopyExchange(Exchange exchange) throws IOException {
         target.removeProperty(ExchangePropertyKey.CORRELATION_ID);
         // set MEP to InOnly as this wire tap is a fire and forget
         target.setPattern(ExchangePattern.InOnly);
-        // move OUT to IN if needed
         ExchangeHelper.prepareOutToIn(target);
         // remove STREAM_CACHE_UNIT_OF_WORK property because this wire tap will
         // close its own created stream cache(s)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
@@ -169,8 +169,7 @@ public static void unmarshal(Exchange exchange, DefaultExchangeHolder payload) {
             exchange.getIn().setHeaders(payload.inHeaders);
         }
         if (payload.outBody != null) {
-            // Only create a new response message if one doesn't already exist;
-            // reusing the existing one preserves its type (e.g., JmsMessage)
+            // reuse existing response message to preserve its type (e.g. JmsMessage)
             if (!ExchangeHelper.hasResponse(exchange)) {
                 ExchangeHelper.setResponse(exchange, new DefaultMessage(exchange.getContext()));
             }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@ public void testDipatchMessageOneway() throws Exception {`
`64`	`64`	`Exchange exchange = sendJaxWsDispatchMessage(name, true);`
`65`	`65`	`assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully");`
`66`	`66`
`67`		`- // Oneway operation should not produce a response`
`68`	`67`	`assertFalse(ExchangeHelper.hasResponse(exchange), "The oneway response must not have a response message");`
`69`	`68`	`}`
`70`	`69`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ public void testDispatchPayloadOneway() throws Exception {`
`68`	`68`	`Exchange exchange = sendJaxWsDispatchPayload(name, true);`
`69`	`69`	`assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully");`
`70`	`70`
`71`		`- // Oneway operation should not produce a response`
`72`	`71`	`assertFalse(ExchangeHelper.hasResponse(exchange), "The oneway response must not have a response message");`
`73`	`72`	`}`
`74`	`73`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,6 @@ protected ConduitInitiator getConduitInitiator() {`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`protected void propagateResponseHeadersToCamel(Message outMessage, Exchange camelExchange) {`
`265`		`- // ensure response message exists before propagating headers`
`266`	`265`	`if (!ExchangeHelper.hasResponse(camelExchange)) {`
`267`	`266`	`ExchangeHelper.setResponse(camelExchange, new DefaultMessage(camelExchange.getContext()));`
`268`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ public void testCreateNodeWithAuthentication() {`
`34`	`34`	`Exchange exchange = createExchangeWithBody("<message>hello!</message>");`
`35`	`35`	`Exchange out = template.send("direct:a", exchange);`
`36`	`36`	`assertNotNull(out);`
`37`		`- // On login failure, no response message should be created (no JCR node UUID produced)`
`38`	`37`	`assertFalse(ExchangeHelper.hasResponse(out), "Should not have a response on login failure");`
`39`	`38`	`assertTrue(out.getException() instanceof LoginException, "Wrong exception type");`
`40`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,6 @@ protected void doProcess(Exchange exchange) throws Exception {`
`183`	`183`	`maybeDisconnectOnTimeout();`
`184`	`184`	`throw new ExchangeTimedOutException(exchange, timeout);`
`185`	`185`	`} else {`
`186`		`- // set the result on the exchange`
`187`	`186`	`MinaPayloadHelper.setPayload(exchange, handler.getMessage());`
`188`	`187`	`}`
`189`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,13 @@ public void testMvelExpressions() {`
`35`	`35`	`assertExpression("request.headers.foo", "abc");`
`36`	`36`	`}`
`37`	`37`
`38`		`- // hasOut() is deprecated but these tests validate exchange state after routing`
`39`	`38`	`@SuppressWarnings("deprecation")`
`40`	`39`	`@Test`
`41`	`40`	`public void testGetOutFalseKeepsNullOutMessage() {`
`42`	`41`	`assertExpression("exchange.hasOut()", false);`
`43`	`42`	`assertFalse(exchange.hasOut());`
`44`	`43`	`}`
`45`	`44`
`46`		`- // hasOut() is deprecated but these tests validate exchange state after routing`
`47`	`45`	`@SuppressWarnings("deprecation")`
`48`	`46`	`@Test`
`49`	`47`	`public void testResponseCreatesOutMessage() {`
Original file line number	Diff line number	Diff line change
`@@ -254,8 +254,7 @@ protected Message getResponseMessage(Exchange exchange, ChannelHandlerContext ct`
`254`	`254`
`255`	`255`	`// set the result on either IN or OUT on the original exchange depending on its pattern`
`256`	`256`	`if (ExchangeHelper.isOutCapable(exchange)) {`
`257`		`- // for OutCapable, create OUT first so setPayload populates it via getMessage()`
`258`		`- // (unmarshal inside setPayload will replace OUT with its own, which is fine)`
	`257`	`+ // DefaultExchangeHolder unmarshals its own OUT, so only pre-create one for normal payloads`
`259`	`258`	`if (!(body instanceof DefaultExchangeHolder)) {`
`260`	`259`	`ExchangeHelper.setResponse(exchange, exchange.getIn().copy());`
`261`	`260`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,13 @@ public void testClassMethodExpression() {`
`49`	`49`	`assertExpression("@org.apache.camel.language.ognl.Animal1@getClassName()", "Animal");`
`50`	`50`	`}`
`51`	`51`
`52`		`- // hasOut() is deprecated but these tests validate exchange state after routing`
`53`	`52`	`@SuppressWarnings("deprecation")`
`54`	`53`	`@Test`
`55`	`54`	`public void testGetOutFalseKeepsNullOutMessage() {`
`56`	`55`	`assertExpression("exchange.hasOut()", false);`
`57`	`56`	`assertFalse(exchange.hasOut());`
`58`	`57`	`}`
`59`	`58`
`60`		`- // hasOut() is deprecated but these tests validate exchange state after routing`
`61`	`59`	`@SuppressWarnings("deprecation")`
`62`	`60`	`@Test`
`63`	`61`	`public void testResponseCreatesOutMessage() {`