Java 21 Cleanup

docwho2 · Jul 30, 2024 · 737920c · 737920c
1 parent d4349f8
commit 737920c
Show file tree

Hide file tree

Showing 52 changed files with 196 additions and 420 deletions.
diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ActionDataCallUpdateRequest.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ActionDataCallUpdateRequest.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ActionDataStartBotConversation.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ActionDataStartBotConversation.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import cloud.cleo.chimesma.model.ResponseStartBotConversation.*;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ErrorMessage.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ErrorMessage.java
@@ -1,12 +1,5 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Interface.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  *  Types that have just a "error" message set
  * 

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ErrorTypeMessage.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ErrorTypeMessage.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Interface.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ParticipantTag.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ParticipantTag.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ReceivedDigits.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ReceivedDigits.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Interface.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 /**

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseAction.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseAction.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Interface.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseActionType.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseActionType.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Enum.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 /**

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseCallAndBridge.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseCallAndBridge.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import cloud.cleo.chimesma.model.ResponsePlayAudio.AudioSource;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseHangup.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseHangup.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseJoinChimeMeeting.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseJoinChimeMeeting.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/...SMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseModifyChimeMeetingAttendees.java b/...SMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseModifyChimeMeetingAttendees.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponsePause.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponsePause.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponsePauseCallRecording.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponsePauseCallRecording.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponsePlayAudio.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponsePlayAudio.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponsePlayAudioAndGetDigits.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponsePlayAudioAndGetDigits.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 
@@ -53,6 +49,7 @@ public static class Parameters implements Serializable {
 
         @JsonProperty(value = "CallId")
         private String callId;
+
         @JsonProperty(value = "ParticipantTag")
         @Builder.Default
         private ParticipantTag participantTag = ParticipantTag.LEG_A;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseReceiveDigits.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseReceiveDigits.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseRecordAudio.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseRecordAudio.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseResumeCallRecording.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseResumeCallRecording.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseSendDigits.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseSendDigits.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseSpeak.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseSpeak.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -78,18 +74,18 @@ public enum TextType {
      */
     public enum VoiceId {
         Aditi, Adriano, Amy, Andres, Aria, Arlet, Arthur,
-        Astrid, Ayanda, Bianca, Brian, Camila, Carla, Carmen,
-        Celine, Chantal, Conchita, Cristiano, Daniel, Danielle, Dora,
-        Elin, Emma, Enrique, Ewa, Filiz, Gabrielle, Geraint,
-        Giorgio, Gregory, Gwyneth, Hala, Hannah, Hans, Hiujin,
-        Ida, Ines, Isabelle, Ivy, Jacek, Jan, Joanna,
-        Joey, Justin, Kajal, Karl, Kazuha, Kendra, Kevin,
-        Kimberly, Laura, Lea, Liam, Lisa, Liv, Lotte,
-        Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew,
-        Maxim, Mia, Miguel, Mizuki, Naja, Niamh, Nicole,
-        Ola, Olivia, Pedro, Penelope, Raveena, Remi, Ricardo,
-        Ruben, Russell, Ruth, Salli, Seoyeon, Sergio, Sofie,
-        Stephen, Suvi, Takumi, Tatyana, Thiago, Tomoko, Vicki,
-        Vitoria, Zayd, Zeina, Zhiyu
+        Astrid, Ayanda, Bianca, Brian, Burcu, Camila, Carla,
+        Carmen, Celine, Chantal, Conchita, Cristiano, Daniel, Danielle,
+        Dora, Elin, Emma, Enrique, Ewa, Filiz, Gabrielle,
+        Geraint, Giorgio, Gregory, Gwyneth, Hala, Hannah, Hans,
+        Hiujin, Ida, Ines, Isabelle, Ivy, Jacek, Jan,
+        Joanna, Joey, Justin, Kajal, Karl, Kazuha, Kendra,
+        Kevin, Kimberly, Laura, Lea, Liam, Lisa, Liv,
+        Lotte, Lucia, Lupe, Mads, Maja, Marlene, Mathieu,
+        Matthew, Maxim, Mia, Miguel, Mizuki, Naja, Niamh,
+        Nicole, Ola, Olivia, Pedro, Penelope, Raveena, Remi,
+        Ricardo, Ruben, Russell, Ruth, Salli, Seoyeon, Sergio,
+        Sofie, Stephen, Suvi, Takumi, Tatyana, Thiago, Tomoko,
+        Vicki, Vitoria, Zayd, Zeina, Zhiyu
     }
 }
diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseSpeakAndGetDigits.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseSpeakAndGetDigits.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import cloud.cleo.chimesma.model.ResponseSpeak.Engine;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseStartBotConversation.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseStartBotConversation.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseStartCallRecording.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseStartCallRecording.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseStopCallRecording.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/ResponseStopCallRecording.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/SMARequest.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/SMARequest.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/SMAResponse.java b/ChimeSMAEvent/src/main/java/cloud/cleo/chimesma/model/SMAResponse.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/ChimeSMAFlow/src/main/java/cloud/cleo/chimesma/actions/AbstractFlow.java b/ChimeSMAFlow/src/main/java/cloud/cleo/chimesma/actions/AbstractFlow.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.actions;
 
 import static cloud.cleo.chimesma.actions.ReceiveDigitsAction.RECEIVE_DIGITS_ID;
@@ -63,6 +59,7 @@ public abstract class AbstractFlow implements RequestStreamHandler {
     public final static String CURRENT_ACTION_ID_LIST = "CurrentActionIdList";
 
     static {
+        // AWS could extend inout objects so don't fail when new properties have been added
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     }
 
@@ -221,11 +218,11 @@ private Action getCurrentAction(SMARequest event) throws CloneNotSupportedExcept
 
     /**
      * Java 21 doesn't want to deserialize like 17 did, so we use our own mapper to handle things.
-     * 
+     *
      * @param in
      * @param out
      * @param cntxt
-     * @throws IOException 
+     * @throws IOException
      */
     @Override
     public void handleRequest(InputStream in, OutputStream out, Context cntxt) throws IOException {
@@ -234,9 +231,10 @@ public void handleRequest(InputStream in, OutputStream out, Context cntxt) throw
 
     /**
      * Worked direct in Java 17, but need above for 21.
+     *
      * @param event
      * @param cntxt
-     * @return 
+     * @return
      */
     public final SMAResponse handleRequest(SMARequest event, Context cntxt) {
         try {
@@ -291,14 +289,12 @@ public final SMAResponse handleRequest(SMARequest event, Context cntxt) {
                         break;
                     }
                     log.error("Error for " + action.getDebugSummary());
-                    if (event.getActionData() instanceof ErrorTypeMessage) {
-                        final var ad = (ErrorTypeMessage) event.getActionData();
-                        log.error("ErrorType = [" + ad.getErrorType() + "]");
-                        log.error("ErrorMessage = [" + ad.getErrorMessage() + "]");
+                    if (event.getActionData() instanceof ErrorTypeMessage errorTypeMessage) {
+                        log.error("ErrorType = [" + errorTypeMessage.getErrorType() + "]");
+                        log.error("ErrorMessage = [" + errorTypeMessage.getErrorMessage() + "]");
                     }
-                    if (event.getActionData() instanceof ErrorMessage) {
-                        final var ad = (ErrorMessage) event.getActionData();
-                        log.error("Error = [" + ad.getError() + "]");
+                    if (event.getActionData() instanceof ErrorMessage errorMessage) {
+                        log.error("Error = [" + errorMessage.getError() + "]");
                     }
                     if (action.getErrorAction() != null) {
                         actionList = getActions(action.getErrorAction(), event);
@@ -313,11 +309,10 @@ public final SMAResponse handleRequest(SMARequest event, Context cntxt) {
                     final var disconnectedBy = event.getCallDetails().getTransactionAttributes().getOrDefault("Disconnect", "Application");
                     log.debug("Call Was disconnected by [" + disconnectedBy + "], sending empty response");
                     action = getCurrentAction(event);
-                    if (action instanceof CallAndBridgeAction) {
+                    if (action instanceof CallAndBridgeAction callAndBridgeAction) {
                         // Because Call Bridge has 2 call legs in play, delegate respone to the Action since there
                         // various way to handle things, but the default being once connected a hangup on one leg should drop the other
-                        final var cab = (CallAndBridgeAction) action;
-                        final var nextAction = cab.getHangupAction();
+                        final var nextAction = callAndBridgeAction.getHangupAction();
                         if (nextAction != null) {
                             actionList = getActions(nextAction, event);
                             res = SMAResponse.builder().withTransactionAttributes(actionList.getLast().getTransactionAttributes())
@@ -416,15 +411,4 @@ private SMAResponse hangupLegB() {
         return SMAResponse.builder().withActions(List.of(ResponseHangup.builder().withParameters(ResponseHangup.Parameters.builder().withParticipantTag(ParticipantTag.LEG_B).build()).build())).build();
     }
 
-//    public void handleRequest(InputStream in, OutputStream out, Context cntxt) throws IOException {
-//       // Read in JSON Tree
-//        var json = mapper.readTree(in);
-//        log.debug("INPUT JSON is " + json.toString());
-//
-//        final var res = handleRequest(JacksonPojoSerializer.getInstance().fromJson(json.toString(), SMAEvent.class), cntxt);
-//        
-//        try (Writer w = new OutputStreamWriter(out, "UTF-8")) {
-//            w.write(mapper.writeValueAsString(res));
-//        }
-//    }
 }
diff --git a/ChimeSMAFlow/src/main/java/cloud/cleo/chimesma/actions/Action.java b/ChimeSMAFlow/src/main/java/cloud/cleo/chimesma/actions/Action.java
@@ -1,7 +1,3 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
 package cloud.cleo.chimesma.actions;
 
 import static cloud.cleo.chimesma.actions.AbstractFlow.CURRENT_ACTION_ID;