Merging in changes from PR #81 - Added text field to TemplatePreviewData

Author: Chris Wilson

apps/sparkpost-documentor-app/pom.xml

@@ -68,7 +68,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.5</version>
+			<!-- <version>2.4</version> -->
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>

apps/sparkpost-javamail-app/pom.xml

@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>1.3.2</version>
+			<!-- <version>1.3.2</version> -->
 		</dependency>
 
 		<dependency>

apps/sparkpost-samples-app/pom.xml

@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>1.3.2</version>
+			<!-- <version>1.3.2</version> -->
 		</dependency>
 		<dependency>
 		    <groupId>org.json</groupId>

apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/PreviewTemplateSample.java

@@ -42,14 +42,14 @@ public static void main(String[] args) throws SparkPostException, IOException {
     }
 
     private void runApp() throws SparkPostException, IOException {
-        client = this.newConfiguredClient();
+        this.client = this.newConfiguredClient();
         String template = this.getTemplate("richContent.html");
         createTemplate(template, SAMPLE_TEMPLATE_NAME);
     }
 
     /**
      * Demonstrates how to store an email template in SparkPost
-     * 
+     *
      * @throws SparkPostException
      */
     public void createTemplate(String html, String name) throws SparkPostException {
@@ -62,11 +62,12 @@ public void createTemplate(String html, String name) throws SparkPostException {
         TemplateContentAttributes content = new TemplateContentAttributes();
 
         content.setSubject("Template Test");
-        content.setFrom(new AddressAttributes(client.getFromEmail(), "me", null));
+        content.setFrom(new AddressAttributes(this.client.getFromEmail(), "me", null));
         content.setHtml(html);
+        content.setText("Template Test Text");
         template.setContent(content);
 
-        IRestConnection connection = new RestConnection(client, getEndPoint());
+        IRestConnection connection = new RestConnection(this.client, getEndPoint());
         try {
             TemplateCreateResponse response = ResourceTemplates.create(connection, template);
             String templateId = response.getResults().getId();
@@ -88,7 +89,7 @@ private void showTemplatePreview(String templateId, IRestConnection connection)
         saveToFile(response.getResults().getHtml(), path);
 
         try {
-            openWebpage(new URI("file://" + path));
+            PreviewTemplateSample.openWebpage(new URI("file://" + path));
         } catch (URISyntaxException e) {
             e.printStackTrace();
         }

libs/sparkpost-lib/src/main/java/com/sparkpost/model/responses/TemplatePreviewResponse.java

@@ -22,6 +22,9 @@ public static final class TemplatePreviewData {
 
         @Description(value = "", sample = {""})
         private String html;
+
+        @Description(value = "", sample = {""})
+        private String text;
     }
 
     @Description(value = "", sample = {""})

pom.xml

@@ -162,6 +162,30 @@
 					</configuration>
 				</plugin>
 
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.codehaus.mojo</groupId>
+										<artifactId>findbugs-maven-plugin</artifactId>
+										<versionRange>[3.0.2,)</versionRange>
+										<goals>
+											<goal>check</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 
@@ -240,7 +264,7 @@
 			<dependency>
 				<groupId>org.projectlombok</groupId>
 				<artifactId>lombok</artifactId>
-				<version>1.16.6</version>
+				<version>1.16.20</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>

tools/bin/setupLombok.sh

@@ -2,4 +2,4 @@
 # This requires that you have built the project with Maven at least onece
 #
 
-java -jar ~/.m2/repository/org/projectlombok/lombok/1.16.6/lombok-1.16.6.jar
+java -jar ~/.m2/repository/org/projectlombok/lombok/1.16.20/lombok-1.16.20.jar