APP-1864. Upgrade guava to 17.0 from 15.0.

OneSpan · Jul 18, 2016 · 8e6cadc · 8e6cadc
1 parent b795a47
commit 8e6cadc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -256,7 +256,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>15.0</version>
+            <version>17.0</version>
         </dependency>
         <dependency>
             <groupId>org.littleshoot</groupId>

diff --git a/sdk/src/main/java/com/silanis/esl/sdk/examples/CreatePackageFromTemplateExample.java b/sdk/src/main/java/com/silanis/esl/sdk/examples/CreatePackageFromTemplateExample.java
@@ -36,7 +36,7 @@ public static void main(String... args) {
 
     @Override
     public void execute() {
-        DocumentPackage template = PackageBuilder.newPackageNamed("Template")
+        DocumentPackage template = PackageBuilder.newPackageNamed("Template " + getPackageName())
                 .describedAs("first message")
                 .withEmailMessage(PACKAGE_EMAIL_MESSAGE)
                 .withSigner(newSignerWithEmail(email1)

diff --git a/...ain/java/com/silanis/esl/sdk/examples/CreatePackageFromTemplateWithAttachmentExample.java b/...ain/java/com/silanis/esl/sdk/examples/CreatePackageFromTemplateWithAttachmentExample.java
@@ -39,7 +39,7 @@ public static void main(String... args) {
 
     @Override
     public void execute() {
-        DocumentPackage template = PackageBuilder.newPackageNamed("Template")
+        DocumentPackage template = PackageBuilder.newPackageNamed("Template " + getPackageName())
              .describedAs("first message")
              .withEmailMessage(PACKAGE_EMAIL_MESSAGE)
              .withSigner(SignerBuilder.newSignerPlaceholder(new Placeholder(PLACEHOLDER_ID)))

diff --git a/sdk/src/main/java/com/silanis/esl/sdk/examples/CreateTemplateFromPackageExample.java b/sdk/src/main/java/com/silanis/esl/sdk/examples/CreateTemplateFromPackageExample.java
@@ -15,14 +15,16 @@ public class CreateTemplateFromPackageExample extends SDKSample {
 
     public static final String DOCUMENT_NAME = "First Document";
     public static final String DOCUMENT_ID = "doc1";
-    public static final String PACKAGE_NAME_NEW = "Template name";
+    public static final String PACKAGE_NAME_NEW = "Template ";
     public static final String PACKAGE_DESCRIPTION = "This is a package created using the e-SignLive SDK";
     public static final String PACKAGE_EMAIL_MESSAGE = "This message should be delivered to all signers";
     public static final String PACKAGE_SIGNER1_FIRST = "John";
     public static final String PACKAGE_SIGNER1_LAST = "Smith";
     public static final String PACKAGE_SIGNER2_FIRST = "Patty";
     public static final String PACKAGE_SIGNER2_LAST = "Galant";
+
     public PackageId templateId;
+    public String newPackageName = "New " + getPackageName();
 
     public static void main(String... args) {
         new CreateTemplateFromPackageExample().run();
@@ -48,6 +50,6 @@ public void execute() {
                 .build();
 
         packageId = eslClient.createPackage(superDuperPackage);
-        templateId = eslClient.getTemplateService().createTemplateFromPackage(packageId, PACKAGE_NAME_NEW);
+        templateId = eslClient.getTemplateService().createTemplateFromPackage(packageId, newPackageName);
     }
 }
diff --git a/tester/src/test/java/com/silanis/esl/sdk/examples/CreateTemplateFromPackageExampleTest.java b/tester/src/test/java/com/silanis/esl/sdk/examples/CreateTemplateFromPackageExampleTest.java
@@ -6,7 +6,6 @@
 
 import static com.silanis.esl.sdk.examples.CreateTemplateFromPackageExample.DOCUMENT_ID;
 import static com.silanis.esl.sdk.examples.CreateTemplateFromPackageExample.DOCUMENT_NAME;
-import static com.silanis.esl.sdk.examples.CreateTemplateFromPackageExample.PACKAGE_NAME_NEW;
 import static com.silanis.esl.sdk.examples.CreateTemplateFromPackageExample.PACKAGE_SIGNER1_FIRST;
 import static com.silanis.esl.sdk.examples.CreateTemplateFromPackageExample.PACKAGE_SIGNER1_LAST;
 import static com.silanis.esl.sdk.examples.CreateTemplateFromPackageExample.PACKAGE_SIGNER2_FIRST;
@@ -30,7 +29,7 @@ public void verifyResult() {
         assertThat("Document name is incorrectly returned.", document.getName(), is(DOCUMENT_NAME));
         assertThat("Document ID is incorrectly returned.", document.getId().toString(), is(DOCUMENT_ID));
 
-        assertThat("Package name is incorrectly returned.", retrievedTemplate.getName(), is(PACKAGE_NAME_NEW));
+        assertThat("Package name is incorrectly returned.", retrievedTemplate.getName(), is(example.newPackageName));
         assertThat("Number of package signers is incorrectly returned.", retrievedTemplate.getSigners().size(), is(3));
         assertThat("Package signer 1 first name is incorrectly returned.", retrievedTemplate.getSigner(example.email1).getFirstName(), is(PACKAGE_SIGNER1_FIRST));
         assertThat("Package signer 1 last name is incorrectly returned.", retrievedTemplate.getSigner(example.email1).getLastName(), is(PACKAGE_SIGNER1_LAST));