Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve mail test coverage #3674 #3685

Merged
merged 2 commits into from
Apr 7, 2022
Merged

Improve mail test coverage #3674 #3685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87d5ee6
Improve mail test coverage #3674
JiriOndrusek Apr 5, 2022
2bce0ac
Auto-generated files
JiriOndrusek Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
58 changes: 49 additions & 9 deletions integration-tests/mail/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,18 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-direct</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-seda</artifactId>
</dependency>

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.mock-javamail</groupId>
<artifactId>mock-javamail</artifactId>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-jsonb</artifactId>
</dependency>

<!-- test dependencies -->
Expand All @@ -66,7 +64,38 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit4-mock</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -143,6 +172,17 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>skip-testcontainers-tests</id>
<activation>
<property>
<name>skip-testcontainers-tests</name>
</property>
</activation>
<properties>
<skipTests>true</skipTests>
</properties>
</profile>
</profiles>


Expand Down
188 changes: 181 additions & 7 deletions ...ation-tests/mail/src/main/java/org/apache/camel/quarkus/component/mail/CamelResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,44 +16,129 @@
*/
package org.apache.camel.quarkus.component.mail;

import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javax.activation.FileDataSource;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.inject.Named;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.mail.util.ByteArrayDataSource;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;

import com.sun.mail.imap.SortTerm;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.ServiceStatus;
import org.apache.camel.attachment.AttachmentMessage;
import org.apache.camel.attachment.DefaultAttachment;
import org.apache.camel.component.mail.DefaultJavaMailSender;
import org.apache.camel.component.mail.JavaMailSender;
import org.apache.camel.component.mail.MailSorter;

@Path("/mail")
@ApplicationScoped
public class CamelResource {

@Inject
ProducerTemplate template;
ProducerTemplate producerTemplate;

@Inject
CamelContext camelContext;

@Inject
@Named("mailReceivedMessages")
List<Map<String, Object>> mailReceivedMessages;

@Path("/send")
@POST
@Consumes(MediaType.TEXT_PLAIN)
public void sendMail(
@QueryParam("subject") String subject,
@QueryParam("from") String from,
@QueryParam("to") String to,
@QueryParam("secured") Boolean secured,
String body) {

String path = (secured != null && secured) ? "sendMailSecured" : "sendMail";
producerTemplate.send("direct:" + path, exchange -> {
org.apache.camel.Message message = exchange.getMessage();
message.setHeader("Subject", subject);
message.setHeader("From", from);
message.setHeader("To", to);
message.setBody(body);
});
}

@Path("/send/attachment/{fileName}")
@POST
@Consumes(MediaType.TEXT_PLAIN)
public void sendMailWithAttachment(
@PathParam("fileName") String fileName,
@QueryParam("subject") String subject,
@QueryParam("from") String from,
@QueryParam("to") String to,
String body) {

producerTemplate.send("direct:sendMail", exchange -> {
AttachmentMessage in = exchange.getMessage(AttachmentMessage.class);

DefaultAttachment attachment;
if (fileName.startsWith("/")) {
attachment = new DefaultAttachment(new FileDataSource(fileName));
} else {
attachment = new DefaultAttachment(
new ByteArrayDataSource(
Thread.currentThread().getContextClassLoader().getResourceAsStream("data/" + fileName),
"image/jpeg"));
}

in.addAttachmentObject(fileName, attachment);

org.apache.camel.Message message = exchange.getMessage();
message.setHeader("Subject", subject);
message.setHeader("From", from);
message.setHeader("To", to);
message.setBody(body);
});
}

@Path("/route/{route}")
@Path("/mimeMultipartUnmarshalMarshal")
@POST
@Consumes(MediaType.TEXT_PLAIN)
@Produces(MediaType.TEXT_PLAIN)
public String route(String statement, @PathParam("route") String route) throws Exception {
return template.requestBody("direct:" + route, statement, String.class);
public String mimeMultipartUnmarshalMarshal(String body) {
return producerTemplate.requestBody("direct:mimeMultipartUnmarshalMarshal", body, String.class);
}

@Path("/mimeMultipartMarshal/{fileName}/{fileContent}")
@POST
@Consumes(MediaType.TEXT_PLAIN)
@Produces(MediaType.TEXT_PLAIN)
public String mimeMultipart(String body, @PathParam("fileName") String fileName,
@PathParam("fileContent") String fileContent) throws Exception {
public String mimeMultipart(
@PathParam("fileName") String fileName,
@PathParam("fileContent") String fileContent,
String body) {

return template.request("direct:mimeMultipartMarshal", e -> {
return producerTemplate.request("direct:mimeMultipartMarshal", e -> {
AttachmentMessage in = e.getMessage(AttachmentMessage.class);
in.setBody(body);
in.setHeader(Exchange.CONTENT_TYPE, "text/plain;charset=iso8859-1;other-parameter=true");
Expand All @@ -67,4 +152,93 @@ public String mimeMultipart(String body, @PathParam("fileName") String fileName,
}).getMessage().getBody(String.class);
}

// ------------------------------------------------

@Path("/getReceived")
@GET
@Produces(MediaType.APPLICATION_JSON)
public List<Map<String, Object>> getReceived() {
return mailReceivedMessages;
}

@Path("/getReceivedAsString")
@GET
@Produces(MediaType.APPLICATION_JSON)
public List<Map<String, Object>> getReceivedAsString() throws MessagingException, IOException {
List<Map<String, Object>> result = new LinkedList();
for (Map<String, Object> email : mailReceivedMessages) {
InputStream is = (InputStream) email.get("convertedStream");
result.add(Collections.singletonMap("body", camelContext.getTypeConverter().convertTo(String.class, is)));
}
mailReceivedMessages.clear();
return result;

}

@Path("/clear")
@GET
public void clear() {
mailReceivedMessages.clear();
}

@GET
@Path("/route/{routeId}/{operation}")
@Produces(MediaType.TEXT_PLAIN)
public String controlRoute(@PathParam("routeId") String routeId, @PathParam("operation") String operation)
throws Exception {
switch (operation) {
case "stop":
camelContext.getRouteController().stopRoute(routeId);
break;
case "start":
camelContext.getRouteController().startRoute(routeId);
break;
case "status":
return camelContext.getRouteController().getRouteStatus(routeId).name();
}
return null;
}

@GET
@Path("/stopConsumers")
@Produces(MediaType.TEXT_PLAIN)
public void stopConsumers()
throws Exception {
Arrays.stream(CamelRoute.Routes.values()).forEach(r -> {
try {
if (camelContext.getRouteController().getRouteStatus(r.name()) == ServiceStatus.Started) {
camelContext.getRouteController().stopRoute(r.name());
}
} catch (Exception e) {
//ignore
}
});
}

@Path("/sort")
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public List<String> sort(List<String> messages) throws Exception {
JavaMailSender sender = new DefaultJavaMailSender();
// inserts new messages
Message[] msgs = new Message[messages.size()];
int i = 0;
for (String msg : messages) {
msgs[i] = new MimeMessage(sender.getSession());
msgs[i].setHeader("Subject", msg);
msgs[i++].setText(msg);
}
MailSorter.sortMessages(msgs, new SortTerm[] {
SortTerm.SUBJECT });

return Stream.of(msgs).map(m -> {
try {
return String.valueOf(m.getContent());
} catch (Exception e) {
return "error";
}
}).collect(Collectors.toList());
}

}