Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

refactor(ses): split the template endpoints into SesTemplateController (#3671)

Kenshin Okinakaff1c93051994
diff --git a/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java b/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java
index b45fa57570..436d2c6591 100644
--- a/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java
+++ b/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java
@@ -34,6 +34,7 @@ import io.github.hectorvent.floci.services.cloudfront.CloudFrontController;
import io.github.hectorvent.floci.services.cloudfront.CloudFrontServingController;
import io.github.hectorvent.floci.services.route53.Route53Controller;
import io.github.hectorvent.floci.services.ses.SesController;
+import io.github.hectorvent.floci.services.ses.SesTemplateController;
import io.github.hectorvent.floci.services.appsync.AppSyncController;
import io.github.hectorvent.floci.services.rdsdata.RdsDataController;
import io.github.hectorvent.floci.services.guardduty.GuardDutyController;
@@ -284,7 +285,8 @@ public class ResolvedServiceCatalog {
descriptor("email", "ses", config.services().ses().enabled(), true,
"ses", config.storage().mode(), 5000L, AwsNamespaces.SES, ServiceProtocol.REST_JSON,
protocols(ServiceProtocol.REST_JSON, ServiceProtocol.QUERY),
- Set.of(), Set.of("email", "ses", "sesv2"), Set.of(), Set.of(SesController.class)),
+ Set.of(), Set.of("email", "ses", "sesv2"), Set.of(),
+ Set.of(SesController.class, SesTemplateController.class)),
descriptor("es", "opensearch", config.services().opensearch().enabled(), true,
"opensearch", storageMode(config.storage().services().opensearch().mode(), config.storage().mode()),
config.storage().services().opensearch().flushIntervalMs(), null, ServiceProtocol.REST_JSON,
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesController.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesController.java
index 280d0ee88c..cfdd546481 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesController.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesController.java
@@ -86,13 +86,16 @@ public class SesController {
private static final Logger LOG = Logger.getLogger(SesController.class);
private final SesService sesService;
+ // The bulk send resolves a stored template's content before handing the entries to the facade.
+ private final SesTemplateService templateService;
private final RegionResolver regionResolver;
private final ObjectMapper objectMapper;
@Inject
- public SesController(SesService sesService, RegionResolver regionResolver,
- ObjectMapper objectMapper) {
+ public SesController(SesService sesService, SesTemplateService templateService,
+ RegionResolver regionResolver, ObjectMapper objectMapper) {
this.sesService = sesService;
+ this.templateService = templateService;
this.regionResolver = regionResolver;
this.objectMapper = objectMapper;
}
@@ -665,7 +668,7 @@ public class SesController {
? templateName
: SesTemplateService.templateNameFromArn(templateArn);
gateTemplateName = resolvedName;
- EmailTemplate stored = sesService.getTemplate(resolvedName, region);
+ EmailTemplate stored = templateService.getTemplate(resolvedName, region);
subject = stored.getSubject();
text = stored.getTextPart();
html = stored.getHtmlPart();
@@ -737,8 +740,6 @@ public class SesController {
}
}
- // ──────────────────────────── Templates ────────────────────────────
-
// ──────────────── Custom verification email templates ────────────────
@POST
@@ -1154,125 +1155,6 @@ public class SesController {
return node;
}
- @POST
- @Path("/templates")
- public Response createEmailTemplate(@Context HttpHeaders headers, String body) {
- String region = regionResolver.resolveRegion(headers);
- try {
- JsonNode request = objectMapper.readTree(body);
- String templateName = request.path("TemplateName").asText(null);
- if (templateName == null || templateName.isBlank()) {
- throw new AwsException("BadRequestException", "TemplateName is required.", 400);
- }
- EmailTemplate template = parseTemplateContent(templateName, request.path("TemplateContent"));
- List<Tag> parsedTags = parseTagsArray(request.path("Tags"));
- if (parsedTags != null) {
- template.setTags(parsedTags);
- }
- sesService.createTemplate(template, region);
- LOG.infov("SES V2 CreateEmailTemplate: {0}", templateName);
- return Response.ok(objectMapper.createObjectNode()).build();
- } catch (AwsException e) {
- throw remapV1Exception(e);
- } catch (com.fasterxml.jackson.core.JsonProcessingException e) {
- throw new AwsException("BadRequestException", e.getMessage(), 400);
- }
- }
-
- @GET
- @Path("/templates")
- public Response listEmailTemplates(@Context HttpHeaders headers) {
- String region = regionResolver.resolveRegion(headers);
- List<EmailTemplate> templates = sesService.listTemplates(region);
- ObjectNode result = objectMapper.createObjectNode();
- ArrayNode items = result.putArray("TemplatesMetadata");
- for (EmailTemplate t : templates) {
- ObjectNode item = objectMapper.createObjectNode();
- item.put("TemplateName", t.getTemplateName());
- if (t.getCreatedTimestamp() != null) {
- item.put("CreatedTimestamp", t.getCreatedTimestamp().getEpochSecond());
- }
- items.add(item);
- }
- return Response.ok(result).build();
- }
-
- @GET
- @Path("/templates/{templateName}")
- public Response getEmailTemplate(@Context HttpHeaders headers,
- @PathParam("templateName") String templateName) {
- String region = regionResolver.resolveRegion(headers);
- try {
- EmailTemplate template = sesService.getTemplate(templateName, region);
- return Response.ok(buildTemplateResponse(template)).build();
- } catch (AwsException e) {
- throw remapV1Exception(e);
- }
- }
-
- @PUT
- @Path("/templates/{templateName}")
- public Response updateEmailTemplate(@Context HttpHeaders headers,
- @PathParam("templateName") String templateName,
- String body) {
- String region = regionResolver.resolveRegion(headers);
- try {
- JsonNode request = objectMapper.readTree(body);
- EmailTemplate template = parseTemplateContent(templateName, request.path("TemplateContent"));
- sesService.updateTemplate(template, region);
- LOG.infov("SES V2 UpdateEmailTemplate: {0}", templateName);
- return Response.ok(objectMapper.createObjectNode()).build();
- } catch (AwsException e) {
- throw remapV1Exception(e);
- } catch (com.fasterxml.jackson.core.JsonProcessingException e) {
- throw new AwsException("BadRequestException", e.getMessage(), 400);
- }
- }
-
- @DELETE
- @Path("/templates/{templateName}")
- public Response deleteEmailTemplate(@Context HttpHeaders headers,
- @PathParam("templateName") String templateName) {
- String region = regionResolver.resolveRegion(headers);
- try {
- sesService.deleteTemplate(templateName, region);
- LOG.infov("SES V2 DeleteEmailTemplate: {0}", templateName);
- return Response.ok(objectMapper.createObjectNode()).build();
- } catch (AwsException e) {
- throw remapV1Exception(e);
- }
- }
-
- @POST
- @Path("/templates/{templateName}/render")
- public Response testRenderEmailTemplate(@Context HttpHeaders headers,
- @PathParam("templateName") String templateName,
- String body) {
- String region = regionResolver.resolveRegion(headers);
- try {
- if (body == null || body.isBlank()) {
- throw new AwsException("BadRequestException", "Request body is required.", 400);
- }
- JsonNode request = objectMapper.readTree(body);
- requireJsonObject(request);
- JsonNode templateDataNode = request.path("TemplateData");
- if (!templateDataNode.isMissingNode() && !templateDataNode.isNull()
- && !templateDataNode.isTextual()) {
- throw new AwsException("BadRequestException",
- "TemplateData must be a JSON-encoded string.", 400);
- }
- String templateDataRaw = templateDataNode.asText("");
- String rendered = sesService.renderTestTemplate(templateName, templateDataRaw, region);
- ObjectNode result = objectMapper.createObjectNode();
- result.put("RenderedTemplate", rendered);
- return Response.ok(result).build();
- } catch (AwsException e) {
- throw remapV1Exception(e);
- } catch (com.fasterxml.jackson.core.JsonProcessingException e) {
- throw new AwsException("BadRequestException", e.getMessage(), 400);
- }
- }
-
// ──────────────────────── Configuration Sets ───────────────────────
@POST
@@ -2733,36 +2615,6 @@ public class SesController {
return all;
}
- private EmailTemplate parseTemplateContent(String templateName, JsonNode content) {
- String subject = content.path("Subject").asText(null);
- String text = content.path("Text").asText(null);
- String html = content.path("Html").asText(null);
- return new EmailTemplate(templateName, subject, text, html);
- }
-
- private ObjectNode buildTemplateResponse(EmailTemplate template) {
- ObjectNode result = objectMapper.createObjectNode();
- result.put("TemplateName", template.getTemplateName());
- ObjectNode content = result.putObject("TemplateContent");
- if (template.getSubject() != null) {
- content.put("Subject", template.getSubject());
- }
- if (template.getTextPart() != null) {
- content.put("Text", template.getTextPart());
- }
- if (template.getHtmlPart() != null) {
- content.put("Html", template.getHtmlPart());
- }
- ArrayNode tags = result.putArray("Tags");
- for (Tag t : template.getTags()) {
- ObjectNode tagNode = objectMapper.createObjectNode();
- tagNode.put("Key", t.key());
- tagNode.put("Value", t.value());
- tags.add(tagNode);
- }
- return result;
- }
-
private JsonNode parseTemplateData(JsonNode parent, String fieldName) {
if (parent == null || parent.isMissingNode() || parent.isNull()) {
return objectMapper.createObjectNode();
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java
index 9735fe2e40..cfb1e69d74 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java
@@ -47,14 +47,17 @@ public class SesQueryHandler {
private final SesService sesService;
private final SesReceiptRuleService receiptRuleService;
private final SesIdentityService identityService;
+ private final SesTemplateService templateService;
private final ObjectMapper objectMapper;
@Inject
public SesQueryHandler(SesService sesService, SesReceiptRuleService receiptRuleService,
- SesIdentityService identityService, ObjectMapper objectMapper) {
+ SesIdentityService identityService, SesTemplateService templateService,
+ ObjectMapper objectMapper) {
this.sesService = sesService;
this.receiptRuleService = receiptRuleService;
this.identityService = identityService;
+ this.templateService = templateService;
this.objectMapper = objectMapper;
}
@@ -506,19 +509,19 @@ public class SesQueryHandler {
private Response handleCreateTemplate(MultivaluedMap<String, String> params, String region) {
EmailTemplate template = readTemplateParams(params);
- sesService.createTemplate(template, region);
+ templateService.createTemplate(template, region);
return Response.ok(AwsQueryResponse.envelopeEmptyResult("CreateTemplate", AwsNamespaces.SES)).build();
}
private Response handleUpdateTemplate(MultivaluedMap<String, String> params, String region) {
EmailTemplate template = readTemplateParams(params);
- sesService.updateTemplate(template, region);
+ templateService.updateTemplate(template, region);
return Response.ok(AwsQueryResponse.envelopeEmptyResult("UpdateTemplate", AwsNamespaces.SES)).build();
}
private Response handleGetTemplate(MultivaluedMap<String, String> params, String region) {
String templateName = getParam(params, "TemplateName");
- EmailTemplate template = sesService.getTemplate(templateName, region);
+ EmailTemplate template = templateService.getTemplate(templateName, region);
var xml = new XmlBuilder().start("Template")
.elem("TemplateName", template.getTemplateName());
if (template.getSubject() != null) {
@@ -541,7 +544,7 @@ public class SesQueryHandler {
}
private Response handleListTemplates(String region) {
- List<EmailTemplate> templates = sesService.listTemplates(region);
+ List<EmailTemplate> templates = templateService.listTemplates(region);
var xml = new XmlBuilder().start("TemplatesMetadata");
for (EmailTemplate t : templates) {
xml.start("member")
@@ -595,7 +598,7 @@ public class SesQueryHandler {
throw new AwsException("InvalidParameterValue", "TemplateName is required.", 400);
}
String templateDataRaw = getParam(params, "TemplateData");
- String rendered = sesService.renderTestTemplate(templateName, templateDataRaw, region);
+ String rendered = templateService.renderTestTemplate(templateName, templateDataRaw, region);
// XML 1.0 character data forbids C0 controls except \t \n \r; strip them
// so SDK clients can parse the response when template data injects \x01 etc.
String xmlSafe = stripXml10InvalidChars(rendered);
@@ -698,7 +701,7 @@ public class SesQueryHandler {
"Template or TemplateArn is required.", 400);
}
String resolvedName = hasName ? templateName : SesTemplateService.templateNameFromArn(templateArn);
- EmailTemplate template = sesService.getTemplate(resolvedName, region);
+ EmailTemplate template = templateService.getTemplate(resolvedName, region);
JsonNode defaultTemplateData = parseTemplateData(defaultDataRaw);
List<BulkEmailEntry> entries = new ArrayList<>();
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java
index 0a068bbf98..6bec674f94 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java
@@ -706,30 +706,15 @@ public class SesService {
// ──────────────────────────── Templates ────────────────────────────
- // Email templates live in SesTemplateService; the facade forwards. The templated-send path below
- // reads them back through getTemplate, and ARN-dispatched tagging through find/save.
-
- public EmailTemplate createTemplate(EmailTemplate template, String region) {
- return templateService.createTemplate(template, region);
- }
-
- public EmailTemplate getTemplate(String templateName, String region) {
- return templateService.getTemplate(templateName, region);
- }
-
- public EmailTemplate updateTemplate(EmailTemplate template, String region) {
- return templateService.updateTemplate(template, region);
- }
+ // Email templates live in SesTemplateService, which the v2 controller and the v1 handler call
+ // directly; only the delete stays here for the tenant-association guard. The templated-send
+ // path below reads templates through the service, and ARN-dispatched tagging through find/save.
public void deleteTemplate(String templateName, String region) {
tenantService.deleteBackingResource(SesTenantService.RESOURCE_TYPE_TEMPLATE, templateName,
region, () -> templateService.deleteTemplate(templateName, region));
}
- public List<EmailTemplate> listTemplates(String region) {
- return templateService.listTemplates(region);
- }
-
// ──────────── Custom verification email templates (v1 + v2 shared store) ────────────
// Verified against real AWS: the From address must be a verified identity, redirection URLs
// must be valid, and the template body is not content-validated. Floci enforces the
@@ -1736,17 +1721,13 @@ public class SesService {
String configurationSetName, List<MessageTag> emailTags,
List<MessageHeader> additionalHeaders,
ListManagementOptions listManagement, String region) {
- EmailTemplate template = getTemplate(templateName, region);
+ EmailTemplate template = templateService.getTemplate(templateName, region);
return sendInlineTemplatedEmail(source, toAddresses, ccAddresses, bccAddresses,
replyToAddresses, returnPath, template.getSubject(), template.getTextPart(),
template.getHtmlPart(), templateData,
configurationSetName, emailTags, additionalHeaders, listManagement, region);
}
- public String renderTestTemplate(String templateName, String templateDataRaw, String region) {
- return templateService.renderTestTemplate(templateName, templateDataRaw, region);
- }
-
/**
* Also called by the controller ahead of the tenant send gate: AWS reports an empty inline
* template before it looks the tenant up (probe-confirmed), so the check must not stay behind
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesTemplateController.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesTemplateController.java
new file mode 100644
index 0000000000..0aae97c062
--- /dev/null
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesTemplateController.java
@@ -0,0 +1,209 @@
+package io.github.hectorvent.floci.services.ses;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.github.hectorvent.floci.core.common.AwsException;
+import io.github.hectorvent.floci.core.common.RegionResolver;
+import io.github.hectorvent.floci.services.ses.model.EmailTemplate;
+import io.github.hectorvent.floci.services.ses.model.Tag;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import org.jboss.logging.Logger;
+
+import java.util.List;
+
+import static io.github.hectorvent.floci.services.ses.SesV2Json.parseTagsArray;
+import static io.github.hectorvent.floci.services.ses.SesV2Json.remapV1Exception;
+import static io.github.hectorvent.floci.services.ses.SesV2Json.requireJsonObject;
+
+/**
+ * SES V2 email-template endpoints ({@code /v2/email/templates}), split out of
+ * {@link SesController}. Talks to {@link SesTemplateService} directly; only
+ * {@code DeleteEmailTemplate} goes through the {@link SesService} facade, which wraps the delete in
+ * the tenant-association guard.
+ */
+@Path("/v2/email")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class SesTemplateController {
+
+ private static final Logger LOG = Logger.getLogger(SesTemplateController.class);
+
+ private final SesTemplateService templateService;
+ private final SesService sesService;
+ private final RegionResolver regionResolver;
+ private final ObjectMapper objectMapper;
+
+ @Inject
+ public SesTemplateController(SesTemplateService templateService, SesService sesService,
+ RegionResolver regionResolver, ObjectMapper objectMapper) {
+ this.templateService = templateService;
+ this.sesService = sesService;
+ this.regionResolver = regionResolver;
+ this.objectMapper = objectMapper;
+ }
+
+ @POST
+ @Path("/templates")
+ public Response createEmailTemplate(@Context HttpHeaders headers, String body) {
+ String region = regionResolver.resolveRegion(headers);
+ try {
+ JsonNode request = objectMapper.readTree(body);
+ String templateName = request.path("TemplateName").asText(null);
+ if (templateName == null || templateName.isBlank()) {
+ throw new AwsException("BadRequestException", "TemplateName is required.", 400);
+ }
+ EmailTemplate template = parseTemplateContent(templateName, request.path("TemplateContent"));
+ List<Tag> parsedTags = parseTagsArray(request.path("Tags"));
+ if (parsedTags != null) {
+ template.setTags(parsedTags);
+ }
+ templateService.createTemplate(template, region);
+ LOG.infov("SES V2 CreateEmailTemplate: {0}", templateName);
+ return Response.ok(objectMapper.createObjectNode()).build();
+ } catch (AwsException e) {
+ throw remapV1Exception(e);
+ } catch (JsonProcessingException e) {
+ throw new AwsException("BadRequestException", e.getMessage(), 400);
+ }
+ }
+
+ @GET
+ @Path("/templates")
+ public Response listEmailTemplates(@Context HttpHeaders headers) {
+ String region = regionResolver.resolveRegion(headers);
+ List<EmailTemplate> templates = templateService.listTemplates(region);
+ ObjectNode result = objectMapper.createObjectNode();
+ ArrayNode items = result.putArray("TemplatesMetadata");
+ for (EmailTemplate t : templates) {
+ ObjectNode item = objectMapper.createObjectNode();
+ item.put("TemplateName", t.getTemplateName());
+ if (t.getCreatedTimestamp() != null) {
+ item.put("CreatedTimestamp", t.getCreatedTimestamp().getEpochSecond());
+ }
+ items.add(item);
+ }
+ return Response.ok(result).build();
+ }
+
+ @GET
+ @Path("/templates/{templateName}")
+ public Response getEmailTemplate(@Context HttpHeaders headers,
+ @PathParam("templateName") String templateName) {
+ String region = regionResolver.resolveRegion(headers);
+ try {
+ EmailTemplate template = templateService.getTemplate(templateName, region);
+ return Response.ok(buildTemplateResponse(template)).build();
+ } catch (AwsException e) {
+ throw remapV1Exception(e);
+ }
+ }
+
+ @PUT
+ @Path("/templates/{templateName}")
+ public Response updateEmailTemplate(@Context HttpHeaders headers,
+ @PathParam("templateName") String templateName,
+ String body) {
+ String region = regionResolver.resolveRegion(headers);
+ try {
+ JsonNode request = objectMapper.readTree(body);
+ EmailTemplate template = parseTemplateContent(templateName, request.path("TemplateContent"));
+ templateService.updateTemplate(template, region);
+ LOG.infov("SES V2 UpdateEmailTemplate: {0}", templateName);
+ return Response.ok(objectMapper.createObjectNode()).build();
+ } catch (AwsException e) {
+ throw remapV1Exception(e);
+ } catch (JsonProcessingException e) {
+ throw new AwsException("BadRequestException", e.getMessage(), 400);
+ }
+ }
+
+ @DELETE
+ @Path("/templates/{templateName}")
+ public Response deleteEmailTemplate(@Context HttpHeaders headers,
+ @PathParam("templateName") String templateName) {
+ String region = regionResolver.resolveRegion(headers);
+ try {
+ sesService.deleteTemplate(templateName, region);
+ LOG.infov("SES V2 DeleteEmailTemplate: {0}", templateName);
+ return Response.ok(objectMapper.createObjectNode()).build();
+ } catch (AwsException e) {
+ throw remapV1Exception(e);
+ }
+ }
+
+ @POST
+ @Path("/templates/{templateName}/render")
+ public Response testRenderEmailTemplate(@Context HttpHeaders headers,
+ @PathParam("templateName") String templateName,
+ String body) {
+ String region = regionResolver.resolveRegion(headers);
+ try {
+ if (body == null || body.isBlank()) {
+ throw new AwsException("BadRequestException", "Request body is required.", 400);
+ }
+ JsonNode request = objectMapper.readTree(body);
+ requireJsonObject(request);
+ JsonNode templateDataNode = request.path("TemplateData");
+ if (!templateDataNode.isMissingNode() && !templateDataNode.isNull()
+ && !templateDataNode.isTextual()) {
+ throw new AwsException("BadRequestException",
+ "TemplateData must be a JSON-encoded string.", 400);
+ }
+ String templateDataRaw = templateDataNode.asText("");
+ String rendered = templateService.renderTestTemplate(templateName, templateDataRaw,
+ region);
+ ObjectNode result = objectMapper.createObjectNode();
+ result.put("RenderedTemplate", rendered);
+ return Response.ok(result).build();
+ } catch (AwsException e) {
+ throw remapV1Exception(e);
+ } catch (JsonProcessingException e) {
+ throw new AwsException("BadRequestException", e.getMessage(), 400);
+ }
+ }
+
+ private EmailTemplate parseTemplateContent(String templateName, JsonNode content) {
+ String subject = content.path("Subject").asText(null);
+ String text = content.path("Text").asText(null);
+ String html = content.path("Html").asText(null);
+ return new EmailTemplate(templateName, subject, text, html);
+ }
+
+ private ObjectNode buildTemplateResponse(EmailTemplate template) {
+ ObjectNode result = objectMapper.createObjectNode();
+ result.put("TemplateName", template.getTemplateName());
+ ObjectNode content = result.putObject("TemplateContent");
+ if (template.getSubject() != null) {
+ content.put("Subject", template.getSubject());
+ }
+ if (template.getTextPart() != null) {
+ content.put("Text", template.getTextPart());
+ }
+ if (template.getHtmlPart() != null) {
+ content.put("Html", template.getHtmlPart());
+ }
+ ArrayNode tags = result.putArray("Tags");
+ for (Tag t : template.getTags()) {
+ ObjectNode tagNode = objectMapper.createObjectNode();
+ tagNode.put("Key", t.key());
+ tagNode.put("Value", t.value());
+ tags.add(tagNode);
+ }
+ return result;
+ }
+}