seshuthota commented on code in PR #28301:
URL: https://github.com/apache/camel/pull/28301#discussion_r4351694873
##########
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:
Agreed. It's now a branch of the if with no early return, so there's a
single callback.done(true) at the end, as before. Fixed in 96b5f15e1658.
##########
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:
Good catch, thanks. expectedVariableReceived(name, null) indeed never reads
the variable. The test now asserts on the received exchange's variable, and it
fails with expected: <null> but was: <stale> if the reset is removed. Fixed in
96b5f15e1658.
--
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]
