DEVEXP-631: rename auto subscribe to user consent

tutorials/compile.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-(cd sms/auto-subscribe-app && mvn clean package)
+(cd sms/user-consent-app    && mvn clean package)
 (cd voice/capture-leads-app && mvn clean package)

tutorials/sms/auto-subscribe-app/README.md → tutorials/sms/user-consent-app/README.md

@@ -1,6 +1,6 @@
-# auto-subscribe application sample
+# user-consent application sample
 
-This directory contains sample related to Java SDK tutorials: [auto-subscribe](https://developers.sinch.com/docs/sms/tutorials/sms/tutorials/java-sdk/auto-subscribe)
+This directory contains sample related to Java SDK tutorials: [user-consent](https://developers.sinch.com/docs/sms/tutorials/sms/tutorials/java-sdk/user-consent)
 
 ## Requirements
 

tutorials/sms/auto-subscribe-app/pom.xml → tutorials/sms/user-consent-app/pom.xml

@@ -11,10 +11,10 @@
   </parent>
 
   <groupId>my.company.com</groupId>
-  <artifactId>sinch-sdk-java-tuturial-auto-subscribe</artifactId>
+  <artifactId>sinch-sdk-java-tuturial-user-consent</artifactId>
   <version>0.0.1-SNAPSHOT</version>
-  <name>Sinch Java SDK auto-subscribe Sample Application</name>
-  <description>Demo Project for auto-subscribe</description>
+  <name>Sinch Java SDK user consent Sample Application</name>
+  <description>Demo Project for user consent</description>
 
   <properties>
     <sinch.sdk.java.version>[1.0.0,)</sinch.sdk.java.version>

tutorials/sms/auto-subscribe-app/src/main/java/com/mycompany/app/Config.java → tutorials/sms/user-consent-app/src/main/java/com/mycompany/app/Config.java

@@ -19,17 +19,18 @@ public class Config {
   @Value("${credentials.key-secret}")
   String keySecret;
 
+  @Value("${sms.region}")
+  String smsRegion;
+
   @Bean
   public SMSService smsService() {
 
-    var configuration =
-        Configuration.builder()
-            .setProjectId(projectId)
-            .setKeyId(keyId)
-            .setKeySecret(keySecret)
-            .setSmsRegion(SMSRegion.US)
-            .build();
+    var builder =
+        Configuration.builder().setProjectId(projectId).setKeyId(keyId).setKeySecret(keySecret);
 
-    return new SinchClient(configuration).sms();
+    if (!smsRegion.isEmpty()) {
+      builder.setSmsRegion(SMSRegion.from(smsRegion));
+    }
+    return new SinchClient(builder.build()).sms();
   }
 }

tutorials/sms/auto-subscribe-app/src/main/java/com/mycompany/app/AutoSubscribeController.java → tutorials/sms/user-consent-app/src/main/java/com/mycompany/app/UserConsentController.java

@@ -10,13 +10,13 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class AutoSubscribeController {
+public class UserConsentController {
 
   private final SMSService smsService;
-  private final AutoSubscribeService service;
+  private final UserConsentService service;
 
   @Autowired
-  public AutoSubscribeController(SMSService smsService, AutoSubscribeService service) {
+  public UserConsentController(SMSService smsService, UserConsentService service) {
     this.smsService = smsService;
     this.service = service;
   }
@@ -30,8 +30,6 @@ public void smsDeliveryEvent(@RequestBody String body) {
     // let business layer process the request
     if (Objects.requireNonNull(event) instanceof InboundText e) {
       service.processInboundEvent(e);
-    } else {
-      throw new IllegalStateException("Unexpected value: " + event);
     }
   }
 }

tutorials/sms/auto-subscribe-app/src/main/java/com/mycompany/app/AutoSubscribeService.java → tutorials/sms/user-consent-app/src/main/java/com/mycompany/app/UserConsentService.java

@@ -12,9 +12,9 @@
 import org.springframework.stereotype.Service;
 
 @Service
-public class AutoSubscribeService {
+public class UserConsentService {
 
-  private static final Logger LOGGER = Logger.getLogger(AutoSubscribeService.class.getName());
+  private static final Logger LOGGER = Logger.getLogger(UserConsentService.class.getName());
 
   static final String SUBSCRIBE_ACTION = "SUBSCRIBE";
   static final String STOP_ACTION = "STOP";
@@ -23,7 +23,7 @@ public class AutoSubscribeService {
   private final Group group;
 
   @Autowired
-  public AutoSubscribeService(SMSService smsService, GroupManager groupManager) {
+  public UserConsentService(SMSService smsService, GroupManager groupManager) {
     this.smsService = smsService;
     this.group = groupManager.getGroup();
   }
@@ -39,7 +39,7 @@ public void processInboundEvent(InboundText event) {
     var membersList = getMembersList(group);
     var isMemberInGroup = isMemberInGroup(membersList, from);
 
-    String response = processAction(from, to, action, membersList, isMemberInGroup);
+    String response = processAction(from, to, action, isMemberInGroup);
 
     sendResponse(to, from, response);
   }
@@ -52,20 +52,15 @@ private boolean isMemberInGroup(Collection<String> membersList, String member) {
     return membersList.contains(member);
   }
 
-  private String processAction(
-      String from,
-      String to,
-      String action,
-      Collection<String> membersList,
-      boolean isMemberInGroup) {
+  private String processAction(String from, String to, String action, boolean isMemberInGroup) {
 
     if (SUBSCRIBE_ACTION.equals(action)) {
       return subscribe(group, isMemberInGroup, to, from);
     } else if (STOP_ACTION.equals(action)) {
       return unsubscribe(group, isMemberInGroup, to, from);
     }
 
-    return unknwownAction(isMemberInGroup, to);
+    return unknownAction(isMemberInGroup, to);
   }
 
   private String subscribe(
@@ -100,7 +95,7 @@ private String unsubscribe(
         .formatted(group.getName(), SUBSCRIBE_ACTION, groupPhoneNumber);
   }
 
-  private String unknwownAction(boolean isMemberInGroup, String to) {
+  private String unknownAction(boolean isMemberInGroup, String to) {
 
     String message =
         isMemberInGroup

tutorials/sms/auto-subscribe-app/src/main/resources/application.yaml → tutorials/sms/user-consent-app/src/main/resources/application.yaml

@@ -10,5 +10,8 @@ server:
 credentials:
   project-id:
   key-id:
-  key-secret: 
+  key-secret:
 
+# Set a value if not using the default "us" region
+sms:
+  region: