Updates for the second Click code example (#95)

* added ability to work with both draft and inactive objectives

* updated sdk versions

---------

Co-authored-by: Aaron Wilde <52012222+AaronWDS@users.noreply.github.com>

Author: annahileta

pom.xml

@@ -25,6 +25,7 @@
         <java.version>11</java.version>
         <oauth2.version>2.5.6</oauth2.version>
         <commonsio.version>2.11.0</commonsio.version>
+
         <esignature.version>4.3.0</esignature.version>
         <rooms.version>1.4.2</rooms.version>
         <click.version> 1.4.0</click.version>
@@ -33,6 +34,7 @@
         <swagger-core-version>2.2.8</swagger-core-version>
         <jackson-version>2.14.2</jackson-version>
         <jersey2.version>3.0.9</jersey2.version>
+
     </properties>
 
 
@@ -157,7 +159,6 @@
             <groupId>com.docusign</groupId>
             <artifactId>docusign-esign-java</artifactId>
             <version>${esignature.version}</version>
-            <classifier>shaded</classifier>
         </dependency>
 
         <dependency>

src/main/java/com/docusign/controller/click/examples/C002ControllerActivateClickwrap.java

@@ -40,8 +40,16 @@ public C002ControllerActivateClickwrap(DSConfiguration config, Session session,
     protected void onInitModel(WorkArguments args, ModelMap model) throws Exception {
         super.onInitModel(args, model);
         AccountsApi accountsApi = createAccountsApiClient(this.session.getBasePath(), this.user.getAccessToken());
-        ClickwrapVersionsResponse clickwraps = ActivateClickwrapService.getInactiveClickwraps(accountsApi, this.session.getAccountId());
-        model.addAttribute(MODEL_CLICKWRAPS, clickwraps);
+        ClickwrapVersionsResponse inactiveClickwraps = ActivateClickwrapService.getClickwrapsByStatus(
+                accountsApi,
+                this.session.getAccountId(),
+                "inactive");
+        ClickwrapVersionsResponse draftClickwraps = ActivateClickwrapService.getClickwrapsByStatus(
+                accountsApi,
+                this.session.getAccountId(),
+                "draft");
+        inactiveClickwraps.getClickwraps().addAll(draftClickwraps.getClickwraps());
+        model.addAttribute(MODEL_CLICKWRAPS, inactiveClickwraps);
     }
 
     @Override

src/main/java/com/docusign/controller/click/examples/C006ControllerEmbedClickwrap.java

@@ -40,7 +40,7 @@ protected void onInitModel(WorkArguments args, ModelMap model) throws Exception
         super.onInitModel(args, model);
         AccountsApi accountsApi = createAccountsApiClient(this.session.getBasePath(), this.user.getAccessToken());
         ClickwrapVersionsResponse clickwraps = EmbedClickwrapService.getActiveClickwraps(accountsApi, this.session.getAccountId());
-        ClickwrapVersionsResponse inactiveClickwraps = ActivateClickwrapService.getInactiveClickwraps(accountsApi, this.session.getAccountId());
+        ClickwrapVersionsResponse inactiveClickwraps = ActivateClickwrapService.getClickwrapsByStatus(accountsApi, this.session.getAccountId(), "inactive");
         Boolean hasInactiveClickraps = (inactiveClickwraps.getClickwraps().size() > 0);
         model.addAttribute(MODEL_CLICKWRAPS, clickwraps);
         model.addAttribute("hasInactiveClickraps", hasInactiveClickraps);

src/main/java/com/docusign/controller/click/services/ActivateClickwrapService.java

@@ -25,12 +25,13 @@ public static ClickwrapVersionSummaryResponse activateClickwrap(
                 clickwrapRequest);
     }
 
-    public static ClickwrapVersionsResponse getInactiveClickwraps(
+    public static ClickwrapVersionsResponse getClickwrapsByStatus(
             AccountsApi accountsApi,
-            String accountId
+            String accountId,
+            String status
     ) throws ApiException{
         AccountsApi.GetClickwrapsOptions options = accountsApi.new GetClickwrapsOptions();
-        options.setStatus("inactive");
+        options.setStatus(status);
         return accountsApi.getClickwraps(accountId, options);
     }
 }