apupier commented on code in PR #22389: URL: https://github.com/apache/camel/pull/22389#discussion_r3026377563
########## components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/transform/GoogleMailDraftDataTypeTransformerTest.java: ########## @@ -0,0 +1,445 @@ +/* + * 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.component.google.mail.transform; + +import java.nio.charset.StandardCharsets; + +import jakarta.mail.internet.MimeUtility; + +import com.google.api.client.util.Base64; +import com.google.api.services.gmail.model.Draft; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.spi.DataType; +import org.apache.camel.support.DefaultExchange; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_BCC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_CC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_FROM; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_MESSAGE_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_SUBJECT; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_THREAD_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_TO; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class GoogleMailDraftDataTypeTransformerTest extends CamelTestSupport { + + private GoogleMailDraftDataTypeTransformer transformer; + + @Override + protected CamelContext createCamelContext() throws Exception { + return new DefaultCamelContext(); + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + @Override + public void configure() { + from("direct:input") + .transformDataType("google-mail:draft") + .to("mock:result"); + } + }; + } + + @Override + protected void doPostSetup() { + transformer = new GoogleMailDraftDataTypeTransformer(); + transformer.setCamelContext(context); + } + + @Test + void testBasicDraftCreation() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("This is a test draft message"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("This is a test draft message")); + assertTrue(decodedMessage.contains("Content-Type: text/plain; charset=UTF-8")); + } + + @Test + void testDraftWithThreadingMetadata() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Reply message"); + exchange.getMessage().setHeader(MAIL_THREAD_ID, "thread-123"); + exchange.getMessage().setHeader(MAIL_MESSAGE_ID, "<[email protected]>"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Re: Test Subject"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertEquals("thread-123", draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Re: Test Subject")); + assertTrue(decodedMessage.contains("In-Reply-To: <[email protected]>")); + assertTrue(decodedMessage.contains("References: <[email protected]>")); + assertTrue(decodedMessage.contains("Reply message")); + } + + @Test + void testDraftWithAllHeaders() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Complete message"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_TO, "[email protected]"); + exchange.getMessage().setHeader(MAIL_CC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_BCC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Complete Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("To: [email protected]")); + assertTrue(decodedMessage.contains("Cc: [email protected]")); + assertTrue(decodedMessage.contains("Bcc: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Complete Test")); + assertTrue(decodedMessage.contains("Complete message")); + } + + @Test + void testDraftWithEmptyBody() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(""); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Empty Body Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("Subject: Empty Body Test")); + } + + @Test + void testDraftWithNullBody() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(null); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Null Body Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage().getRaw()); + } + + @Test + void testDraftWithoutThreadId() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("New conversation"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "New Thread"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNull(draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("Subject: New Thread")); + assertTrue(decodedMessage.contains("New conversation")); + } + + @Test + void testDraftWithHtmlBodyRequiresExplicitContentType() throws Exception { + Exchange exchange = new DefaultExchange(context); + String htmlBody = "<html><body><h1>Hello</h1><p>This is HTML</p></body></html>"; + exchange.getMessage().setBody(htmlBody); + exchange.getMessage().setHeader(MAIL_SUBJECT, "HTML Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + // Without explicit Content-Type header, defaults to text/plain even for HTML-like body + assertTrue(decodedMessage.contains("text/plain")); Review Comment: optional: using AssertJ assertions allows to have a better error message in case of failure. Not just only true/false but the expected text and what searched inside. ########## components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/transform/GoogleMailDraftDataTypeTransformerTest.java: ########## @@ -0,0 +1,445 @@ +/* + * 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.component.google.mail.transform; + +import java.nio.charset.StandardCharsets; + +import jakarta.mail.internet.MimeUtility; + +import com.google.api.client.util.Base64; +import com.google.api.services.gmail.model.Draft; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.spi.DataType; +import org.apache.camel.support.DefaultExchange; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_BCC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_CC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_FROM; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_MESSAGE_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_SUBJECT; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_THREAD_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_TO; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class GoogleMailDraftDataTypeTransformerTest extends CamelTestSupport { + + private GoogleMailDraftDataTypeTransformer transformer; + + @Override + protected CamelContext createCamelContext() throws Exception { + return new DefaultCamelContext(); + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + @Override + public void configure() { + from("direct:input") + .transformDataType("google-mail:draft") + .to("mock:result"); + } + }; + } + + @Override + protected void doPostSetup() { + transformer = new GoogleMailDraftDataTypeTransformer(); + transformer.setCamelContext(context); + } + + @Test + void testBasicDraftCreation() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("This is a test draft message"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("This is a test draft message")); + assertTrue(decodedMessage.contains("Content-Type: text/plain; charset=UTF-8")); + } + + @Test + void testDraftWithThreadingMetadata() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Reply message"); + exchange.getMessage().setHeader(MAIL_THREAD_ID, "thread-123"); + exchange.getMessage().setHeader(MAIL_MESSAGE_ID, "<[email protected]>"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Re: Test Subject"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertEquals("thread-123", draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Re: Test Subject")); + assertTrue(decodedMessage.contains("In-Reply-To: <[email protected]>")); + assertTrue(decodedMessage.contains("References: <[email protected]>")); + assertTrue(decodedMessage.contains("Reply message")); + } + + @Test + void testDraftWithAllHeaders() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Complete message"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_TO, "[email protected]"); + exchange.getMessage().setHeader(MAIL_CC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_BCC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Complete Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("To: [email protected]")); + assertTrue(decodedMessage.contains("Cc: [email protected]")); + assertTrue(decodedMessage.contains("Bcc: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Complete Test")); + assertTrue(decodedMessage.contains("Complete message")); Review Comment: optional: using AssertJ assertions allows to have a better error message in case of failure. Not just only true/false but the expected text and what searched inside. These assetiosn can also be chained reducing slightly the amount of code written ########## components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/transform/GoogleMailDraftDataTypeTransformerTest.java: ########## @@ -0,0 +1,445 @@ +/* + * 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.component.google.mail.transform; + +import java.nio.charset.StandardCharsets; + +import jakarta.mail.internet.MimeUtility; + +import com.google.api.client.util.Base64; +import com.google.api.services.gmail.model.Draft; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.spi.DataType; +import org.apache.camel.support.DefaultExchange; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_BCC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_CC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_FROM; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_MESSAGE_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_SUBJECT; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_THREAD_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_TO; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class GoogleMailDraftDataTypeTransformerTest extends CamelTestSupport { + + private GoogleMailDraftDataTypeTransformer transformer; + + @Override + protected CamelContext createCamelContext() throws Exception { + return new DefaultCamelContext(); + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + @Override + public void configure() { + from("direct:input") + .transformDataType("google-mail:draft") + .to("mock:result"); + } + }; + } + + @Override + protected void doPostSetup() { + transformer = new GoogleMailDraftDataTypeTransformer(); + transformer.setCamelContext(context); + } + + @Test + void testBasicDraftCreation() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("This is a test draft message"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("This is a test draft message")); + assertTrue(decodedMessage.contains("Content-Type: text/plain; charset=UTF-8")); + } + + @Test + void testDraftWithThreadingMetadata() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Reply message"); + exchange.getMessage().setHeader(MAIL_THREAD_ID, "thread-123"); + exchange.getMessage().setHeader(MAIL_MESSAGE_ID, "<[email protected]>"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Re: Test Subject"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertEquals("thread-123", draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Re: Test Subject")); + assertTrue(decodedMessage.contains("In-Reply-To: <[email protected]>")); + assertTrue(decodedMessage.contains("References: <[email protected]>")); + assertTrue(decodedMessage.contains("Reply message")); Review Comment: optional: using AssertJ assertions allows to have a better error message in case of failure. Not just only true/false but the expected text and what searched inside. These assetiosn can also be chained reducing slightly the amount of code written ########## components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/transform/GoogleMailDraftDataTypeTransformerTest.java: ########## @@ -0,0 +1,445 @@ +/* + * 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.component.google.mail.transform; + +import java.nio.charset.StandardCharsets; + +import jakarta.mail.internet.MimeUtility; + +import com.google.api.client.util.Base64; +import com.google.api.services.gmail.model.Draft; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.spi.DataType; +import org.apache.camel.support.DefaultExchange; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_BCC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_CC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_FROM; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_MESSAGE_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_SUBJECT; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_THREAD_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_TO; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class GoogleMailDraftDataTypeTransformerTest extends CamelTestSupport { + + private GoogleMailDraftDataTypeTransformer transformer; + + @Override + protected CamelContext createCamelContext() throws Exception { + return new DefaultCamelContext(); + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + @Override + public void configure() { + from("direct:input") + .transformDataType("google-mail:draft") + .to("mock:result"); + } + }; + } + + @Override + protected void doPostSetup() { + transformer = new GoogleMailDraftDataTypeTransformer(); + transformer.setCamelContext(context); + } + + @Test + void testBasicDraftCreation() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("This is a test draft message"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("This is a test draft message")); + assertTrue(decodedMessage.contains("Content-Type: text/plain; charset=UTF-8")); + } + + @Test + void testDraftWithThreadingMetadata() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Reply message"); + exchange.getMessage().setHeader(MAIL_THREAD_ID, "thread-123"); + exchange.getMessage().setHeader(MAIL_MESSAGE_ID, "<[email protected]>"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Re: Test Subject"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertEquals("thread-123", draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Re: Test Subject")); + assertTrue(decodedMessage.contains("In-Reply-To: <[email protected]>")); + assertTrue(decodedMessage.contains("References: <[email protected]>")); + assertTrue(decodedMessage.contains("Reply message")); + } + + @Test + void testDraftWithAllHeaders() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Complete message"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_TO, "[email protected]"); + exchange.getMessage().setHeader(MAIL_CC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_BCC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Complete Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("To: [email protected]")); + assertTrue(decodedMessage.contains("Cc: [email protected]")); + assertTrue(decodedMessage.contains("Bcc: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Complete Test")); + assertTrue(decodedMessage.contains("Complete message")); + } + + @Test + void testDraftWithEmptyBody() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(""); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Empty Body Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("Subject: Empty Body Test")); + } + + @Test + void testDraftWithNullBody() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(null); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Null Body Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage().getRaw()); + } + + @Test + void testDraftWithoutThreadId() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("New conversation"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "New Thread"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNull(draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("Subject: New Thread")); + assertTrue(decodedMessage.contains("New conversation")); + } + + @Test + void testDraftWithHtmlBodyRequiresExplicitContentType() throws Exception { + Exchange exchange = new DefaultExchange(context); + String htmlBody = "<html><body><h1>Hello</h1><p>This is HTML</p></body></html>"; + exchange.getMessage().setBody(htmlBody); + exchange.getMessage().setHeader(MAIL_SUBJECT, "HTML Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + // Without explicit Content-Type header, defaults to text/plain even for HTML-like body + assertTrue(decodedMessage.contains("text/plain")); + } + + @Test + void testDraftWithHtmlBodyAndExplicitHtmlContentType() throws Exception { + Exchange exchange = new DefaultExchange(context); + String htmlBody = "<html><body><h1>Hello</h1><p>This is HTML</p></body></html>"; + exchange.getMessage().setBody(htmlBody); + exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "text/html; charset=UTF-8"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "HTML Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("text/html")); + assertTrue(decodedMessage.contains(htmlBody)); + } + + @Test + void testDraftWithExplicitContentTypeHeader() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Some plain text"); + exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "text/html"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Explicit CT"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + // MimeMessage sets text/html and determines charset automatically + assertTrue(decodedMessage.contains("Content-Type: text/html")); + } + + @Test + void testDraftWithPlainTextDefaultContentType() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Just plain text, no HTML"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Plain Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("Content-Type: text/plain; charset=UTF-8")); + } + + @Test + void testDraftWithNonAsciiSubject() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Message with accented subject"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Resumé for café meeting"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + // MimeMessage encodes non-ASCII subjects using RFC 2047 + assertTrue(decodedMessage.contains("Subject: =?UTF-8?")); + assertTrue(decodedMessage.contains("?=")); + assertTrue(decodedMessage.contains("Message with accented subject")); + // Verify that the non-ASCII characters are preserved after decoding + String decodedSubject = MimeUtility.decodeText( + decodedMessage.lines().filter(l -> l.startsWith("Subject:")).findFirst().orElse("")); + assertNotEquals("", decodedSubject); Review Comment: this check is not useful given that the next assertions is checking more precisely and will cover the case of empty string ########## components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/transform/GoogleMailDraftDataTypeTransformerTest.java: ########## @@ -0,0 +1,445 @@ +/* + * 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.component.google.mail.transform; + +import java.nio.charset.StandardCharsets; + +import jakarta.mail.internet.MimeUtility; + +import com.google.api.client.util.Base64; +import com.google.api.services.gmail.model.Draft; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.spi.DataType; +import org.apache.camel.support.DefaultExchange; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_BCC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_CC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_FROM; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_MESSAGE_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_SUBJECT; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_THREAD_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_TO; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class GoogleMailDraftDataTypeTransformerTest extends CamelTestSupport { + + private GoogleMailDraftDataTypeTransformer transformer; + + @Override + protected CamelContext createCamelContext() throws Exception { + return new DefaultCamelContext(); + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + @Override + public void configure() { + from("direct:input") + .transformDataType("google-mail:draft") + .to("mock:result"); + } + }; + } + + @Override + protected void doPostSetup() { + transformer = new GoogleMailDraftDataTypeTransformer(); + transformer.setCamelContext(context); + } + + @Test + void testBasicDraftCreation() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("This is a test draft message"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("This is a test draft message")); + assertTrue(decodedMessage.contains("Content-Type: text/plain; charset=UTF-8")); + } + + @Test + void testDraftWithThreadingMetadata() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Reply message"); + exchange.getMessage().setHeader(MAIL_THREAD_ID, "thread-123"); + exchange.getMessage().setHeader(MAIL_MESSAGE_ID, "<[email protected]>"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Re: Test Subject"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertEquals("thread-123", draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Re: Test Subject")); + assertTrue(decodedMessage.contains("In-Reply-To: <[email protected]>")); + assertTrue(decodedMessage.contains("References: <[email protected]>")); + assertTrue(decodedMessage.contains("Reply message")); + } + + @Test + void testDraftWithAllHeaders() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Complete message"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_TO, "[email protected]"); + exchange.getMessage().setHeader(MAIL_CC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_BCC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Complete Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("To: [email protected]")); + assertTrue(decodedMessage.contains("Cc: [email protected]")); + assertTrue(decodedMessage.contains("Bcc: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Complete Test")); + assertTrue(decodedMessage.contains("Complete message")); + } + + @Test + void testDraftWithEmptyBody() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(""); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Empty Body Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("Subject: Empty Body Test")); + } + + @Test + void testDraftWithNullBody() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(null); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Null Body Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage().getRaw()); Review Comment: Is it normal that we do not have a null body if we set a null body? ########## components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/transform/GoogleMailDraftDataTypeTransformerTest.java: ########## @@ -0,0 +1,445 @@ +/* + * 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.component.google.mail.transform; + +import java.nio.charset.StandardCharsets; + +import jakarta.mail.internet.MimeUtility; + +import com.google.api.client.util.Base64; +import com.google.api.services.gmail.model.Draft; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.spi.DataType; +import org.apache.camel.support.DefaultExchange; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_BCC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_CC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_FROM; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_MESSAGE_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_SUBJECT; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_THREAD_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_TO; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class GoogleMailDraftDataTypeTransformerTest extends CamelTestSupport { + + private GoogleMailDraftDataTypeTransformer transformer; + + @Override + protected CamelContext createCamelContext() throws Exception { + return new DefaultCamelContext(); + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + @Override + public void configure() { + from("direct:input") + .transformDataType("google-mail:draft") + .to("mock:result"); + } + }; + } + + @Override + protected void doPostSetup() { + transformer = new GoogleMailDraftDataTypeTransformer(); + transformer.setCamelContext(context); + } + + @Test + void testBasicDraftCreation() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("This is a test draft message"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("This is a test draft message")); + assertTrue(decodedMessage.contains("Content-Type: text/plain; charset=UTF-8")); + } + + @Test + void testDraftWithThreadingMetadata() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Reply message"); + exchange.getMessage().setHeader(MAIL_THREAD_ID, "thread-123"); + exchange.getMessage().setHeader(MAIL_MESSAGE_ID, "<[email protected]>"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Re: Test Subject"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertEquals("thread-123", draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Re: Test Subject")); + assertTrue(decodedMessage.contains("In-Reply-To: <[email protected]>")); + assertTrue(decodedMessage.contains("References: <[email protected]>")); + assertTrue(decodedMessage.contains("Reply message")); + } + + @Test + void testDraftWithAllHeaders() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Complete message"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_TO, "[email protected]"); + exchange.getMessage().setHeader(MAIL_CC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_BCC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Complete Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("To: [email protected]")); + assertTrue(decodedMessage.contains("Cc: [email protected]")); + assertTrue(decodedMessage.contains("Bcc: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Complete Test")); + assertTrue(decodedMessage.contains("Complete message")); + } + + @Test + void testDraftWithEmptyBody() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(""); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Empty Body Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("Subject: Empty Body Test")); + } + + @Test + void testDraftWithNullBody() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(null); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Null Body Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage().getRaw()); + } + + @Test + void testDraftWithoutThreadId() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("New conversation"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "New Thread"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNull(draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("Subject: New Thread")); + assertTrue(decodedMessage.contains("New conversation")); + } + + @Test + void testDraftWithHtmlBodyRequiresExplicitContentType() throws Exception { + Exchange exchange = new DefaultExchange(context); + String htmlBody = "<html><body><h1>Hello</h1><p>This is HTML</p></body></html>"; + exchange.getMessage().setBody(htmlBody); + exchange.getMessage().setHeader(MAIL_SUBJECT, "HTML Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + // Without explicit Content-Type header, defaults to text/plain even for HTML-like body Review Comment: I think this comment will be better placed directly in the error message of the assertion so that when it fails we directly understand what was looked for and why. Also better chance that it is kept in sync with the code if it is not a comment ########## components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/transform/GoogleMailDraftDataTypeTransformerTest.java: ########## @@ -0,0 +1,445 @@ +/* + * 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.component.google.mail.transform; + +import java.nio.charset.StandardCharsets; + +import jakarta.mail.internet.MimeUtility; + +import com.google.api.client.util.Base64; +import com.google.api.services.gmail.model.Draft; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.spi.DataType; +import org.apache.camel.support.DefaultExchange; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_BCC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_CC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_FROM; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_MESSAGE_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_SUBJECT; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_THREAD_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_TO; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class GoogleMailDraftDataTypeTransformerTest extends CamelTestSupport { + + private GoogleMailDraftDataTypeTransformer transformer; + + @Override + protected CamelContext createCamelContext() throws Exception { + return new DefaultCamelContext(); + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + @Override + public void configure() { + from("direct:input") + .transformDataType("google-mail:draft") + .to("mock:result"); + } + }; + } + + @Override + protected void doPostSetup() { + transformer = new GoogleMailDraftDataTypeTransformer(); + transformer.setCamelContext(context); + } + + @Test + void testBasicDraftCreation() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("This is a test draft message"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("This is a test draft message")); + assertTrue(decodedMessage.contains("Content-Type: text/plain; charset=UTF-8")); + } + + @Test + void testDraftWithThreadingMetadata() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Reply message"); + exchange.getMessage().setHeader(MAIL_THREAD_ID, "thread-123"); + exchange.getMessage().setHeader(MAIL_MESSAGE_ID, "<[email protected]>"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Re: Test Subject"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertEquals("thread-123", draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Re: Test Subject")); + assertTrue(decodedMessage.contains("In-Reply-To: <[email protected]>")); + assertTrue(decodedMessage.contains("References: <[email protected]>")); + assertTrue(decodedMessage.contains("Reply message")); + } + + @Test + void testDraftWithAllHeaders() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Complete message"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_TO, "[email protected]"); + exchange.getMessage().setHeader(MAIL_CC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_BCC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Complete Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("To: [email protected]")); + assertTrue(decodedMessage.contains("Cc: [email protected]")); + assertTrue(decodedMessage.contains("Bcc: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Complete Test")); + assertTrue(decodedMessage.contains("Complete message")); + } + + @Test + void testDraftWithEmptyBody() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(""); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Empty Body Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("Subject: Empty Body Test")); Review Comment: optional: using AssertJ assertions allows to have a better error message in case of failure. Not just only true/false but the expected text and what searched inside. ########## components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/transform/GoogleMailDraftDataTypeTransformerTest.java: ########## @@ -0,0 +1,445 @@ +/* + * 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.component.google.mail.transform; + +import java.nio.charset.StandardCharsets; + +import jakarta.mail.internet.MimeUtility; + +import com.google.api.client.util.Base64; +import com.google.api.services.gmail.model.Draft; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.spi.DataType; +import org.apache.camel.support.DefaultExchange; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_BCC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_CC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_FROM; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_MESSAGE_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_SUBJECT; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_THREAD_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_TO; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class GoogleMailDraftDataTypeTransformerTest extends CamelTestSupport { + + private GoogleMailDraftDataTypeTransformer transformer; + + @Override + protected CamelContext createCamelContext() throws Exception { + return new DefaultCamelContext(); + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + @Override + public void configure() { + from("direct:input") + .transformDataType("google-mail:draft") + .to("mock:result"); + } + }; + } + + @Override + protected void doPostSetup() { + transformer = new GoogleMailDraftDataTypeTransformer(); + transformer.setCamelContext(context); + } + + @Test + void testBasicDraftCreation() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("This is a test draft message"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("This is a test draft message")); + assertTrue(decodedMessage.contains("Content-Type: text/plain; charset=UTF-8")); + } + + @Test + void testDraftWithThreadingMetadata() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Reply message"); + exchange.getMessage().setHeader(MAIL_THREAD_ID, "thread-123"); + exchange.getMessage().setHeader(MAIL_MESSAGE_ID, "<[email protected]>"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Re: Test Subject"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertEquals("thread-123", draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Re: Test Subject")); + assertTrue(decodedMessage.contains("In-Reply-To: <[email protected]>")); + assertTrue(decodedMessage.contains("References: <[email protected]>")); + assertTrue(decodedMessage.contains("Reply message")); + } + + @Test + void testDraftWithAllHeaders() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("Complete message"); + exchange.getMessage().setHeader(MAIL_FROM, "[email protected]"); + exchange.getMessage().setHeader(MAIL_TO, "[email protected]"); + exchange.getMessage().setHeader(MAIL_CC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_BCC, "[email protected]"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Complete Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("From: [email protected]")); + assertTrue(decodedMessage.contains("To: [email protected]")); + assertTrue(decodedMessage.contains("Cc: [email protected]")); + assertTrue(decodedMessage.contains("Bcc: [email protected]")); + assertTrue(decodedMessage.contains("Subject: Complete Test")); + assertTrue(decodedMessage.contains("Complete message")); + } + + @Test + void testDraftWithEmptyBody() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(""); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Empty Body Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("Subject: Empty Body Test")); + } + + @Test + void testDraftWithNullBody() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(null); + exchange.getMessage().setHeader(MAIL_SUBJECT, "Null Body Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage().getRaw()); + } + + @Test + void testDraftWithoutThreadId() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("New conversation"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "New Thread"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNull(draft.getMessage().getThreadId()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("Subject: New Thread")); + assertTrue(decodedMessage.contains("New conversation")); + } + + @Test + void testDraftWithHtmlBodyRequiresExplicitContentType() throws Exception { + Exchange exchange = new DefaultExchange(context); + String htmlBody = "<html><body><h1>Hello</h1><p>This is HTML</p></body></html>"; + exchange.getMessage().setBody(htmlBody); + exchange.getMessage().setHeader(MAIL_SUBJECT, "HTML Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + // Without explicit Content-Type header, defaults to text/plain even for HTML-like body + assertTrue(decodedMessage.contains("text/plain")); + } + + @Test + void testDraftWithHtmlBodyAndExplicitHtmlContentType() throws Exception { + Exchange exchange = new DefaultExchange(context); + String htmlBody = "<html><body><h1>Hello</h1><p>This is HTML</p></body></html>"; + exchange.getMessage().setBody(htmlBody); + exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "text/html; charset=UTF-8"); + exchange.getMessage().setHeader(MAIL_SUBJECT, "HTML Test"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("text/html")); + assertTrue(decodedMessage.contains(htmlBody)); Review Comment: optional: using AssertJ assertions allows to have a better error message in case of failure. Not just only true/false but the expected text and what searched inside. ########## components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/transform/GoogleMailDraftDataTypeTransformerTest.java: ########## @@ -0,0 +1,445 @@ +/* + * 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.component.google.mail.transform; + +import java.nio.charset.StandardCharsets; + +import jakarta.mail.internet.MimeUtility; + +import com.google.api.client.util.Base64; +import com.google.api.services.gmail.model.Draft; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.spi.DataType; +import org.apache.camel.support.DefaultExchange; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_BCC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_CC; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_FROM; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_MESSAGE_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_SUBJECT; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_THREAD_ID; +import static org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants.MAIL_TO; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class GoogleMailDraftDataTypeTransformerTest extends CamelTestSupport { + + private GoogleMailDraftDataTypeTransformer transformer; + + @Override + protected CamelContext createCamelContext() throws Exception { + return new DefaultCamelContext(); + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + @Override + public void configure() { + from("direct:input") + .transformDataType("google-mail:draft") + .to("mock:result"); + } + }; + } + + @Override + protected void doPostSetup() { + transformer = new GoogleMailDraftDataTypeTransformer(); + transformer.setCamelContext(context); + } + + @Test + void testBasicDraftCreation() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("This is a test draft message"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + Draft draft = exchange.getMessage().getBody(Draft.class); + assertNotNull(draft); + assertNotNull(draft.getMessage()); + assertNotNull(draft.getMessage().getRaw()); + + String decodedMessage = decodeMessage(draft.getMessage().getRaw()); + assertTrue(decodedMessage.contains("This is a test draft message")); + assertTrue(decodedMessage.contains("Content-Type: text/plain; charset=UTF-8")); Review Comment: optional: using AssertJ assertions allows to have a better error message in case of failure. Not just only true/false but the expected text and what searched inside. -- 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]
