Update Pinpoint email examples to use PinpointEmailClient (#5901)

scmacdon · web-flow · commit 587ee72a1e25 · 2024-01-11T14:52:30.000-07:00
diff --git a/.doc_gen/metadata/pinpoint_metadata.yaml b/.doc_gen/metadata/pinpoint_metadata.yaml
@@ -22,6 +22,9 @@ pinpoint_SendMessages:
             - description: Send an email message.
               snippet_tags:
                 - pinpoint.java2.send_email.main
+            - description: Send an email message with CC values.
+              snippet_tags:
+                - pinpoint.java2.send_emailcc.main    
             - description: Send an SMS message.
               snippet_tags:
                 - pinpoint.java2.sendmsg.main
diff --git a/javav2/example_code/pinpoint/pom.xml b/javav2/example_code/pinpoint/pom.xml
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.21.20</version>
+                <version>2.22.12</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -70,6 +70,13 @@
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>pinpointsmsvoice</artifactId>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/pinpointemail -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>pinpointemail</artifactId>
+            <version>2.22.12</version>
+        </dependency>
+
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>pinpoint</artifactId>
diff --git a/javav2/example_code/pinpoint/src/main/java/com/example/pinpoint/SendEmailMessage.java b/javav2/example_code/pinpoint/src/main/java/com/example/pinpoint/SendEmailMessage.java
@@ -22,6 +22,14 @@
 import software.amazon.awssdk.services.pinpoint.model.MessageRequest;
 import software.amazon.awssdk.services.pinpoint.model.SendMessagesRequest;
 import software.amazon.awssdk.services.pinpoint.model.PinpointException;
+import software.amazon.awssdk.services.pinpointemail.PinpointEmailClient;
+import software.amazon.awssdk.services.pinpointemail.model.Body;
+import software.amazon.awssdk.services.pinpointemail.model.Content;
+import software.amazon.awssdk.services.pinpointemail.model.Destination;
+import software.amazon.awssdk.services.pinpointemail.model.EmailContent;
+import software.amazon.awssdk.services.pinpointemail.model.Message;
+import software.amazon.awssdk.services.pinpointemail.model.SendEmailRequest;
+
 import java.util.HashMap;
 import java.util.Map;
 //snippet-end:[pinpoint.java2.send_email.import]
@@ -40,10 +48,12 @@ public class SendEmailMessage {
     public static String charset = "UTF-8";
 
     // The body of the email for recipients whose email clients support HTML content.
-    static final String htmlBody = "<h1>Amazon Pinpoint test (AWS SDK for Java 2.x)</h1>"
-        + "<p>This email was sent through the <a href='https://aws.amazon.com/pinpoint/'>"
-        + "Amazon Pinpoint</a> Email API using the "
-        + "<a href='https://aws.amazon.com/sdk-for-java/'>AWS SDK for Java 2.x</a>";
+    static final String body = """
+        Amazon Pinpoint test (AWS SDK for Java 2.x)
+                
+        This email was sent through the Amazon Pinpoint Email API using the AWS SDK for Java 2.x
+                
+        """;
 
     public static void main(String[] args) {
         final String usage = """
@@ -52,79 +62,59 @@ public static void main(String[] args) {
 
             Where:
                subject - The email subject to use.
-               appId - The Amazon Pinpoint project/application ID to use when you send this message
                senderAddress - The from address. This address has to be verified in Amazon Pinpoint in the region you're using to send email\s
                toAddress - The to address. This address has to be verified in Amazon Pinpoint in the region you're using to send email\s
             """;
 
-        if (args.length != 4) {
+        if (args.length != 3) {
             System.out.println(usage);
             System.exit(1);
         }
 
         String subject = args[0];
-        String appId = args[1];
-        String senderAddress = args[2];
-        String toAddress = args[3];
+        String senderAddress = args[1];
+        String toAddress = args[2];
         System.out.println("Sending a message");
-        PinpointClient pinpoint = PinpointClient.builder()
+        PinpointEmailClient pinpoint = PinpointEmailClient.builder()
             .region(Region.US_EAST_1)
             .build();
 
-        sendEmail(pinpoint, subject, appId, senderAddress, toAddress);
+        sendEmail(pinpoint, subject, senderAddress, toAddress);
         System.out.println("Email was sent");
         pinpoint.close();
     }
 
-    public static void sendEmail(PinpointClient pinpoint,
-                                 String subject,
-                                 String appId,
-                                 String senderAddress,
-                                 String toAddress) {
-
+    public static void sendEmail(PinpointEmailClient pinpointEmailClient, String subject, String senderAddress, String toAddress) {
         try {
-            Map<String, AddressConfiguration> addressMap = new HashMap<>();
-            AddressConfiguration configuration = AddressConfiguration.builder()
-                .channelType(ChannelType.EMAIL)
-                .build();
-
-            addressMap.put(toAddress, configuration);
-            SimpleEmailPart emailPart = SimpleEmailPart.builder()
-                .data(htmlBody)
-                .charset(charset)
-                .build();
-
-            SimpleEmailPart subjectPart = SimpleEmailPart.builder()
-                .data(subject)
-                .charset(charset)
+            Content content = Content.builder()
+                .data(body)
                 .build();
 
-            SimpleEmail simpleEmail = SimpleEmail.builder()
-                .htmlPart(emailPart)
-                .subject(subjectPart)
+            Body messageBody = Body.builder()
+                .text(content)
                 .build();
 
-            EmailMessage emailMessage = EmailMessage.builder()
-                .body(htmlBody)
-                .fromAddress(senderAddress)
-                .simpleEmail(simpleEmail)
+            Message message = Message.builder()
+                .body(messageBody)
+                .subject(Content.builder().data(subject).build())
                 .build();
 
-            DirectMessageConfiguration directMessageConfiguration = DirectMessageConfiguration.builder()
-                .emailMessage(emailMessage)
+            Destination destination = Destination.builder()
+                .toAddresses(toAddress)
                 .build();
 
-            MessageRequest messageRequest = MessageRequest.builder()
-                .addresses(addressMap)
-                .messageConfiguration(directMessageConfiguration)
+            EmailContent emailContent = EmailContent.builder()
+                .simple(message)
                 .build();
 
-            SendMessagesRequest messagesRequest = SendMessagesRequest.builder()
-                .applicationId(appId)
-                .messageRequest(messageRequest)
+            SendEmailRequest sendEmailRequest = SendEmailRequest.builder()
+                .fromEmailAddress(senderAddress)
+                .destination(destination)
+                .content(emailContent)
                 .build();
 
-            pinpoint.sendMessages(messagesRequest);
+            pinpointEmailClient.sendEmail(sendEmailRequest);
+            System.out.println("Message Sent");
 
         } catch (PinpointException e) {
             System.err.println(e.awsErrorDetails().errorMessage());
diff --git a/javav2/example_code/pinpoint/src/main/java/com/example/pinpoint/SendEmailMessageCC.java b/javav2/example_code/pinpoint/src/main/java/com/example/pinpoint/SendEmailMessageCC.java
@@ -0,0 +1,112 @@
+//snippet-sourcedescription:[SendEmailMessageCC.java demonstrates how to send an email message which includes CC values.]
+//snippet-keyword:[AWS SDK for Java v2]
+//snippet-keyword:[Amazon Pinpoint]
+
+/*
+   Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   SPDX-License-Identifier: Apache-2.0
+*/
+
+package com.example.pinpoint;
+
+//snippet-start:[pinpoint.java2.send_emailcc.main]
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.pinpoint.model.PinpointException;
+import  software.amazon.awssdk.services.pinpointemail.PinpointEmailClient;
+import software.amazon.awssdk.services.pinpointemail.model.Body;
+import software.amazon.awssdk.services.pinpointemail.model.Content;
+import software.amazon.awssdk.services.pinpointemail.model.Destination;
+import software.amazon.awssdk.services.pinpointemail.model.EmailContent;
+import software.amazon.awssdk.services.pinpointemail.model.Message;
+import software.amazon.awssdk.services.pinpointemail.model.SendEmailRequest;
+import java.util.ArrayList;
+
+/**
+ * Before running this Java V2 code example, set up your development environment, including your credentials.
+ *
+ * For more information, see the following documentation topic:
+ *
+ * https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/get-started.html
+ */
+public class SendEmailMessageCC {
+
+    // The body of the email.
+    static final String body = """
+        Amazon Pinpoint test (AWS SDK for Java 2.x)
+                
+        This email was sent through the Amazon Pinpoint Email API using the AWS SDK for Java 2.x
+                
+        """;
+    public static void main(String[] args) {
+        final String usage = """
+
+            Usage:    <subject> <senderAddress> <toAddress> <ccAddress>
+
+            Where:
+               subject - The email subject to use.
+               senderAddress - The from address. This address has to be verified in Amazon Pinpoint in the region you're using to send email\s
+               toAddress - The to address. This address has to be verified in Amazon Pinpoint in the region you're using to send email\s
+               ccAddress - The CC address.
+            """;
+
+        if (args.length != 4) {
+            System.out.println(usage);
+            System.exit(1);
+        }
+
+        String subject = args[0];
+        String senderAddress = args[1];
+        String toAddress = args[2];
+        String ccAddress = args[3];
+
+        System.out.println("Sending a message");
+        PinpointEmailClient pinpoint = PinpointEmailClient.builder()
+            .region(Region.US_EAST_1)
+            .build();
+
+        ArrayList<String> ccList = new ArrayList<>();
+        ccList.add(ccAddress);
+        sendEmail(pinpoint, subject, senderAddress, toAddress, ccList);
+        pinpoint.close();
+    }
+
+    public static void sendEmail(PinpointEmailClient pinpointEmailClient, String subject, String senderAddress, String toAddress, ArrayList<String> ccAddresses) {
+        try {
+            Content content = Content.builder()
+                .data(body)
+                .build();
+
+            Body messageBody = Body.builder()
+                .text(content)
+                .build();
+
+            Message message = Message.builder()
+                .body(messageBody)
+                .subject(Content.builder().data(subject).build())
+                .build();
+
+            Destination destination = Destination.builder()
+                .toAddresses(toAddress)
+                .ccAddresses(ccAddresses)
+                .build();
+
+            EmailContent emailContent = EmailContent.builder()
+                .simple(message)
+                .build();
+
+            SendEmailRequest sendEmailRequest = SendEmailRequest.builder()
+                .fromEmailAddress(senderAddress)
+                .destination(destination)
+                .content(emailContent)
+                .build();
+
+            pinpointEmailClient.sendEmail(sendEmailRequest);
+            System.out.println("Message Sent");
+
+        } catch (PinpointException e) {
+            // Handle exception
+            e.printStackTrace();
+        }
+    }
+}
+//snippet-end:[pinpoint.java2.send_emailcc.main]
diff --git a/javav2/example_code/pinpoint/src/test/java/AmazonPinpointTest.java b/javav2/example_code/pinpoint/src/test/java/AmazonPinpointTest.java
@@ -14,6 +14,7 @@
 import software.amazon.awssdk.services.pinpoint.model.*;
 import java.io.*;
 import com.example.pinpoint.*;
+import software.amazon.awssdk.services.pinpointemail.PinpointEmailClient;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.pinpointsmsvoice.PinpointSmsVoiceClient;
 import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
@@ -29,6 +30,8 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class AmazonPinpointTest {
     private static PinpointClient pinpoint;
+
+    private static PinpointEmailClient pinpointEmailClient;
     private static PinpointSmsVoiceClient voiceClient;
     private static S3Client s3Client;
     private static String appName = "";
@@ -58,6 +61,11 @@ public static void setUp() throws IOException {
             .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
             .build();
 
+        pinpointEmailClient = PinpointEmailClient.builder()
+            .region(Region.US_EAST_1)
+            .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
+            .build();
+
         s3Client = S3Client.builder()
             .region(Region.US_EAST_1)
             .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
@@ -239,7 +247,7 @@ public void ExportEndpoints() {
     @Tag("IntegrationTest")
     @Order(14)
     public void SendEmailMessage() {
-        assertDoesNotThrow(() -> SendEmailMessage.sendEmail(pinpoint, subject, existingApplicationId,  senderAddress, toAddress));
+        assertDoesNotThrow(() -> SendEmailMessage.sendEmail(pinpointEmailClient, subject,  senderAddress, toAddress));
         System.out.println("SendEmailMessage test passed");
    }
 
