Merge code comments

Author: annahileta

src/main/java/com/docusign/controller/connectedFields/examples/AbstractConnectedFieldsController.java

@@ -56,12 +56,8 @@ protected static ApiClient createApiClient(
      * @return an instance of the {@link EnvelopesApi}
      */
     protected EnvelopesApi createEnvelopesApi(String basePath, String userAccessToken) {
-    //ds-snippet-start:ConnectedFields1Step6
-
         ApiClient apiClient = createApiClient(userAccessToken, basePath);
         return new EnvelopesApi(apiClient);
-    //ds-snippet-end:ConnectedFields1Step6
-
     }
 
     protected String getExamplePagesPath() {

src/main/java/com/docusign/controller/connectedFields/services/SetConnectedFieldsService.java

@@ -33,7 +33,7 @@ public static EnvelopeSummary signingViaEmail(
 		return envelopesApi.createEnvelope(accountId, envelope);
 	}
 
-	// ds-snippet-start:ConnectedFields1Step3
+	//ds-snippet-start:ConnectedFields1Step3
 	public static ConnectedFieldsApiGetTabGroupsResponse getConnectedFieldsTabGroups(String accountId,
 			String accessToken) throws Exception {
 		return IamClient.builder()
@@ -45,9 +45,9 @@ public static ConnectedFieldsApiGetTabGroupsResponse getConnectedFieldsTabGroups
 				.accountId(accountId)
 				.call();
 	}
-	// ds-snippet-end:ConnectedFields1Step3
+	//ds-snippet-end:ConnectedFields1Step3
 
-	// ds-snippet-start:ConnectedFields1Step4
+	//ds-snippet-start:ConnectedFields1Step5
 	public static EnvelopeDefinition makeEnvelope(String signerEmail, String signerName, TabInfo selectedApp)
 			throws Exception {
 		String appId = selectedApp.appId();
@@ -147,8 +147,9 @@ public static EnvelopeDefinition makeEnvelope(String signerEmail, String signerN
 
 		return envelopeDefinition;
 	}
-	// ds-snippet-end:ConnectedFields1Step5
+	//ds-snippet-end:ConnectedFields1Step5
 
+	//ds-snippet-start:ConnectedFields1Step4
 	public static List<TabInfo> filterData(ConnectedFieldsApiGetTabGroupsResponse connectedFields) {
 		List<TabInfo> filteredList = new ArrayList<>();
 
@@ -179,4 +180,5 @@ public static TabInfo findAppById(List<TabInfo> extensionApps, String appId) {
 				.findFirst()
 				.orElse(null);
 	}
+	//ds-snippet-end:ConnectedFields1Step4
 }

src/main/java/com/docusign/controller/navigator/examples/Nav001ListAgreementsController.java

@@ -24,13 +24,15 @@ public Nav001ListAgreementsController(DSConfiguration config, Session session, U
     }
 
     @Override
+    //ds-snippet-start:Navigator1Step3
     protected Object doWork(WorkArguments args, ModelMap model, HttpServletResponse response) throws Exception {
         var accountId = session.getAccountId();
         var accessToken = user.getAccessToken();
 
         var agreements = NavigatorMethodsService.getAgreements(accountId, accessToken);
         var agreementsData = agreements.agreementsResponse().orElseThrow().data().orElseThrow();
         var jsonAgreements = NavigatorMethodsService.serializeObjectToJson(agreementsData);
+    //ds-snippet-end:Navigator1Step3
 
         DoneExample.createDefault(getTextForCodeExampleByApiType().ExampleName)
                 .withMessage(getTextForCodeExampleByApiType().ResultsPageText)

src/main/java/com/docusign/controller/navigator/examples/Nav002GetSingleAgreementController.java

@@ -48,13 +48,15 @@ protected void onInitModel(WorkArguments args, ModelMap model) throws Exception
     }
 
     @Override
+    //ds-snippet-start:Navigator2Step3
     protected Object doWork(WorkArguments args, ModelMap model, HttpServletResponse response) throws Exception {
         var accountId = session.getAccountId();
         var accessToken = user.getAccessToken();
         var agreementId = args.getAgreementId();
 
         var agreement = NavigatorMethodsService.getAgreement(accountId, accessToken, agreementId);
         var jsonAgreement = NavigatorMethodsService.serializeObjectToJson(agreement.agreement().orElseThrow());
+    //ds-snippet-end:Navigator2Step3
 
         DoneExample.createDefault(getTextForCodeExampleByApiType().ExampleName)
                 .withMessage(getTextForCodeExampleByApiType().ResultsPageText)

src/main/java/com/docusign/controller/navigator/services/NavigatorMethodsService.java

@@ -8,13 +8,15 @@
 import org.openapitools.jackson.nullable.JsonNullableModule;
 
 public class NavigatorMethodsService {
-
 	private static final Integer AGREEMENTS_LIMIT = 25;
+
+	//ds-snippet-start:NavigatorJavaStep2
 	private static IamClient createIamClient(String accessToken) {
 		return IamClient.builder()
 				.accessToken(accessToken)
 				.build();
 	}
+	//ds-snippet-end:NavigatorJavaStep2
 
 	public static GetAgreementsListResponse getAgreements(String accountId, String accessToken) throws Exception {
 		return createIamClient(accessToken)