davsclaus commented on code in PR #28301:
URL: https://github.com/apache/camel/pull/28301#discussion_r4351198165
##########
core/camel-support/src/main/java/org/apache/camel/support/processor/UnmarshalProcessor.java:
##########
@@ -80,20 +80,23 @@ public boolean process(Exchange exchange, AsyncCallback
callback) {
if (variableSend != null) {
body = ExchangeHelper.getVariable(exchange, variableSend);
}
- final Message out;
if (allowNullBody && body == null) {
- // The body is null, and it is an allowed value so let's skip
the unmarshalling
- out = exchange.getOut();
- } else {
- // lets set up the out message before we invoke the dataFormat
so that it can mutate it if necessary
- out = exchange.getOut();
- out.copyFrom(in);
- if (body instanceof InputStream is) {
- stream = is;
- result = dataFormat.unmarshal(exchange, stream);
- } else {
- result = dataFormat.unmarshal(exchange, body);
+ // the body is null, and it is an allowed value so let's skip
the unmarshalling
+ // and leave the message as it is
+ if (variableReceive != null) {
+ ExchangeHelper.setVariable(exchange, variableReceive,
null);
}
+ callback.done(true);
Review Comment:
Suggestion, not blocking: `callback.done(true)` is now called inside the
`try`. If anything after it throws, the `catch` sets the exception and
`callback.done(true)` runs a second time at the end of the method. Keeping the
null-body case as a branch of the `if`, without a `return`, keeps a single
`callback.done` at the end, as the method had before:
```java
if (allowNullBody && body == null) {
// the body is null, and it is an allowed value so let's skip the
unmarshalling
// and leave the message as it is
if (variableReceive != null) {
ExchangeHelper.setVariable(exchange, variableReceive, null);
}
} else {
... unmarshal and handle the result as today ...
}
```
##########
core/camel-core/src/test/java/org/apache/camel/processor/UnmarshalAllowNullBodyTest.java:
##########
@@ -0,0 +1,108 @@
+/*
+ * 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.processor;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.support.service.ServiceSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class UnmarshalAllowNullBodyTest extends ContextTestSupport {
+
+ @Test
+ public void testAllowNullBodySkipsTheUnmarshalling() {
+ Object out = template.requestBodyAndHeader("direct:allow", null,
"foo", "bar");
+ assertNull(out);
+ }
+
+ @Test
+ public void testAllowNullBodyKeepsHeaders() throws Exception {
+ getMockEndpoint("mock:allow").expectedHeaderReceived("foo", "bar");
+ template.sendBodyAndHeader("direct:allow", null, "foo", "bar");
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testAllowNullBodyUnmarshalsABody() {
+ Object out = template.requestBody("direct:allow", "Camel");
+ assertEquals("Hello Camel", out);
+ }
+
+ @Test
+ public void testAllowNullBodySetsTheReceiveVariableToNull() throws
Exception {
+ getMockEndpoint("mock:receive").expectedVariableReceived("out", null);
Review Comment:
`MockEndpoint.expectedVariableReceived(name, null)` treats `null` as "may be
absent" and never reads the variable (`MockEndpoint.java:776-785`), so this
passes even if `out` is still `"stale"`. The `"stale"` value set in the route
suggests the test is meant to catch exactly that. Checking the received
exchange directly would make it fail on a regression:
```java
@Test
public void testAllowNullBodySetsTheReceiveVariableToNull() throws Exception
{
getMockEndpoint("mock:receive").expectedMessageCount(1);
getMockEndpoint("mock:receive").expectedHeaderReceived("foo", "bar");
template.sendBodyAndHeader("direct:receive", null, "foo", "bar");
assertMockEndpointsSatisfied();
assertNull(getMockEndpoint("mock:receive").getReceivedExchanges().get(0).getVariable("out"));
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
