diff --git a/.env-example b/.env-example index eadff821..63717f5e 100644 --- a/.env-example +++ b/.env-example @@ -1,16 +1,20 @@ +# Uncomment to enable detailed logging +# QUICKSTART_DEBUG="" + # Auth / General -VONAGE_API_KEY=a1b2c3d4 -VONAGE_API_SECRET=1234567890abcdef -VONAGE_SIGNATURE_SECRET=ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz -VONAGE_APPLICATION_ID=aaaaaaaa-bbbb-4ccc-8ddd-0123456789ab -VONAGE_PRIVATE_KEY_PATH=/path/to/aaaaaaaa-bbbb-4ccc-8ddd-0123456789ab_private.key -VONAGE_VIRTUAL_NUMBER=447700900000 +VONAGE_API_KEY="a1b2c3d4" +VONAGE_API_SECRET="1234567890abcdef" +VONAGE_SIGNATURE_SECRET="ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz" +VONAGE_APPLICATION_ID="aaaaaaaa-bbbb-4ccc-8ddd-0123456789ab" +VONAGE_PRIVATE_KEY_PATH="/path/to/aaaaaaaa-bbbb-4ccc-8ddd-0123456789ab_private.key" +VONAGE_PRIVATE_KEY_CONTENTS="-----BEGIN PRIVATE KEY-----\abc123\n...\n-----END PRIVATE KEY" +VONAGE_VIRTUAL_NUMBER="447700900000" # Account -ACCOUNT_ID=f9e8d7c6 -ACCOUNT_SECRET=fedcba9876543210 -ACCOUNT_SECRET_ID=abcdef09-8765-4321-8cde-0123456789ab -ACCOUNT_SMS_CALLBACK_URL=https://example.org/webhooks/sms-status +ACCOUNT_ID="f9e8d7c6" +ACCOUNT_SECRET="fedcba9876543210" +ACCOUNT_SECRET_ID="abcdef09-8765-4321-8cde-0123456789ab" +ACCOUNT_SMS_CALLBACK_URL="https://example.org/webhooks/sms-status" # Application APPLICATION_NAME="My Test Application" @@ -119,6 +123,7 @@ VERIFY_BRAND_NAME="Vonage" VERIFY_PAYEE_NAME="Clientele" VERIFY_AMOUNT="12.34" VERIFY_REQUEST_ID="abcdef09876543218cde0123456789ab" +VERIFY_REQUEST_UUID="aaaaaaaa-bbbb-4ccc-8ddd-0123456789ab" VERIFY_CODE="1234" VERIFY_WORKFLOW_ID="5" VERIFY_PSD2_WORKFLOW_ID="6" @@ -140,3 +145,4 @@ VOICE_NCCO_URL="https://nexmo-community.github.io/ncco-examples/talk.json" VOICE_ANSWER_URL="https://nexmo-community.github.io/ncco-examples/transfer.json" VOICE_STREAM_URL="https://nexmo-community.github.io/ncco-examples/silent-loop.json" VOICE_RECORDING_URL="https://api.nexmo.com/v1/files/bbbbbbbb-aaaa-cccc-dddd-0123456789ab.wav" +VOICE_EVENT_URL="https://example.org/webhooks/voice/event" diff --git a/SNIPPETS.md b/SNIPPETS.md index 545030ea..2ce87b5e 100644 --- a/SNIPPETS.md +++ b/SNIPPETS.md @@ -26,7 +26,7 @@ This file was generated by running [AggregateSnippets.java](src/main/java/Aggreg ```java VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) - .privateKeyContents(VONAGE_APPLICATION_PRIVATE_KEY) + .privateKeyContents(VONAGE_PRIVATE_KEY_CONTENTS) .build(); ``` ### Full Auth @@ -36,7 +36,7 @@ VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .applicationId(VONAGE_APPLICATION_ID) - .privateKeyPath(VONAGE_APPLICATION_PRIVATE_KEY_PATH) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); ``` ### Basic Auth @@ -49,26 +49,26 @@ VonageClient client = VonageClient.builder().apiKey(VONAGE_API_KEY).apiSecret(VO ```java VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) - .privateKeyPath(VONAGE_APPLICATION_PRIVATE_KEY_PATH) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); ``` ## Account ### Create Secret ```java -SecretResponse response = client.getAccountClient().createSecret(VONAGE_API_KEY, NEW_SECRET); +SecretResponse response = client.getAccountClient().createSecret(ACCOUNT_ID, ACCOUNT_SECRET); System.out.println(response.getId() + " created at " + response.getCreated()); ``` ### Configure Account ```java -SettingsResponse response = client.getAccountClient().updateSmsIncomingUrl(SMS_CALLBACK_URL); +SettingsResponse response = client.getAccountClient().updateSmsIncomingUrl(ACCOUNT_SMS_CALLBACK_URL); System.out.println("SMS Callback URL is now " + response.getIncomingSmsUrl()); ``` ### Revoke Secret ```java -client.getAccountClient().revokeSecret(VONAGE_API_KEY, VONAGE_SECRET_ID); +client.getAccountClient().revokeSecret(ACCOUNT_ID, ACCOUNT_SECRET_ID); ``` ### Get Balance @@ -80,13 +80,13 @@ System.out.printf("Auto-reload Enabled: %s\n", response.isAutoReload()); ### Get Secret ```java -SecretResponse response = client.getAccountClient().getSecret(VONAGE_API_KEY, VONAGE_SECRET_ID); +SecretResponse response = client.getAccountClient().getSecret(ACCOUNT_ID, ACCOUNT_SECRET_ID); System.out.println(response.getId() + " created at " + response.getCreated()); ``` ### List Secrets ```java -ListSecretsResponse response = client.getAccountClient().listSecrets(VONAGE_API_KEY); +ListSecretsResponse response = client.getAccountClient().listSecrets(ACCOUNT_ID); for (SecretResponse secret : response.getSecrets()) { System.out.println(secret.getId() + " created at " + secret.getCreated()); @@ -241,7 +241,7 @@ System.out.println("Original carrier: " + response.getOriginalCarrier().getName( ```java client.getInsightClient().getAdvancedNumberInsight( AdvancedInsightRequest.builder(INSIGHT_NUMBER) - .async(true).callback(CALLBACK_URL).build() + .async(true).callback(INSIGHT_CALLBACK_URL).build() ); ``` ### Advanced Insight With CNAM @@ -302,12 +302,10 @@ Spark.post("/webhooks/insight", (req, res) -> { ```java -final String signatureSecret = envVar("VONAGE_SIGNATURE_SECRET"); - Route validateJwt = (req, res) -> { String token = req.headers("Authorization").substring(7); - if (Jwt.verifySignature(token, signatureSecret)) { + if (Jwt.verifySignature(token, VONAGE_SIGNATURE_SECRET)) { res.status(204); } else { @@ -324,7 +322,7 @@ Spark.post("/webhooks/validatejwt", validateJwt); ```java String token = Jwt.builder() .applicationId("aaaaaaaa-bbbb-cccc-dddd-0123456789ab") - .privateKeyPath(Paths.get(envVar("VONAGE_PRIVATE_KEY_PATH"))) + .privateKeyPath(Paths.get(VONAGE_PRIVATE_KEY_PATH)) .subject("alice") .issuedAt(ZonedDateTime.now()) .expiresAt(ZonedDateTime.now().plusMinutes(20)) @@ -465,7 +463,7 @@ System.out.println("Updated theme '"+theme.getThemeName()+"' ("+theme.getThemeId ```java var response = client.getMessagesClient().sendMessage( SmsTextRequest.builder() - .from(VONAGE_BRAND_NAME).to(TO_NUMBER) + .from(SMS_SENDER_ID).to(MESSAGES_TO_NUMBER) .text("This is an SMS text message sent using the Messages API") .build() ); @@ -477,7 +475,7 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsTextRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .text("This is an RCS message sent via the Vonage Messages API") .build() ); @@ -488,8 +486,8 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsImageRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) - .url(IMAGE_URL) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_IMAGE_URL) .build() ); System.out.println("Message sent successfully. ID: " + response.getMessageUuid()); @@ -499,7 +497,7 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "richCard", Map.of("standaloneCard", Map.of( "thumbnailImageAlignment", "RIGHT", @@ -510,7 +508,7 @@ var response = client.getMessagesClient().sendMessage( "media", Map.of( "height", "TALL", "contentInfo", Map.of( - "fileUrl", IMAGE_URL, + "fileUrl", MESSAGES_IMAGE_URL, "forceRefresh", "false" ) ), @@ -540,7 +538,7 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Drop by our office!", "suggestions", List.of( @@ -567,14 +565,14 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() #### Revoke Message ```java -client.getMessagesClient().revokeOutboundMessage(MESSAGE_UUID, ApiRegion.API_EU); +client.getMessagesClient().revokeOutboundMessage(MESSAGES_MESSAGE_ID, MESSAGES_GEOSPECIFIC_API_HOST); ``` #### Send RCS Suggested Reply ```java var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "What do you think of Vonage APIs?", "suggestions", List.of( @@ -601,7 +599,7 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "carouselCard", Map.of( "cardWidth", "MEDIUM", @@ -620,7 +618,7 @@ var response = client.getMessagesClient().sendMessage( "media", Map.of( "height", "MEDIUM", "contentInfo", Map.of( - "fileUrl", IMAGE_URL, + "fileUrl", MESSAGES_IMAGE_URL, "forceRefresh", "false" ) ) @@ -639,7 +637,7 @@ var response = client.getMessagesClient().sendMessage( "media", Map.of( "height", "MEDIUM", "contentInfo", Map.of( - "fileUrl", VIDEO_URL, + "fileUrl", MESSAGES_VIDEO_URL, "forceRefresh", "false" ) ) @@ -656,8 +654,8 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsVideoRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) - .url(VIDEO_URL) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_VIDEO_URL) .build() ); System.out.println("Message sent successfully. ID: " + response.getMessageUuid()); @@ -667,7 +665,7 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Product Launch: Save the date!", "suggestions", List.of( @@ -695,8 +693,8 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsFileRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) - .url(FILE_URL) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_FILE_URL) .build() ); System.out.println("Message sent successfully. ID: " + response.getMessageUuid()); @@ -706,7 +704,7 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Check out our latest offers!", "suggestions", List.of( @@ -730,7 +728,7 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Need some help? Call us now or visit our website for more information.", "suggestions", List.of( @@ -764,7 +762,7 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Call us to claim your free gift!", "suggestions", List.of( @@ -789,7 +787,7 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Your driver will come and meet you at your specified location.", "suggestions", List.of( @@ -812,9 +810,9 @@ System.out.println("Message sent successfully. ID: " + response.getMessageUuid() ```java var response = client.getMessagesClient().sendMessage( MmsVideoRequest.builder() - .from(FROM_NUMBER).to(TO_NUMBER) - .url(VIDEO_URL) - .build() + .from(MMS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_VIDEO_URL) + .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ``` @@ -823,8 +821,8 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( MmsVcardRequest.builder() - .from(FROM_NUMBER).to(TO_NUMBER) - .url(VCARD_URL) + .from(MMS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_VCARD_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -834,8 +832,8 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( MmsImageRequest.builder() - .from(FROM_NUMBER).to(TO_NUMBER) - .url(IMAGE_URL) + .from(MMS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_IMAGE_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -845,9 +843,9 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( MmsAudioRequest.builder() - .from(FROM_NUMBER).to(TO_NUMBER) - .url(AUDIO_URL) - .build() + .from(MMS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_AUDIO_URL) + .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ``` @@ -857,7 +855,8 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( MessengerTextRequest.builder() - .from(VONAGE_FB_SENDER_ID).to(FB_RECIPIENT_ID) + .from(MESSENGER_SENDER_ID) + .to(MESSENGER_RECIPIENT_ID) .text("This is a Facebook Messenger Message sent from the Messages API") .build() ); @@ -868,9 +867,9 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( MessengerImageRequest.builder() - .from(VONAGE_FB_SENDER_ID) - .to(FB_RECIPIENT_ID) - .url(IMAGE_URL) + .from(MESSENGER_SENDER_ID) + .to(MESSENGER_RECIPIENT_ID) + .url(MESSAGES_IMAGE_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -880,9 +879,9 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( MessengerAudioRequest.builder() - .from(VONAGE_FB_SENDER_ID) - .to(FB_RECIPIENT_ID) - .url(AUDIO_URL) + .from(MESSENGER_SENDER_ID) + .to(MESSENGER_RECIPIENT_ID) + .url(MESSAGES_AUDIO_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -892,9 +891,9 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( MessengerVideoRequest.builder() - .from(VONAGE_FB_SENDER_ID) - .to(FB_RECIPIENT_ID) - .url(VIDEO_URL) + .from(MESSENGER_SENDER_ID) + .to(MESSENGER_RECIPIENT_ID) + .url(MESSAGES_VIDEO_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -904,9 +903,9 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( MessengerFileRequest.builder() - .from(VONAGE_FB_SENDER_ID) - .to(FB_RECIPIENT_ID) - .url(FILE_URL) + .from(MESSENGER_SENDER_ID) + .to(MESSENGER_RECIPIENT_ID) + .url(MESSAGES_FILE_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -914,7 +913,6 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ### Incoming Message ```java -configureLogging(); Route inboundRoute = (request, response) -> { InboundMessage messageDetails = InboundMessage.fromJson(request.body()); @@ -936,12 +934,14 @@ Spark.post("/webhooks/inbound-message", inboundRoute); ```java var response = client.getMessagesClient().sendMessage( ViberVideoRequest.builder() - .to(TO_NUMBER) - .from(VONAGE_VIBER_SERVICE_MESSAGE_ID) - .url("https://example.com/video.mp4") - .thumbUrl("https://example.com/image.jpg") + .to(MESSAGES_TO_NUMBER) + .from(VIBER_SENDER_ID) + .url(MESSAGES_VIDEO_URL) + .thumbUrl(VIBER_THUMB_URL) .category(Category.TRANSACTION) - .fileSize(42).duration(35).ttl(86400) + .fileSize(VIBER_VIDEO_FILE_SIZE) + .duration(VIBER_VIDEO_DURATION) + .ttl(VIBER_VIDEO_TTL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -951,9 +951,9 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( ViberImageRequest.builder() - .from(VIBER_SERVICE_MESSAGE_ID) - .to(TO_NUMBER) - .url(IMAGE_URL) + .from(VIBER_SENDER_ID) + .to(MESSAGES_TO_NUMBER) + .url(MESSAGES_IMAGE_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -963,9 +963,9 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( ViberFileRequest.builder() - .from(VIBER_SERVICE_MESSAGE_ID) - .to(TO_NUMBER) - .url(FILE_URL) + .from(VIBER_SENDER_ID) + .to(MESSAGES_TO_NUMBER) + .url(MESSAGES_FILE_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -975,7 +975,7 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( ViberTextRequest.builder() - .from(FROM_ID).to(TO_NUMBER) + .from(VIBER_SENDER_ID).to(MESSAGES_TO_NUMBER) .text("Don't miss out on our latest offers!") .category(Category.PROMOTION) .build() @@ -987,17 +987,16 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ##### Send Messenger Text ```java -configureLogging(); System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(MessengerTextRequest.builder() - .from(envVar("MESSAGES_SANDBOX_FB_ID")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID")) + .from(MESSAGES_SANDBOX_FB_ID) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID) .text("Don't miss out on our latest offers!") .build() ).getMessageUuid() @@ -1006,18 +1005,17 @@ System.out.println(VonageClient.builder() ##### Send Messenger Video ```java -configureLogging(); System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(MessengerVideoRequest.builder() - .from(envVar("MESSAGES_SANDBOX_FB_ID")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID")) - .url("https://file-examples.com/storage/fee788409562ada83b58ed5/2017/04/file_example_MP4_640_3MG.mp4") + .from(MESSAGES_SANDBOX_FB_ID) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID) + .url(MESSAGES_VIDEO_URL) .build() ).getMessageUuid() ); @@ -1027,18 +1025,18 @@ System.out.println(VonageClient.builder() ```java System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient().useSandboxEndpoint() .sendMessage(ViberVideoRequest.builder() - .from(envVar("MESSAGES_SANDBOX_VIBER_SERVICE_ID")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) + .from(MESSAGES_SANDBOX_VIBER_SERVICE_ID) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) .category(Category.PROMOTION) - .duration(Integer.parseInt(envVar("VIDEO_DURATION"))) - .fileSize(Integer.parseInt(envVar("VIDEO_SIZE"))) - .thumbUrl(envVar("THUMB_URL")) - .url(envVar("VIDEO_URL")) + .duration(VIBER_VIDEO_DURATION) + .fileSize(VIBER_VIDEO_FILE_SIZE) + .thumbUrl(VIBER_THUMB_URL) + .url(MESSAGES_VIDEO_URL) .caption("Check out this video!").build() ).getMessageUuid() ); @@ -1046,17 +1044,16 @@ System.out.println(VonageClient.builder() ##### Send Viber Text ```java -configureLogging(); System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(ViberTextRequest.builder() - .from(envVar("MESSAGES_SANDBOX_VIBER_SERVICE_ID")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) + .from(MESSAGES_SANDBOX_VIBER_SERVICE_ID) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) .text("Don't miss out on our latest offers!") .category(Category.PROMOTION) .build() @@ -1068,13 +1065,13 @@ System.out.println(VonageClient.builder() ```java System.out.println(VonageClient.builder() - .apiKey(envVar("VONAGE_API_KEY")) - .apiSecret(envVar("VONAGE_API_SECRET")) + .apiKey(VONAGE_API_KEY) + .apiSecret(VONAGE_API_SECRET) .build() .getMessagesClient() .sendMessage(WhatsappLocationRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) .longitude(-122.1503115) .latitude(37.4843538) .name("Facebook HQ") @@ -1086,17 +1083,16 @@ System.out.println(VonageClient.builder() ##### Send WhatsApp Text ```java -configureLogging(); System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappTextRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) .text("Hello from Vonage, "+System.getenv("NAME")) .build() ).getMessageUuid() @@ -1106,15 +1102,15 @@ System.out.println(VonageClient.builder() ```java System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappReactionRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .contextMessageId(envVar("MESSAGE_UUID")) + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .contextMessageId(MESSAGES_MESSAGE_ID) .unreact().build() ).getMessageUuid() ); @@ -1122,17 +1118,16 @@ System.out.println(VonageClient.builder() ##### Send WhatsApp Contact ```java -configureLogging(); System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappCustomRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) .custom(Map.of( "type", "contacts", "contacts", List.of(Map.of( @@ -1203,18 +1198,17 @@ System.out.println(VonageClient.builder() ##### Send WhatsApp Sticker ```java -configureLogging(); System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappStickerRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .url("https://file-examples.com/storage/fe0b804ac5640668798b8d0/2020/03/file_example_WEBP_250kB.webp") + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .url(WHATSAPP_STICKER_URL) .build() ).getMessageUuid() ); @@ -1222,18 +1216,17 @@ System.out.println(VonageClient.builder() ##### Send WhatsApp Audio ```java -configureLogging(); System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappAudioRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .url("https://file-examples.com/storage/fee788409562ada83b58ed5/2017/11/file_example_MP3_1MG.mp3") + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .url(MESSAGES_AUDIO_URL) .build() ).getMessageUuid() ); @@ -1241,18 +1234,17 @@ System.out.println(VonageClient.builder() ##### Send WhatsApp File ```java -configureLogging(); System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappFileRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .url("https://file-examples.com/storage/fee788409562ada83b58ed5/2017/10/file-sample_150kB.pdf") + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .url(MESSAGES_FILE_URL) .caption("Accompanying message (optional)") .build() ).getMessageUuid() @@ -1261,19 +1253,18 @@ System.out.println(VonageClient.builder() ##### Send WhatsApp Image ```java -configureLogging(); System.out.println(VonageClient.builder() - .apiKey(envVar("VONAGE_API_KEY")) - .apiSecret(envVar("VONAGE_API_SECRET")) + .apiKey(VONAGE_API_KEY) + .apiSecret(VONAGE_API_SECRET) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappImageRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .url("https://lastfm.freetls.fastly.net/i/u/770x0/a21ed806c65618ea1e7a6c8b4abf0402.jpg") - .caption("Fluttershy") + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .url(MESSAGES_IMAGE_URL) + .caption(MESSAGES_CAPTION) .build() ).getMessageUuid() ); @@ -1282,16 +1273,16 @@ System.out.println(VonageClient.builder() ```java System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappReactionRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .contextMessageId(envVar("MESSAGE_UUID")) - .reaction(envVar("EMOJI")) + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .contextMessageId(MESSAGES_MESSAGE_ID) + .reaction(MESSAGES_EMOJI) .build() ).getMessageUuid() ); @@ -1299,18 +1290,17 @@ System.out.println(VonageClient.builder() ##### Send WhatsApp Video ```java -configureLogging(); System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappVideoRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .url("https://file-examples.com/storage/fee788409562ada83b58ed5/2017/04/file_example_MP4_640_3MG.mp4") + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .url(MESSAGES_VIDEO_URL) .build() ).getMessageUuid() ); @@ -1318,7 +1308,6 @@ System.out.println(VonageClient.builder() ### Message Status Webhook ```java -configureLogging(); Route inboundRoute = (request, response) -> { MessageStatus messageDetails = MessageStatus.fromJson(request.body()); @@ -1340,7 +1329,7 @@ Spark.post("/webhooks/message-status", inboundRoute); ```java var response = client.getMessagesClient().sendMessage( WhatsappLocationRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .name("Facebook HQ") .address("1 Hacker Way, Menlo Park, CA 94025") .longitude(-122.1503115).latitude(37.4843538) @@ -1353,8 +1342,8 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappStickerRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) - .url(STICKER_URL) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(WHATSAPP_STICKER_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -1364,7 +1353,7 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappTextRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .text("This is a WhatsApp Message text message sent using the Messages API") .build() ); @@ -1375,7 +1364,7 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappMultiProductRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .catalogId("1166260820787549") .headerText("Our top products") .bodyText("Check out these great products") @@ -1391,8 +1380,8 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappStickerRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) - .id(STICKER_ID) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) + .id(WHATSAPP_STICKER_ID) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -1428,7 +1417,7 @@ components.add(component2); custom.put("components", components); WhatsappCustomRequest message = WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(custom).build(); client.getMessagesClient().sendMessage(message); @@ -1438,7 +1427,7 @@ client.getMessagesClient().sendMessage(message); ```java var response = client.getMessagesClient().sendMessage( WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of( "type", MessageType.TEMPLATE, "template", Map.of( @@ -1508,7 +1497,7 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of( "type", MessageType.TEMPLATE, "template", Map.of( @@ -1524,7 +1513,7 @@ var response = client.getMessagesClient().sendMessage( Map.of( "type", MessageType.IMAGE, "image", Map.of( - "link", IMAGE_URL + "link", MESSAGES_IMAGE_URL ) ) ) @@ -1549,8 +1538,8 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappReactionRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) - .contextMessageId(MESSAGE_UUID) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) + .contextMessageId(MESSAGES_MESSAGE_ID) .unreact().build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -1558,14 +1547,14 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); #### Mark As Read ```java -client.getMessagesClient().ackInboundMessage(MESSAGE_UUID, ApiRegion.API_EU); +client.getMessagesClient().ackInboundMessage(MESSAGES_MESSAGE_ID, ApiRegion.API_EU); ``` #### Send WhatsApp Contact ```java var response = client.getMessagesClient().sendMessage( WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of( "type", "contacts", "contacts", List.of(Map.of( @@ -1638,7 +1627,7 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappTemplateRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .policy(Policy.DETERMINISTIC).locale(Locale.ENGLISH_UK) .name(WHATSAPP_TEMPLATE_NAMESPACE+':'+WHATSAPP_TEMPLATE_NAME) .parameters(List.of( @@ -1655,9 +1644,9 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappSingleProductRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) - .catalogId(CATALOG_ID) - .productRetailerId(PRODUCT_ID) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) + .catalogId(WHATSAPP_CATALOG_ID) + .productRetailerId(WHATSAPP_PRODUCT_ID) .bodyText("Check out this cool product") .footerText("Sale now on!") .build() @@ -1669,9 +1658,9 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappAudioRequest.builder() - .to(TO_NUMBER) - .from(VONAGE_WHATSAPP_NUMBER) - .url(AUDIO_URL) + .to(MESSAGES_TO_NUMBER) + .from(WHATSAPP_SENDER_ID) + .url(MESSAGES_AUDIO_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -1681,8 +1670,8 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappFileRequest.builder() - .to(TO_NUMBER).from(VONAGE_WHATSAPP_NUMBER) - .url(FILE_URL).caption(FILE_CAPTION) + .to(MESSAGES_TO_NUMBER).from(WHATSAPP_SENDER_ID) + .url(MESSAGES_FILE_URL).caption(MESSAGES_CAPTION) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -1692,8 +1681,8 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappImageRequest.builder() - .to(TO_NUMBER).from(VONAGE_WHATSAPP_NUMBER) - .url(IMAGE_URL).caption(IMAGE_CAPTION) + .to(MESSAGES_TO_NUMBER).from(WHATSAPP_SENDER_ID) + .url(MESSAGES_IMAGE_URL).caption(MESSAGES_CAPTION) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -1703,7 +1692,7 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of( "type", "template", "template", Map.of( @@ -1720,7 +1709,7 @@ var response = client.getMessagesClient().sendMessage( Map.of( "type", "image", "image", Map.of( - "link", HEADER_IMAGE_URL + "link", WHATSAPP_HEADER_IMAGE_URL ) ) ) @@ -1769,9 +1758,9 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappReactionRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) - .contextMessageId(MESSAGE_UUID) - .reaction(EMOJI).build() + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) + .contextMessageId(MESSAGES_MESSAGE_ID) + .reaction(MESSAGES_EMOJI).build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ``` @@ -1780,8 +1769,8 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappVideoRequest.builder() - .to(TO_NUMBER).from(VONAGE_WHATSAPP_NUMBER) - .url(VIDEO_URL).caption(VIDEO_CAPTION) + .to(MESSAGES_TO_NUMBER).from(WHATSAPP_SENDER_ID) + .url(MESSAGES_VIDEO_URL).caption(MESSAGES_CAPTION) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); @@ -1791,7 +1780,7 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); ```java var response = client.getMessagesClient().sendMessage( WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of( "type", MessageType.TEMPLATE, "template", Map.of( @@ -1806,7 +1795,7 @@ var response = client.getMessagesClient().sendMessage( "parameters", List.of( Map.of( "type", MessageType.TEXT, - "text", OTP + "text", WHATSAPP_OTP ) ) ), @@ -1817,7 +1806,7 @@ var response = client.getMessagesClient().sendMessage( "parameters", List.of( Map.of( "type", MessageType.TEXT, - "text", OTP + "text", WHATSAPP_OTP ) ) ) @@ -1846,21 +1835,21 @@ System.out.println(simSwap); ### Cancel Number ```java -client.getNumbersClient().cancelNumber(COUNTRY_CODE, VONAGE_NUMBER); +client.getNumbersClient().cancelNumber(NUMBER_COUNTRY_CODE, NUMBER_MSISDN); ``` ### Buy Number ```java -client.getNumbersClient().buyNumber(COUNTRY_CODE, VONAGE_NUMBER); +client.getNumbersClient().buyNumber(NUMBER_COUNTRY_CODE, NUMBER_MSISDN); ``` ### Search Numbers ```java SearchNumbersResponse response = client.getNumbersClient().searchNumbers( SearchNumbersFilter.builder() - .country(COUNTRY_CODE) - .type(VONAGE_NUMBER_TYPE) - .features(VONAGE_NUMBER_FEATURES) + .country(NUMBER_COUNTRY_CODE) + .type(NUMBER_TYPE) + .features(NUMBER_FEATURES) .pattern(NUMBER_SEARCH_PATTERN, NUMBER_SEARCH_CRITERIA) .build() ); @@ -1880,10 +1869,10 @@ for (AvailableNumber number : response.getNumbers()) { ```java client.getNumbersClient().updateNumber( - UpdateNumberRequest.builder(VONAGE_NUMBER, COUNTRY_CODE) - .moHttpUrl(SMS_CALLBACK_URL) - .voiceCallback(VOICE_CALLBACK_TYPE, VOICE_CALLBACK_VALUE) - .voiceStatusCallback(VOICE_STATUS_URL) + UpdateNumberRequest.builder(NUMBER_MSISDN, NUMBER_COUNTRY_CODE) + .moHttpUrl(NUMBER_SMS_CALLBACK_URL) + .voiceCallback(NUMBER_VOICE_CALLBACK_TYPE, NUMBER_VOICE_CALLBACK_URL) + .voiceStatusCallback(NUMBER_VOICE_STATUS_CALLBACK_URL) .build() ); ``` @@ -1906,21 +1895,21 @@ for (OwnedNumber number : response.getNumbers()) { ### RedactA Transaction ```java -client.getRedactClient().redactTransaction(VONAGE_REDACT_ID, VONAGE_REDACT_PRODUCT); +client.getRedactClient().redactTransaction(VONAGE_REDACT_ID, RedactRequest.Product.SMS); ``` ## SIM Swap ### Retrieve SIM Swap Date ```java -Instant lastSwapDate = client.getSimSwapClient().retrieveSimSwapDate(TO_NUMBER); +Instant lastSwapDate = client.getSimSwapClient().retrieveSimSwapDate(SIMSWAP_MSISDN); System.out.println(lastSwapDate); ``` ### SIM Swapped ```java -boolean swapped = client.getSimSwapClient().checkSimSwap(TO_NUMBER, 960); -System.out.println("SIM for "+TO_NUMBER + - " has "+(swapped ? "" : "not ") + "been swapped in the past 960 hours." +boolean swapped = client.getSimSwapClient().checkSimSwap(SIMSWAP_MSISDN, SIMSWAP_MAX_AGE); +System.out.println("SIM for "+SIMSWAP_MSISDN + " has " + + (swapped ? "" : "not ") + "been swapped in the past "+SIMSWAP_MAX_AGE+" hours." ); ``` ## SMS @@ -1931,7 +1920,7 @@ System.out.println("SIM for "+TO_NUMBER + * Route to handle incoming SMS GET request. */ Route inboundSmsAsGet = (req, res) -> { - String signatureSecret = envVar("VONAGE_SIGNATURE_SECRET"); + String signatureSecret = VONAGE_SIGNATURE_SECRET; System.out.println(signatureSecret); if (RequestSigning.verifyRequestSignature( req.raw().getInputStream(), @@ -1959,11 +1948,9 @@ Route inboundSmsAsGet = (req, res) -> { Spark.port(5000); Spark.get("/webhooks/inbound-sms", inboundSmsAsGet); ``` -### ReceiveDL R +### Receive DLR ```java -Util.configureLogging(); - port(3000); get("/webhooks/delivery-receipt", (req, res) -> { @@ -1988,7 +1975,7 @@ post("/webhooks/delivery-receipt", (req, res) -> { return ""; }); ``` -### ReceiveSM S +### Receive SMS ```java /* @@ -2040,7 +2027,7 @@ Spark.post("/webhooks/inbound-sms", inboundSmsAsPost); ### Send Unicode Message ```java -TextMessage message = new TextMessage(VONAGE_BRAND_NAME, TO_NUMBER, "Blue Öyster Cult \uD83E\uDD18", true); +TextMessage message = new TextMessage(SMS_SENDER_ID, SMS_TO_NUMBER, "Blue Öyster Cult \uD83E\uDD18", true); SmsSubmissionResponse responses = client.getSmsClient().submitMessage(message); @@ -2051,8 +2038,8 @@ for (SmsSubmissionResponseMessage responseMessage : responses.getMessages()) { ### Send Message ```java -TextMessage message = new TextMessage(VONAGE_BRAND_NAME, - TO_NUMBER, +TextMessage message = new TextMessage( + SMS_SENDER_ID, SMS_TO_NUMBER, "A text message sent using the Vonage SMS API" ); @@ -2067,7 +2054,7 @@ if (response.getMessages().get(0).getStatus() == MessageStatus.OK) { ### Send Signed SMS ```java -right 2024 Vonage +right 2025 Vonage * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -2094,27 +2081,18 @@ import com.vonage.client.sms.MessageStatus; import com.vonage.client.sms.SmsSubmissionResponse; import com.vonage.client.sms.messages.TextMessage; import com.vonage.client.auth.hashutils.HashUtil; - -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendSignedSms { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - String VONAGE_SIGNATURE_SECRET = envVar("VONAGE_SIGNATURE_SECRET"); - String TO_NUMBER = envVar("TO_NUMBER"); - String VONAGE_BRAND_NAME = envVar("VONAGE_BRAND_NAME"); VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .signatureSecret(VONAGE_SIGNATURE_SECRET) .hashType(HashUtil.HashType.MD5).build(); - TextMessage message = new TextMessage(VONAGE_BRAND_NAME, - TO_NUMBER, + TextMessage message = new TextMessage( + SMS_SENDER_ID, SMS_TO_NUMBER, "A text message sent using the Vonage SMS API" ); @@ -2133,7 +2111,7 @@ public class SendSignedSms { MoneyTransfer receipt = client.getSubaccountsClient().transferCredit( MoneyTransfer.builder() .from(VONAGE_API_KEY).to(SUBACCOUNT_KEY) - .amount(AMOUNT).build() + .amount(SUBACCOUNT_CREDIT_AMOUNT).build() ); System.out.println("Transfer successful: "+receipt.getId()); ``` @@ -2143,14 +2121,16 @@ System.out.println("Transfer successful: "+receipt.getId()); MoneyTransfer receipt = client.getSubaccountsClient().transferBalance( MoneyTransfer.builder() .from(VONAGE_API_KEY).to(SUBACCOUNT_KEY) - .amount(AMOUNT).build() + .amount(SUBACCOUNT_BALANCE_AMOUNT).build() ); System.out.println("Transfer successful: "+receipt.getId()); ``` ### List Balance Transfers ```java -List transfers = client.getSubaccountsClient().listBalanceTransfers(); +List transfers = client.getSubaccountsClient().listBalanceTransfers( + ListTransfersFilter.builder().startDate(SUBACCOUNT_START_DATE).build() +); ``` ### List Subaccounts @@ -2174,7 +2154,7 @@ Account subaccount = client.getSubaccountsClient().updateSubaccount( ```java Account subaccount = client.getSubaccountsClient().updateSubaccount( UpdateSubaccountRequest.builder(SUBACCOUNT_KEY) - .name(NEW_SUBACCOUNT_NAME).build() + .name(SUBACCOUNT_NAME).build() ); ``` ### Create Subaccount @@ -2182,8 +2162,8 @@ Account subaccount = client.getSubaccountsClient().updateSubaccount( ```java Account subaccount = client.getSubaccountsClient().createSubaccount( CreateSubaccountRequest.builder() - .name(NEW_SUBACCOUNT_NAME) - .secret(NEW_SUBACCOUNT_SECRET) + .name(SUBACCOUNT_NAME) + .secret(SUBACCOUNT_SECRET) .build() ); ``` @@ -2192,7 +2172,8 @@ Account subaccount = client.getSubaccountsClient().createSubaccount( ```java NumberTransfer transfer = NumberTransfer.builder() .from(VONAGE_API_KEY).to(SUBACCOUNT_KEY) - .number(NUMBER).build(); + .number(NUMBER_MSISDN).country(NUMBER_COUNTRY_CODE) + .build(); client.getSubaccountsClient().transferNumber(transfer); ``` @@ -2206,7 +2187,9 @@ Account subaccount = client.getSubaccountsClient().updateSubaccount( ### List Credit Transfers ```java -List transfers = client.getSubaccountsClient().listCreditTransfers(); +List transfers = client.getSubaccountsClient().listCreditTransfers( + ListTransfersFilter.builder().startDate(SUBACCOUNT_START_DATE).build() +); ``` ## Users ### Update User @@ -2260,7 +2243,7 @@ List users = client.getUsersClient().listUsers(); ### Cancel Verification ```java -ControlResponse response = client.getVerifyClient().cancelVerification(REQUEST_ID); +ControlResponse response = client.getVerifyClient().cancelVerification(VERIFY_REQUEST_ID); String errorText = response.getErrorText(); if (errorText != null) { @@ -2273,7 +2256,7 @@ else { ### Advance Verification ```java -ControlResponse response = client.getVerifyClient().advanceVerification(REQUEST_ID); +ControlResponse response = client.getVerifyClient().advanceVerification(VERIFY_REQUEST_ID); String errorText = response.getErrorText(); if (errorText != null) { @@ -2287,7 +2270,7 @@ else { ```java VerifyResponse response = client.getVerifyClient().verify( - RECIPIENT_NUMBER,BRAND_NAME, VerifyRequest.Workflow.TTS_TTS + VERIFY_NUMBER, VERIFY_BRAND_NAME, VERIFY_WORKFLOW_ID ); if (response.getStatus() == VerifyStatus.OK) { @@ -2300,7 +2283,7 @@ else { ### Search Verification ```java -SearchVerifyResponse response = client.getVerifyClient().search(REQUEST_ID); +SearchVerifyResponse response = client.getVerifyClient().search(VERIFY_REQUEST_ID); if (response.getStatus() == VerifyStatus.OK) { response.getVerificationRequests().forEach(it -> { System.out.println(it.getRequestId() + " " + it.getStatus()); @@ -2310,7 +2293,7 @@ if (response.getStatus() == VerifyStatus.OK) { ### Check Verification ```java -CheckResponse response = client.getVerifyClient().check(REQUEST_ID, CODE); +CheckResponse response = client.getVerifyClient().check(VERIFY_REQUEST_ID, VERIFY_CODE); if (response.getStatus() == VerifyStatus.OK) { System.out.println("Verification Successful"); @@ -2322,7 +2305,7 @@ else { ### Start Verification ```java -VerifyResponse response = client.getVerifyClient().verify(RECIPIENT_NUMBER, BRAND_NAME); +VerifyResponse response = client.getVerifyClient().verify(VERIFY_NUMBER, VERIFY_BRAND_NAME); if (response.getStatus() == VerifyStatus.OK) { System.out.printf("RequestID: %s", response.getRequestId()); @@ -2335,7 +2318,7 @@ else { ```java VerifyResponse response = client.getVerifyClient().psd2Verify( - RECIPIENT_NUMBER, AMOUNT, PAYEE_NAME, Psd2Request.Workflow.SMS_SMS + VERIFY_NUMBER, VERIFY_AMOUNT, VERIFY_PAYEE_NAME, VERIFY_PSD2_WORKFLOW_ID ); if (response.getStatus() == VerifyStatus.OK) { @@ -2348,7 +2331,9 @@ else { ### Start PSD2 Verification ```java -VerifyResponse response = client.getVerifyClient().psd2Verify(RECIPIENT_NUMBER, AMOUNT, PAYEE_NAME); +VerifyResponse response = client.getVerifyClient().psd2Verify( + VERIFY_NUMBER, VERIFY_AMOUNT, VERIFY_PAYEE_NAME +); if (response.getStatus() == VerifyStatus.OK) { System.out.printf("Request ID: %s", response.getRequestId()); @@ -2363,30 +2348,25 @@ else { ```java VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new WhatsappWorkflow(TO_NUMBER, WHATSAPP_BUSINESS_NUMBER)) - .brand(BRAND_NAME).build() + .addWorkflow(new WhatsappWorkflow(VERIFY_NUMBER, VERIFY_WHATSAPP_NUMBER)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); ``` -### Delete Template - -```java -client.getVerify2Client().deleteTemplate(TEMPLATE_ID); -``` ### Send Request All Channels ```java var request = VerificationRequest.builder() .workflows(List.of( - new SilentAuthWorkflow(TO_NUMBER), - new WhatsappCodelessWorkflow(TO_NUMBER, WHATSAPP_BUSINESS_NUMBER), - new EmailWorkflow(TO_EMAIL), - new WhatsappWorkflow(TO_NUMBER, WHATSAPP_BUSINESS_NUMBER), - new SmsWorkflow(TO_NUMBER), - new VoiceWorkflow(TO_NUMBER) + new SilentAuthWorkflow(VERIFY_NUMBER), + new WhatsappCodelessWorkflow(VERIFY_NUMBER, VERIFY_WHATSAPP_NUMBER), + new EmailWorkflow(VERIFY_TO_EMAIL, VERIFY_FROM_EMAIL), + new WhatsappWorkflow(VERIFY_NUMBER, VERIFY_WHATSAPP_NUMBER), + new SmsWorkflow(VERIFY_NUMBER), + new VoiceWorkflow(VERIFY_NUMBER) )) .codeLength(7) - .brand(BRAND_NAME) + .brand(VERIFY_BRAND_NAME) .locale("en-gb") .channelTimeout(120) .build(); @@ -2399,8 +2379,8 @@ System.out.println("Verification sent: "+requestId); ```java VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new EmailWorkflow(TO_EMAIL)) - .brand(BRAND_NAME).build() + .addWorkflow(new EmailWorkflow(VERIFY_TO_EMAIL)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); ``` @@ -2409,8 +2389,8 @@ System.out.println("Verification sent: " + response.getRequestId()); ```java VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new VoiceWorkflow(TO_NUMBER)) - .brand(BRAND_NAME).build() + .addWorkflow(new VoiceWorkflow(VERIFY_NUMBER)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); ``` @@ -2419,8 +2399,8 @@ System.out.println("Verification sent: " + response.getRequestId()); ```java VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new SmsWorkflow(TO_NUMBER)) - .brand(BRAND_NAME).build() + .addWorkflow(new SmsWorkflow(VERIFY_NUMBER)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); ``` @@ -2429,9 +2409,9 @@ System.out.println("Verification sent: " + response.getRequestId()); ```java VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new SilentAuthWorkflow(TO_NUMBER)) - .addWorkflow(new EmailWorkflow(TO_EMAIL)) - .brand(BRAND_NAME).build() + .addWorkflow(new SilentAuthWorkflow(VERIFY_NUMBER)) + .addWorkflow(new EmailWorkflow(VERIFY_TO_EMAIL)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); ``` @@ -2439,7 +2419,7 @@ System.out.println("Verification sent: " + response.getRequestId()); ```java try { - client.getVerify2Client().checkVerificationCode(REQUEST_ID, CODE); + client.getVerify2Client().checkVerificationCode(VERIFY_REQUEST_UUID, VERIFY_CODE); System.out.println("SUCCESS - code matches!"); } catch (VerifyResponseException ex) { @@ -2454,97 +2434,103 @@ catch (VerifyResponseException ex) { } } ``` -### Get Template +### Send Request Silent Auth ```java -var template = client.getVerify2Client().getTemplate(TEMPLATE_ID); -System.out.println(template); +VerificationResponse response = client.getVerify2Client().sendVerification( + VerificationRequest.builder() + .addWorkflow(new SilentAuthWorkflow(VERIFY_NUMBER)) + .brand(VERIFY_BRAND_NAME).build() +); +System.out.println("Verification sent: " + response.getRequestId()); ``` -### List Templates +### Templates +#### Delete Template ```java -var templates = client.getVerify2Client().listTemplates(); -templates.forEach(t -> System.out.println(t.getId())); +client.getVerify2Client().deleteTemplate(VERIFY_TEMPLATE_ID); ``` -### Send Request Silent Auth +#### Get Template ```java -VerificationResponse response = client.getVerify2Client().sendVerification( - VerificationRequest.builder() - .addWorkflow(new SilentAuthWorkflow(TO_NUMBER)) - .brand(BRAND_NAME).build() -); -System.out.println("Verification sent: " + response.getRequestId()); +var template = client.getVerify2Client().getTemplate(VERIFY_TEMPLATE_ID); +System.out.println(template); ``` -### List Template Fragments +#### List Templates ```java -var fragments = client.getVerify2Client().listTemplateFragments(TEMPLATE_ID); +var templates = client.getVerify2Client().listTemplates(); +templates.forEach(t -> System.out.println(t.getId())); +``` +#### List Template Fragments + +```java +var fragments = client.getVerify2Client().listTemplateFragments(VERIFY_TEMPLATE_ID); fragments.forEach(f -> System.out.println(f.getFragmentId())); ``` -### Create Template +#### Create Template ```java -var template = client.getVerify2Client().createTemplate("My_template"); +var template = client.getVerify2Client().createTemplate(VERIFY_TEMPLATE_NAME); System.out.println(template.getId()); ``` -### Update Template Fragment +#### Update Template Fragment ```java var updated = client.getVerify2Client().updateTemplateFragment( - TEMPLATE_ID, TEMPLATE_FRAGMENT_ID, + VERIFY_TEMPLATE_ID, VERIFY_TEMPLATE_FRAGMENT_ID, "The authentication code for your ${brand} is: ${code}" ); System.out.println(updated); ``` -### Create Template Fragment +#### Create Template Fragment ```java var fragment = client.getVerify2Client().createTemplateFragment( - TEMPLATE_ID, new TemplateFragment( + VERIFY_TEMPLATE_ID, new TemplateFragment( FragmentChannel.SMS, "en-us", "The authentication code for your ${brand} is: ${code}" ) ); System.out.println(fragment); ``` -### Update Template +#### Update Template ```java -var updated = client.getVerify2Client().updateTemplate(TEMPLATE_ID, "My_renamed_template", false); +var updated = client.getVerify2Client().updateTemplate(VERIFY_TEMPLATE_ID, VERIFY_TEMPLATE_NAME, false); System.out.println(updated); ``` -### Send Request WhatsApp Interactive +#### Get Template Fragment ```java -VerificationResponse response = client.getVerify2Client().sendVerification( - VerificationRequest.builder() - .addWorkflow(new WhatsappCodelessWorkflow(TO_NUMBER, WHATSAPP_BUSINESS_NUMBER)) - .brand(BRAND_NAME).build() -); -System.out.println("Verification sent: " + response.getRequestId()); +var fragment = client.getVerify2Client().getTemplateFragment(VERIFY_TEMPLATE_ID, VERIFY_TEMPLATE_FRAGMENT_ID); +System.out.println(fragment); ``` -### Cancel Request +#### Delete Template Fragment ```java -client.getVerify2Client().cancelVerification(REQUEST_ID); +client.getVerify2Client().deleteTemplateFragment(VERIFY_TEMPLATE_ID, VERIFY_TEMPLATE_FRAGMENT_ID); ``` -### Get Template Fragment +### Send Request WhatsApp Interactive ```java -var fragment = client.getVerify2Client().getTemplateFragment(TEMPLATE_ID, TEMPLATE_FRAGMENT_ID); -System.out.println(fragment); +VerificationResponse response = client.getVerify2Client().sendVerification( + VerificationRequest.builder() + .addWorkflow(new WhatsappCodelessWorkflow(VERIFY_NUMBER, VERIFY_WHATSAPP_NUMBER)) + .brand(VERIFY_BRAND_NAME).build() +); +System.out.println("Verification sent: " + response.getRequestId()); ``` -### Delete Template Fragment +### Cancel Request ```java -client.getVerify2Client().deleteTemplateFragment(TEMPLATE_ID, TEMPLATE_FRAGMENT_ID); +client.getVerify2Client().cancelVerification(VERIFY_REQUEST_UUID); ``` ## Voice ### Retrieve Call Info ```java -CallInfo details = client.getVoiceClient().getCallDetails(CALL_UUID); +CallInfo details = client.getVoiceClient().getCallDetails(VOICE_CALL_ID); System.out.println(details); ``` ### Record Message @@ -2592,8 +2578,8 @@ Spark.post("/webhooks/recordings", recordingRoute); ```java Call call = Call.builder() - .from(VONAGE_NUMBER).to(new PhoneEndpoint(TO_NUMBER)) - .answerUrl(ANSWER_URL).eventUrl(EVENT_URL).build(); + .from(VONAGE_VIRTUAL_NUMBER).to(new PhoneEndpoint(VOICE_TO_NUMBER)) + .answerUrl(VOICE_ANSWER_URL).eventUrl(VOICE_EVENT_URL).build(); var response = client.getVoiceClient().createCall(call); System.out.println(response); @@ -2641,39 +2627,35 @@ post("/webhooks/notification", (req, res) -> { ```java TalkAction talkAction = TalkAction.builder("This is a transfer action using an inline NCCO.").build(); -client.getVoiceClient().transferCall(CALL_UUID, new Ncco(talkAction)); +client.getVoiceClient().transferCall(VOICE_CALL_ID, new Ncco(talkAction)); ``` ### Mute Call ```java -client.getVoiceClient().muteCall(CALL_UUID); +client.getVoiceClient().muteCall(VOICE_CALL_ID); Thread.sleep(3000); -client.getVoiceClient().unmuteCall(CALL_UUID); +client.getVoiceClient().unmuteCall(VOICE_CALL_ID); ``` ### End Call ```java -client.getVoiceClient().terminateCall(CALL_UUID); +client.getVoiceClient().terminateCall(VOICE_CALL_ID); ``` ### Transfer Call ```java -final String NCCO_URL = "https://nexmo-community.github.io/ncco-examples/talk.json"; - -client.getVoiceClient().transferCall(CALL_UUID, NCCO_URL); +client.getVoiceClient().transferCall(VOICE_CALL_ID, VOICE_NCCO_URL); ``` ### Record Conversation ```java -final String CONF_NAME = "conf-name"; - /* * Route to answer and connect incoming calls with recording. */ Route answerRoute = (req, res) -> { String recordingUrl = String.format("%s://%s/webhooks/recordings", req.scheme(), req.host()); - ConversationAction conversation = ConversationAction.builder(CONF_NAME) + ConversationAction conversation = ConversationAction.builder(VOICE_CONFERENCE_NAME) .record(true) .eventMethod(EventMethod.POST) .eventUrl(recordingUrl) @@ -2720,9 +2702,9 @@ Spark.post("/recording", downloadRoute); ### Earmuff Call ```java -client.getVoiceClient().earmuffCall(CALL_UUID); +client.getVoiceClient().earmuffCall(VOICE_CALL_ID); Thread.sleep(3000); -client.getVoiceClient().unearmuffCall(CALL_UUID); +client.getVoiceClient().unearmuffCall(VOICE_CALL_ID); ``` ### Conference Call @@ -2748,9 +2730,6 @@ Spark.post("/webhooks/answer", answerRoute); ### Record Call ```java -final String TO_NUMBER = envVar("TO_NUMBER"); -final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - /* * Route to answer and connect incoming calls with recording. */ @@ -2759,9 +2738,8 @@ Route answerRoute = (req, res) -> { RecordAction record = RecordAction.builder().eventUrl(recordingUrl).build(); - ConnectAction connect = ConnectAction.builder(PhoneEndpoint.builder(TO_NUMBER).build()) - .from(VONAGE_NUMBER) - .build(); + ConnectAction connect = ConnectAction.builder(PhoneEndpoint.builder(VOICE_TO_NUMBER).build()) + .from(VONAGE_VIRTUAL_NUMBER).build(); res.type("application/json"); @@ -2785,11 +2763,9 @@ Spark.post("/webhooks/recordings", recordingRoute); ### Stream Audio To Call ```java -final String URL = "https://nexmo-community.github.io/ncco-examples/assets/voice_api_audio_streaming.mp3"; - -var response = client.getVoiceClient().startStream(CALL_UUID, URL, 0); +var response = client.getVoiceClient().startStream(VOICE_CALL_ID, VOICE_STREAM_URL, 0); Thread.sleep(5000); -response = client.getVoiceClient().stopStream(CALL_UUID); +response = client.getVoiceClient().stopStream(VOICE_CALL_ID); ``` ### Inbound Call @@ -2837,9 +2813,6 @@ System.out.println(calls.toJson()); ### Record Call Split Audio ```java -final String TO_NUMBER = envVar("TO_NUMBER"); -final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - /* * Route to answer and connect incoming calls with recording. */ @@ -2852,9 +2825,8 @@ Route answerRoute = (req, res) -> { .split(SplitRecording.CONVERSATION) .build(); - ConnectAction connect = ConnectAction.builder(PhoneEndpoint.builder(TO_NUMBER).build()) - .from(VONAGE_NUMBER) - .build(); + ConnectAction connect = ConnectAction.builder(PhoneEndpoint.builder(VOICE_TO_NUMBER).build()) + .from(VONAGE_VIRTUAL_NUMBER).build(); res.type("application/json"); @@ -2886,13 +2858,9 @@ Route answerRoute = (req, res) -> { .builder("Hello. Please press any key to continue.") .build(); - DtmfSettings dtmfSettings = new DtmfSettings(); - dtmfSettings.setMaxDigits(1); - InputAction input = InputAction.builder() - .type(Collections.singletonList("dtmf")) .eventUrl(String.format("%s://%s/webhooks/dtmf", req.scheme(), req.host())) - .dtmf(dtmfSettings) + .dtmf(DtmfSettings.builder().maxDigits(1).build()) .build(); @@ -2923,22 +2891,19 @@ Spark.post("/webhooks/dtmf", inputRoute); ### Send DTMF To Call ```java -var response = client.getVoiceClient().sendDtmf(CALL_UUID, "332393"); +var response = client.getVoiceClient().sendDtmf(VOICE_CALL_ID, VOICE_DTMF_DIGITS); System.out.println(response); ``` ### Connect Inbound Call ```java -final String YOUR_SECOND_NUMBER = envVar("YOUR_SECOND_NUMBER"); -final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - /* * Route to answer incoming calls with an NCCO response. */ Route answerRoute = (req, res) -> { ConnectAction connect = ConnectAction.builder() - .endpoint(PhoneEndpoint.builder(YOUR_SECOND_NUMBER).build()) - .from(VONAGE_NUMBER) + .endpoint(PhoneEndpoint.builder(VOICE_TO_NUMBER).build()) + .from(VONAGE_VIRTUAL_NUMBER) .build(); res.type("application/json"); @@ -2953,18 +2918,13 @@ Spark.post("/webhooks/answer", answerRoute); ### Send Talk To Call ```java -final String TEXT = "Hello World! Would you like to know more? I bet you would."; -var payload = TalkPayload.builder(TEXT).language(TextToSpeechLanguage.AMERICAN_ENGLISH).build(); -client.getVoiceClient().startTalk(CALL_UUID, payload); +var payload = TalkPayload.builder(VOICE_TEXT).language(VOICE_LANGUAGE).build(); +client.getVoiceClient().startTalk(VOICE_CALL_ID, payload); ``` ### Outbound Text To Speech ```java -final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); -final String TO_NUMBER = envVar("TO_NUMBER"); -final String ANSWER_URL = "https://nexmo-community.github.io/ncco-examples/talk.json"; - -client.getVoiceClient().createCall(new Call(TO_NUMBER, VONAGE_NUMBER, ANSWER_URL)); +client.getVoiceClient().createCall(new Call(VOICE_TO_NUMBER, VONAGE_VIRTUAL_NUMBER, VOICE_ANSWER_URL)); ``` ### ASR Input @@ -2981,7 +2941,6 @@ Route answerCallRoute = (req, res) -> { .language(SpeechSettings.Language.ENGLISH_UNITED_STATES).build(); InputAction input = InputAction.builder() - .type(Collections.singletonList("speech")) .eventUrl(String.format("%s://%s/webhooks/asr", req.scheme(), req.host())) .speech(speechSettings) .build(); @@ -3013,10 +2972,7 @@ Spark.post("/webhooks/asr", speechInputRoute); ### Outbound Text To Speech With NCCO ```java -final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); -final String TO_NUMBER = envVar("TO_NUMBER"); - Ncco ncco = new Ncco(TalkAction.builder("This is a text to speech call from Vonage").build()); -client.getVoiceClient().createCall(new Call(TO_NUMBER, VONAGE_NUMBER, ncco.getActions())); +client.getVoiceClient().createCall(new Call(VOICE_TO_NUMBER, VONAGE_VIRTUAL_NUMBER, ncco.getActions())); ``` diff --git a/build.gradle b/build.gradle index 24f18de5..e0afc7c7 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,7 @@ java { } dependencies { + implementation 'io.github.cdimascio:dotenv-java:3.+' implementation 'com.vonage:server-sdk:8.+' implementation 'com.vonage:jwt:2.+' implementation 'com.sparkjava:spark-core:2.+' diff --git a/src/main/java/AggregateSnippets.java b/src/main/java/AggregateSnippets.java index f91c671a..fc7d5940 100644 --- a/src/main/java/AggregateSnippets.java +++ b/src/main/java/AggregateSnippets.java @@ -7,7 +7,6 @@ import java.util.Objects; public class AggregateSnippets { - public static void main(String[] args) throws Throwable { final var repoRoot = Paths.get("").toAbsolutePath(); final var snippetsSrcRoot = repoRoot.resolve("src/main/java/com/vonage/quickstart"); diff --git a/src/main/java/com/vonage/quickstart/EnvironmentVariables.java b/src/main/java/com/vonage/quickstart/EnvironmentVariables.java new file mode 100644 index 00000000..ad026b46 --- /dev/null +++ b/src/main/java/com/vonage/quickstart/EnvironmentVariables.java @@ -0,0 +1,205 @@ +/* + * Copyright 2025 Vonage + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package com.vonage.quickstart; + +import com.vonage.client.ApiRegion; +import com.vonage.client.numbers.Feature; +import com.vonage.client.numbers.SearchPattern; +import com.vonage.client.numbers.Type; +import com.vonage.client.numbers.UpdateNumberRequest; +import com.vonage.client.verify.Psd2Request; +import com.vonage.client.verify.VerifyRequest; +import com.vonage.client.voice.TextToSpeechLanguage; +import io.github.cdimascio.dotenv.Dotenv; +import java.time.Instant; +import java.util.Arrays; +import java.util.UUID; +import java.util.logging.ConsoleHandler; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * This class contains environment variables designed to be statically imported into the quickstart main classes. + */ +public final class EnvironmentVariables { + private EnvironmentVariables() {} + + private static final Dotenv dotenv = Dotenv.load(); + + static { + if (dotenv.get("QUICKSTART_DEBUG") != null) { + Handler handler = new ConsoleHandler(); + handler.setLevel(Level.FINEST); + Logger logger = Logger.getLogger("com.vonage"); + logger.setLevel(Level.FINEST); + logger.addHandler(handler); + } + } + + /** + * Look up a required environment variable and throw an + * IllegalArgumentException if the variable is not set. + * + * @param key the name of the environment variable + * @return the value + */ + public static String envVar(String key) { + String value = dotenv.get(key); + if (value == null) { + throw new IllegalArgumentException("You must provide the " + key + " environment variable!"); + } + return value; + } + + public static final String + VONAGE_API_KEY = envVar("VONAGE_API_KEY"), + VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"), + VONAGE_SIGNATURE_SECRET = envVar("VONAGE_SIGNATURE_SECRET"), + VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"), + VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"), + VONAGE_VIRTUAL_NUMBER = envVar("VONAGE_VIRTUAL_NUMBER"), + ACCOUNT_ID = envVar("ACCOUNT_ID"), + ACCOUNT_SECRET = envVar("ACCOUNT_SECRET"), + ACCOUNT_SECRET_ID = envVar("ACCOUNT_SECRET_ID"), + ACCOUNT_SMS_CALLBACK_URL = envVar("ACCOUNT_SMS_CALLBACK_URL"), + APPLICATION_NAME = envVar("APPLICATION_NAME"), + MESSAGES_TO_NUMBER = envVar("MESSAGES_TO_NUMBER"), + MESSAGES_MESSAGE_ID = envVar("MESSAGES_MESSAGE_ID"), + MESSAGES_IMAGE_URL = envVar("MESSAGES_IMAGE_URL"), + MESSAGES_AUDIO_URL = envVar("MESSAGES_AUDIO_URL"), + MESSAGES_VIDEO_URL = envVar("MESSAGES_VIDEO_URL"), + MESSAGES_FILE_URL = envVar("MESSAGES_FILE_URL"), + MESSAGES_VCARD_URL = envVar("MESSAGES_VCARD_URL"), + MESSAGES_EMOJI = envVar("MESSAGES_EMOJI"), + MESSAGES_CAPTION = envVar("MESSAGES_CAPTION"), + SMS_SENDER_ID = envVar("SMS_SENDER_ID"), + MMS_SENDER_ID = envVar("MMS_SENDER_ID"), + RCS_SENDER_ID = envVar("RCS_SENDER_ID"), + WHATSAPP_SENDER_ID = envVar("WHATSAPP_SENDER_ID"), + VIBER_SENDER_ID = envVar("VIBER_SENDER_ID"), + MESSENGER_SENDER_ID = envVar("MESSENGER_SENDER_ID"), + MESSENGER_RECIPIENT_ID = envVar("MESSENGER_RECIPIENT_ID"), + WHATSAPP_TEMPLATE_NAME = envVar("WHATSAPP_TEMPLATE_NAME"), + WHATSAPP_OTP = envVar("WHATSAPP_OTP"), + WHATSAPP_CATALOG_ID = envVar("WHATSAPP_CATALOG_ID"), + WHATSAPP_PRODUCT_ID = envVar("WHATSAPP_PRODUCT_ID"), + WHATSAPP_STICKER_ID = envVar("WHATSAPP_STICKER_ID"), + WHATSAPP_STICKER_URL = envVar("WHATSAPP_STICKER_URL"), + WHATSAPP_HEADER_IMAGE_URL = envVar("WHATSAPP_HEADER_IMAGE_URL"), + WHATSAPP_TEMPLATE_NAMESPACE = envVar("WHATSAPP_TEMPLATE_NAMESPACE"), + WHATSAPP_AUTH_TEMPLATE_NAME = envVar("WHATSAPP_AUTH_TEMPLATE_NAME"), + WHATSAPP_TEMPLATE_REPLACEMENT_TEXT = envVar("WHATSAPP_TEMPLATE_REPLACEMENT_TEXT"), + VIBER_THUMB_URL = envVar("VIBER_THUMB_URL"), + MESSAGES_SANDBOX_VIBER_SERVICE_ID = envVar("MESSAGES_SANDBOX_VIBER_SERVICE_ID"), + MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER = envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER"), + MESSAGES_SANDBOX_FB_ID = envVar("MESSAGES_SANDBOX_FB_ID"), + MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID = envVar("MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID"), + MESSAGES_SANDBOX_WHATSAPP_NUMBER = envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER"), + NV_MSISDN = envVar("NV_MSISDN"), + NV_REDIRECT_URI = envVar("NV_REDIRECT_URI"), + SIMSWAP_MSISDN = envVar("SIMSWAP_MSISDN"), + INSIGHT_NUMBER = envVar("INSIGHT_NUMBER"), + INSIGHT_CALLBACK_URL = envVar("INSIGHT_CALLBACK_URL"), + NUMBER_MSISDN = envVar("NUMBER_MSISDN"), + NUMBER_COUNTRY_CODE = envVar("NUMBER_COUNTRY_CODE"), + NUMBER_SEARCH_CRITERIA = envVar("NUMBER_SEARCH_CRITERIA"), + NUMBER_SMS_CALLBACK_URL = envVar("NUMBER_SMS_CALLBACK_URL"), + NUMBER_VOICE_CALLBACK_URL = envVar("NUMBER_VOICE_CALLBACK_URL"), + NUMBER_VOICE_STATUS_CALLBACK_URL = envVar("NUMBER_VOICE_STATUS_CALLBACK_URL"), + VONAGE_REDACT_ID = envVar("VONAGE_REDACT_ID"), + SMS_TO_NUMBER = envVar("SMS_TO_NUMBER"), + SUBACCOUNT_KEY = envVar("SUBACCOUNT_KEY"), + SUBACCOUNT_NAME = envVar("SUBACCOUNT_NAME"), + SUBACCOUNT_SECRET = envVar("SUBACCOUNT_SECRET"), + USER_ID = envVar("USER_ID"), + USER_NAME = envVar("USER_NAME"), + USER_DISPLAY_NAME = envVar("USER_DISPLAY_NAME"), + USER_NEW_NAME = envVar("USER_NEW_NAME"), + USER_NEW_DISPLAY_NAME = envVar("USER_NEW_DISPLAY_NAME"), + VERIFY_NUMBER = envVar("VERIFY_NUMBER"), + VERIFY_BRAND_NAME = envVar("VERIFY_BRAND_NAME"), + VERIFY_PAYEE_NAME = envVar("VERIFY_PAYEE_NAME"), + VERIFY_REQUEST_ID = envVar("VERIFY_REQUEST_ID"), + VERIFY_CODE = envVar("VERIFY_CODE"), + VERIFY_TO_EMAIL = envVar("VERIFY_TO_EMAIL"), + VERIFY_FROM_EMAIL = envVar("VERIFY_FROM_EMAIL"), + VERIFY_WHATSAPP_NUMBER = envVar("VERIFY_WHATSAPP_NUMBER"), + VERIFY_TEMPLATE_NAME = envVar("VERIFY_TEMPLATE_NAME"), + VOICE_CALL_ID = envVar("VOICE_CALL_ID"), + VOICE_TO_NUMBER = envVar("VOICE_TO_NUMBER"), + VOICE_TEXT = envVar("VOICE_TEXT"), + VOICE_DTMF_DIGITS = envVar("VOICE_DTMF_DIGITS"), + VOICE_CONFERENCE_NAME = envVar("VOICE_CONFERENCE_NAME"), + VOICE_NCCO_URL = envVar("VOICE_NCCO_URL"), + VOICE_ANSWER_URL = envVar("VOICE_ANSWER_URL"), + VOICE_EVENT_URL = envVar("VOICE_EVENT_URL"), + VOICE_STREAM_URL = envVar("VOICE_STREAM_URL"); + + public static final byte[] + VONAGE_PRIVATE_KEY_CONTENTS = envVar("VONAGE_PRIVATE_KEY_CONTENTS").getBytes(); + + public static final int + VIBER_VIDEO_DURATION = Integer.parseInt(envVar("VIBER_VIDEO_DURATION")), + VIBER_VIDEO_FILE_SIZE = Integer.parseInt(envVar("VIBER_VIDEO_FILE_SIZE")), + VIBER_VIDEO_TTL = Integer.parseInt(envVar("VIBER_VIDEO_TTL")), + SIMSWAP_MAX_AGE = Integer.parseInt(envVar("SIMSWAP_MAX_AGE")); + + public static final double + SUBACCOUNT_BALANCE_AMOUNT = Double.parseDouble(envVar("SUBACCOUNT_BALANCE_AMOUNT")), + SUBACCOUNT_CREDIT_AMOUNT = Double.parseDouble(envVar("SUBACCOUNT_CREDIT_AMOUNT")), + VERIFY_AMOUNT = Double.parseDouble(envVar("VERIFY_AMOUNT")); + + public static final UUID + VERIFY_REQUEST_UUID = UUID.fromString(envVar("VERIFY_REQUEST_UUID")), + VERIFY_TEMPLATE_ID = UUID.fromString(envVar("VERIFY_TEMPLATE_ID")), + VERIFY_TEMPLATE_FRAGMENT_ID = UUID.fromString(envVar("VERIFY_TEMPLATE_FRAGMENT_ID")); + + public static final Instant + SUBACCOUNT_START_DATE = Instant.parse(envVar("SUBACCOUNT_START_DATE")); + + public static final Type + NUMBER_TYPE = Type.fromString(envVar("NUMBER_TYPE")); + + public static final Feature[] + NUMBER_FEATURES = Arrays.stream(envVar("NUMBER_FEATURES").split(",")) + .map(Feature::fromString) + .toArray(Feature[]::new); + + public static final SearchPattern + NUMBER_SEARCH_PATTERN = SearchPattern.values()[Integer.parseInt(envVar("NUMBER_SEARCH_PATTERN"))]; + + public static final UpdateNumberRequest.CallbackType + NUMBER_VOICE_CALLBACK_TYPE = UpdateNumberRequest.CallbackType.fromString(envVar("NUMBER_VOICE_CALLBACK_TYPE")); + + public static final VerifyRequest.Workflow + VERIFY_WORKFLOW_ID = VerifyRequest.Workflow.values()[Integer.parseInt(envVar("VERIFY_WORKFLOW_ID")) + 1]; + + public static final Psd2Request.Workflow + VERIFY_PSD2_WORKFLOW_ID = Psd2Request.Workflow.values()[Integer.parseInt(envVar("VERIFY_WORKFLOW_ID")) + 1]; + + public static final TextToSpeechLanguage + VOICE_LANGUAGE = TextToSpeechLanguage.valueOf(envVar("VOICE_LANGUAGE")); + + public static final ApiRegion + MESSAGES_GEOSPECIFIC_API_HOST = ApiRegion.fromString(envVar("MESSAGES_GEOSPECIFIC_API_HOST")); +} diff --git a/src/main/java/com/vonage/quickstart/Util.java b/src/main/java/com/vonage/quickstart/Util.java deleted file mode 100644 index a928aa19..00000000 --- a/src/main/java/com/vonage/quickstart/Util.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 2025 Vonage - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package com.vonage.quickstart; - -import java.util.logging.ConsoleHandler; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * This class contains utility methods designed to be statically imported into - * the quickstart main classes. - */ -public class Util { - /** - * Configures logging if the QUICKSTART_DEBUG environment variable is set. - */ - public static void configureLogging() { - String value = System.getenv("QUICKSTART_DEBUG"); - if (value != null) { - Handler handler = new ConsoleHandler(); - handler.setLevel(Level.FINEST); - Logger logger = Logger.getLogger("com.vonage"); - logger.setLevel(Level.FINEST); - logger.addHandler(handler); - } - } - - /** - * Look up a required environment variable and throw an - * IllegalArgumentException if the variable is not set. - * - * @param key the name of the environment variable - * @return the value - */ - public static String envVar(String key) { - String value = System.getenv(key); - if (value == null) { - throw new IllegalArgumentException("You must provide the " + key + " environment variable!"); - } - return value; - } - - /** - * Look up a required environment variable and throw an - * IllegalArgumentException if the value is not one of "0", "1", "true", "false", "on" or "off". - * - * @param key the name of the environment variable - * @return the value - */ - public static boolean booleanEnvVar(String key) { - String stringValue = System.getenv(key); - if (stringValue == null) { - return false; - } else { - stringValue = stringValue.trim().toLowerCase(); - } - - if ("1".equals(stringValue) || "true".equals(stringValue) || "on".equals(stringValue)) { - return true; - } else if ("0".equals(stringValue) || "false".equals(stringValue) || "off".equals(stringValue)) { - return false; - } else { - throw new IllegalArgumentException( - String.format("The value \"%s\" could not be converted to a boolean value", stringValue)); - } - } -} diff --git a/src/main/java/com/vonage/quickstart/account/ConfigureAccount.java b/src/main/java/com/vonage/quickstart/account/ConfigureAccount.java index 77f7b80c..06817e77 100644 --- a/src/main/java/com/vonage/quickstart/account/ConfigureAccount.java +++ b/src/main/java/com/vonage/quickstart/account/ConfigureAccount.java @@ -23,20 +23,16 @@ import com.vonage.client.VonageClient; import com.vonage.client.account.SettingsResponse; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class ConfigureAccount { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String SMS_CALLBACK_URL = envVar("SMS_CALLBACK_URL"); - public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - SettingsResponse response = client.getAccountClient().updateSmsIncomingUrl(SMS_CALLBACK_URL); + SettingsResponse response = client.getAccountClient().updateSmsIncomingUrl(ACCOUNT_SMS_CALLBACK_URL); System.out.println("SMS Callback URL is now " + response.getIncomingSmsUrl()); } } diff --git a/src/main/java/com/vonage/quickstart/account/CreateSecret.java b/src/main/java/com/vonage/quickstart/account/CreateSecret.java index 52b06874..5896389a 100644 --- a/src/main/java/com/vonage/quickstart/account/CreateSecret.java +++ b/src/main/java/com/vonage/quickstart/account/CreateSecret.java @@ -23,20 +23,16 @@ import com.vonage.client.VonageClient; import com.vonage.client.account.SecretResponse; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class CreateSecret { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String NEW_SECRET = envVar("NEW_SECRET"); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - SecretResponse response = client.getAccountClient().createSecret(VONAGE_API_KEY, NEW_SECRET); + SecretResponse response = client.getAccountClient().createSecret(ACCOUNT_ID, ACCOUNT_SECRET); System.out.println(response.getId() + " created at " + response.getCreated()); } } diff --git a/src/main/java/com/vonage/quickstart/account/GetBalance.java b/src/main/java/com/vonage/quickstart/account/GetBalance.java index f524884f..cf804257 100644 --- a/src/main/java/com/vonage/quickstart/account/GetBalance.java +++ b/src/main/java/com/vonage/quickstart/account/GetBalance.java @@ -23,12 +23,9 @@ import com.vonage.client.VonageClient; import com.vonage.client.account.BalanceResponse; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class GetBalance { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/account/GetSecret.java b/src/main/java/com/vonage/quickstart/account/GetSecret.java index 987f569f..37e55b7f 100644 --- a/src/main/java/com/vonage/quickstart/account/GetSecret.java +++ b/src/main/java/com/vonage/quickstart/account/GetSecret.java @@ -23,20 +23,16 @@ import com.vonage.client.VonageClient; import com.vonage.client.account.SecretResponse; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class GetSecret { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String VONAGE_SECRET_ID = envVar("VONAGE_SECRET_ID"); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - SecretResponse response = client.getAccountClient().getSecret(VONAGE_API_KEY, VONAGE_SECRET_ID); + SecretResponse response = client.getAccountClient().getSecret(ACCOUNT_ID, ACCOUNT_SECRET_ID); System.out.println(response.getId() + " created at " + response.getCreated()); } } diff --git a/src/main/java/com/vonage/quickstart/account/ListSecrets.java b/src/main/java/com/vonage/quickstart/account/ListSecrets.java index f7cfdf42..83dfba49 100644 --- a/src/main/java/com/vonage/quickstart/account/ListSecrets.java +++ b/src/main/java/com/vonage/quickstart/account/ListSecrets.java @@ -24,19 +24,16 @@ import com.vonage.client.VonageClient; import com.vonage.client.account.ListSecretsResponse; import com.vonage.client.account.SecretResponse; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class ListSecrets { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - ListSecretsResponse response = client.getAccountClient().listSecrets(VONAGE_API_KEY); + ListSecretsResponse response = client.getAccountClient().listSecrets(ACCOUNT_ID); for (SecretResponse secret : response.getSecrets()) { System.out.println(secret.getId() + " created at " + secret.getCreated()); diff --git a/src/main/java/com/vonage/quickstart/account/RevokeSecret.java b/src/main/java/com/vonage/quickstart/account/RevokeSecret.java index 82e49757..c94cfb67 100644 --- a/src/main/java/com/vonage/quickstart/account/RevokeSecret.java +++ b/src/main/java/com/vonage/quickstart/account/RevokeSecret.java @@ -22,19 +22,15 @@ package com.vonage.quickstart.account; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class RevokeSecret { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String VONAGE_SECRET_ID = envVar("VONAGE_SECRET_ID"); - public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - client.getAccountClient().revokeSecret(VONAGE_API_KEY, VONAGE_SECRET_ID); + client.getAccountClient().revokeSecret(ACCOUNT_ID, ACCOUNT_SECRET_ID); } } diff --git a/src/main/java/com/vonage/quickstart/application/CreateApplication.java b/src/main/java/com/vonage/quickstart/application/CreateApplication.java index aaa3b0de..68a1ff4a 100644 --- a/src/main/java/com/vonage/quickstart/application/CreateApplication.java +++ b/src/main/java/com/vonage/quickstart/application/CreateApplication.java @@ -23,19 +23,13 @@ import com.vonage.client.VonageClient; import com.vonage.client.application.Application; -import com.vonage.client.application.ApplicationClient; -import com.vonage.client.application.capabilities.Capability; import com.vonage.client.application.capabilities.Messages; import com.vonage.client.common.HttpMethod; import com.vonage.client.common.Webhook; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class CreateApplication { - private static final String APPLICATION_NAME = envVar("APPLICATION_NAME"); - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/application/DeleteApplication.java b/src/main/java/com/vonage/quickstart/application/DeleteApplication.java index 31b4c2b8..4fa3394b 100644 --- a/src/main/java/com/vonage/quickstart/application/DeleteApplication.java +++ b/src/main/java/com/vonage/quickstart/application/DeleteApplication.java @@ -22,15 +22,10 @@ package com.vonage.quickstart.application; import com.vonage.client.VonageClient; -import com.vonage.client.application.ApplicationClient; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class DeleteApplication { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/application/GetApplication.java b/src/main/java/com/vonage/quickstart/application/GetApplication.java index 87da19b8..9820d923 100644 --- a/src/main/java/com/vonage/quickstart/application/GetApplication.java +++ b/src/main/java/com/vonage/quickstart/application/GetApplication.java @@ -23,15 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.application.Application; -import com.vonage.client.application.ApplicationClient; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class GetApplication { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/application/ListApplications.java b/src/main/java/com/vonage/quickstart/application/ListApplications.java index 3c8fec00..fd80a55c 100644 --- a/src/main/java/com/vonage/quickstart/application/ListApplications.java +++ b/src/main/java/com/vonage/quickstart/application/ListApplications.java @@ -22,15 +22,11 @@ package com.vonage.quickstart.application; import com.vonage.client.VonageClient; -import com.vonage.client.application.ApplicationClient; import com.vonage.client.application.ApplicationList; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class ListApplications { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/application/UpdateApplication.java b/src/main/java/com/vonage/quickstart/application/UpdateApplication.java index 275ed265..84ab1c6a 100644 --- a/src/main/java/com/vonage/quickstart/application/UpdateApplication.java +++ b/src/main/java/com/vonage/quickstart/application/UpdateApplication.java @@ -28,14 +28,9 @@ import com.vonage.client.common.HttpMethod; import com.vonage.client.common.Webhook; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class UpdateApplication { - private static final String APPLICATION_NAME =envVar("APPLICATION_NAME"); - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/initialize/ApplicationAuthWithKeyContents.java b/src/main/java/com/vonage/quickstart/initialize/ApplicationAuthWithKeyContents.java index c35c24a6..5501e42f 100644 --- a/src/main/java/com/vonage/quickstart/initialize/ApplicationAuthWithKeyContents.java +++ b/src/main/java/com/vonage/quickstart/initialize/ApplicationAuthWithKeyContents.java @@ -22,8 +22,7 @@ package com.vonage.quickstart.initialize; import com.vonage.client.VonageClient; - -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; /** * Example of configuring a VonageClient with Application (JWT) authentication credentials. @@ -31,12 +30,9 @@ public class ApplicationAuthWithKeyContents { public static void main(String[] argv) throws Exception { - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_APPLICATION_PRIVATE_KEY= envVar("VONAGE_PRIVATE_KEY"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) - .privateKeyContents(VONAGE_APPLICATION_PRIVATE_KEY) + .privateKeyContents(VONAGE_PRIVATE_KEY_CONTENTS) .build(); } } diff --git a/src/main/java/com/vonage/quickstart/initialize/ApplicationAuthWithKeyPath.java b/src/main/java/com/vonage/quickstart/initialize/ApplicationAuthWithKeyPath.java index 134cd050..b3fd556a 100644 --- a/src/main/java/com/vonage/quickstart/initialize/ApplicationAuthWithKeyPath.java +++ b/src/main/java/com/vonage/quickstart/initialize/ApplicationAuthWithKeyPath.java @@ -22,8 +22,7 @@ package com.vonage.quickstart.initialize; import com.vonage.client.VonageClient; - -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; /** * Example of configuring a VonageClient with Application (JWT) authentication credentials. @@ -31,12 +30,9 @@ public class ApplicationAuthWithKeyPath { public static void main(String[] argv) throws Exception { - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_APPLICATION_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) - .privateKeyPath(VONAGE_APPLICATION_PRIVATE_KEY_PATH) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); } } diff --git a/src/main/java/com/vonage/quickstart/initialize/BasicAuth.java b/src/main/java/com/vonage/quickstart/initialize/BasicAuth.java index 3aae12d5..941bc904 100644 --- a/src/main/java/com/vonage/quickstart/initialize/BasicAuth.java +++ b/src/main/java/com/vonage/quickstart/initialize/BasicAuth.java @@ -22,17 +22,13 @@ package com.vonage.quickstart.initialize; import com.vonage.client.VonageClient; - -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; /** * Example of configuring a VonageClient with an API secret. */ public class BasicAuth { public static void main(String[] argv) throws Exception { - String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - VonageClient client = VonageClient.builder().apiKey(VONAGE_API_KEY).apiSecret(VONAGE_API_SECRET).build(); } } diff --git a/src/main/java/com/vonage/quickstart/initialize/FullAuth.java b/src/main/java/com/vonage/quickstart/initialize/FullAuth.java index 996139ca..c66b0020 100644 --- a/src/main/java/com/vonage/quickstart/initialize/FullAuth.java +++ b/src/main/java/com/vonage/quickstart/initialize/FullAuth.java @@ -22,8 +22,7 @@ package com.vonage.quickstart.initialize; import com.vonage.client.VonageClient; - -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; /** * Example of configuring a VonageClient with authentication for @@ -31,16 +30,11 @@ */ public class FullAuth { public static void main(String[] argv) throws Exception { - String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_APPLICATION_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .applicationId(VONAGE_APPLICATION_ID) - .privateKeyPath(VONAGE_APPLICATION_PRIVATE_KEY_PATH) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); } } diff --git a/src/main/java/com/vonage/quickstart/insight/AdvancedInsight.java b/src/main/java/com/vonage/quickstart/insight/AdvancedInsight.java index 35887484..8c2be100 100644 --- a/src/main/java/com/vonage/quickstart/insight/AdvancedInsight.java +++ b/src/main/java/com/vonage/quickstart/insight/AdvancedInsight.java @@ -24,17 +24,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.insight.AdvancedInsightResponse; import com.vonage.client.insight.RoamingDetails; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class AdvancedInsight { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String INSIGHT_NUMBER = envVar("INSIGHT_NUMBER"); - public static void main(String[] args) throws Exception { - configureLogging(); - + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) diff --git a/src/main/java/com/vonage/quickstart/insight/AdvancedInsightAsync.java b/src/main/java/com/vonage/quickstart/insight/AdvancedInsightAsync.java index 141d50e2..317c8f97 100644 --- a/src/main/java/com/vonage/quickstart/insight/AdvancedInsightAsync.java +++ b/src/main/java/com/vonage/quickstart/insight/AdvancedInsightAsync.java @@ -23,14 +23,9 @@ import com.vonage.client.VonageClient; import com.vonage.client.insight.AdvancedInsightRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class AdvancedInsightAsync { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String INSIGHT_NUMBER = envVar("INSIGHT_NUMBER"); - private static final String CALLBACK_URL = envVar("CALLBACK_URL"); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) @@ -39,7 +34,7 @@ public static void main(String... args) { client.getInsightClient().getAdvancedNumberInsight( AdvancedInsightRequest.builder(INSIGHT_NUMBER) - .async(true).callback(CALLBACK_URL).build() + .async(true).callback(INSIGHT_CALLBACK_URL).build() ); } } diff --git a/src/main/java/com/vonage/quickstart/insight/AdvancedInsightWithCnam.java b/src/main/java/com/vonage/quickstart/insight/AdvancedInsightWithCnam.java index 03a8860e..ba17c8f9 100644 --- a/src/main/java/com/vonage/quickstart/insight/AdvancedInsightWithCnam.java +++ b/src/main/java/com/vonage/quickstart/insight/AdvancedInsightWithCnam.java @@ -26,16 +26,10 @@ import com.vonage.client.insight.AdvancedInsightResponse; import com.vonage.client.insight.RoamingDetails; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class AdvancedInsightWithCnam { public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - String INSIGHT_NUMBER = envVar("INSIGHT_NUMBER"); VonageClient client = VonageClient.builder().apiKey(VONAGE_API_KEY).apiSecret(VONAGE_API_SECRET).build(); diff --git a/src/main/java/com/vonage/quickstart/insight/BasicInsight.java b/src/main/java/com/vonage/quickstart/insight/BasicInsight.java index 45137489..4ce7aab8 100644 --- a/src/main/java/com/vonage/quickstart/insight/BasicInsight.java +++ b/src/main/java/com/vonage/quickstart/insight/BasicInsight.java @@ -23,17 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.insight.BasicInsightResponse; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class BasicInsight { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String INSIGHT_NUMBER = envVar("INSIGHT_NUMBER"); - public static void main(String[] args) throws Exception { - configureLogging(); - + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) diff --git a/src/main/java/com/vonage/quickstart/insight/StandardInsight.java b/src/main/java/com/vonage/quickstart/insight/StandardInsight.java index 5884bbc6..3a32b3d9 100644 --- a/src/main/java/com/vonage/quickstart/insight/StandardInsight.java +++ b/src/main/java/com/vonage/quickstart/insight/StandardInsight.java @@ -23,17 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.insight.StandardInsightResponse; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class StandardInsight { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String INSIGHT_NUMBER = envVar("INSIGHT_NUMBER"); - public static void main(String[] args) throws Exception { - configureLogging(); - + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) diff --git a/src/main/java/com/vonage/quickstart/jwt/GenerateJwt.java b/src/main/java/com/vonage/quickstart/jwt/GenerateJwt.java index 7dfb5676..eb8747e3 100644 --- a/src/main/java/com/vonage/quickstart/jwt/GenerateJwt.java +++ b/src/main/java/com/vonage/quickstart/jwt/GenerateJwt.java @@ -26,13 +26,13 @@ import java.time.ZonedDateTime; import java.util.Map; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class GenerateJwt { - public static void main(String[] args) throws Throwable { + public static void main(String[] args) throws Throwable { String token = Jwt.builder() .applicationId("aaaaaaaa-bbbb-cccc-dddd-0123456789ab") - .privateKeyPath(Paths.get(envVar("VONAGE_PRIVATE_KEY_PATH"))) + .privateKeyPath(Paths.get(VONAGE_PRIVATE_KEY_PATH)) .subject("alice") .issuedAt(ZonedDateTime.now()) .expiresAt(ZonedDateTime.now().plusMinutes(20)) diff --git a/src/main/java/com/vonage/quickstart/jwt/ValidateInboundJwt.java b/src/main/java/com/vonage/quickstart/jwt/ValidateInboundJwt.java index 573ed5d3..ba244e30 100644 --- a/src/main/java/com/vonage/quickstart/jwt/ValidateInboundJwt.java +++ b/src/main/java/com/vonage/quickstart/jwt/ValidateInboundJwt.java @@ -24,17 +24,15 @@ import com.vonage.jwt.Jwt; import spark.Route; import spark.Spark; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class ValidateInboundJwt { public static void main(String[] args) throws Exception { - final String signatureSecret = envVar("VONAGE_SIGNATURE_SECRET"); - Route validateJwt = (req, res) -> { String token = req.headers("Authorization").substring(7); - if (Jwt.verifySignature(token, signatureSecret)) { + if (Jwt.verifySignature(token, VONAGE_SIGNATURE_SECRET)) { res.status(204); } else { diff --git a/src/main/java/com/vonage/quickstart/meetings/CreateInstantRoom.java b/src/main/java/com/vonage/quickstart/meetings/CreateInstantRoom.java index 6327c275..3c61324f 100644 --- a/src/main/java/com/vonage/quickstart/meetings/CreateInstantRoom.java +++ b/src/main/java/com/vonage/quickstart/meetings/CreateInstantRoom.java @@ -24,16 +24,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.MeetingRoom; import com.vonage.client.meetings.RoomType; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class CreateInstantRoom { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); String DISPLAY_NAME = envVar("DISPLAY_NAME"); VonageClient client = VonageClient.builder() diff --git a/src/main/java/com/vonage/quickstart/meetings/CreateLongTermRoom.java b/src/main/java/com/vonage/quickstart/meetings/CreateLongTermRoom.java index d365445a..00698727 100644 --- a/src/main/java/com/vonage/quickstart/meetings/CreateLongTermRoom.java +++ b/src/main/java/com/vonage/quickstart/meetings/CreateLongTermRoom.java @@ -24,17 +24,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.MeetingRoom; import com.vonage.client.meetings.RoomType; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.time.Instant; public class CreateLongTermRoom { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); String DISPLAY_NAME = envVar("DISPLAY_NAME"); Instant EXPIRATION_DATE = Instant.parse(envVar("EXPIRATION_DATE")); diff --git a/src/main/java/com/vonage/quickstart/meetings/CreateTheme.java b/src/main/java/com/vonage/quickstart/meetings/CreateTheme.java index 2725b289..dbe6774f 100644 --- a/src/main/java/com/vonage/quickstart/meetings/CreateTheme.java +++ b/src/main/java/com/vonage/quickstart/meetings/CreateTheme.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.Theme; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class CreateTheme { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); String MAIN_COLOR = envVar("MAIN_COLOR"); String BRAND_TEXT = envVar("BRAND_TEXT"); diff --git a/src/main/java/com/vonage/quickstart/meetings/DeleteRecording.java b/src/main/java/com/vonage/quickstart/meetings/DeleteRecording.java index d72abb8a..9372a695 100644 --- a/src/main/java/com/vonage/quickstart/meetings/DeleteRecording.java +++ b/src/main/java/com/vonage/quickstart/meetings/DeleteRecording.java @@ -22,17 +22,11 @@ package com.vonage.quickstart.meetings; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.UUID; public class DeleteRecording { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); UUID RECORDING_ID = UUID.fromString(envVar("RECORDING_ID")); VonageClient client = VonageClient.builder() diff --git a/src/main/java/com/vonage/quickstart/meetings/DeleteTheme.java b/src/main/java/com/vonage/quickstart/meetings/DeleteTheme.java index b0048e73..9a36948e 100644 --- a/src/main/java/com/vonage/quickstart/meetings/DeleteTheme.java +++ b/src/main/java/com/vonage/quickstart/meetings/DeleteTheme.java @@ -22,17 +22,11 @@ package com.vonage.quickstart.meetings; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.UUID; public class DeleteTheme { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); UUID THEME_ID = UUID.fromString(envVar("THEME_ID")); VonageClient client = VonageClient.builder() diff --git a/src/main/java/com/vonage/quickstart/meetings/GetRecording.java b/src/main/java/com/vonage/quickstart/meetings/GetRecording.java index 4c236f94..b74d140c 100644 --- a/src/main/java/com/vonage/quickstart/meetings/GetRecording.java +++ b/src/main/java/com/vonage/quickstart/meetings/GetRecording.java @@ -23,17 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.Recording; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.UUID; public class GetRecording { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); UUID RECORDING_ID = UUID.fromString(envVar("RECORDING_ID")); VonageClient client = VonageClient.builder() diff --git a/src/main/java/com/vonage/quickstart/meetings/GetRoom.java b/src/main/java/com/vonage/quickstart/meetings/GetRoom.java index b5b104c7..23d56f15 100644 --- a/src/main/java/com/vonage/quickstart/meetings/GetRoom.java +++ b/src/main/java/com/vonage/quickstart/meetings/GetRoom.java @@ -23,17 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.MeetingRoom; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.UUID; public class GetRoom { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); UUID ROOM_ID = UUID.fromString(envVar("ROOM_ID")); VonageClient client = VonageClient.builder() diff --git a/src/main/java/com/vonage/quickstart/meetings/GetTheme.java b/src/main/java/com/vonage/quickstart/meetings/GetTheme.java index 73e625d6..fe9d4b83 100644 --- a/src/main/java/com/vonage/quickstart/meetings/GetTheme.java +++ b/src/main/java/com/vonage/quickstart/meetings/GetTheme.java @@ -23,17 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.Theme; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.UUID; public class GetTheme { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); UUID THEME_ID = UUID.fromString(envVar("THEME_ID")); VonageClient client = VonageClient.builder() diff --git a/src/main/java/com/vonage/quickstart/meetings/ListDialInNumbers.java b/src/main/java/com/vonage/quickstart/meetings/ListDialInNumbers.java index 5a81180d..e763e275 100644 --- a/src/main/java/com/vonage/quickstart/meetings/ListDialInNumbers.java +++ b/src/main/java/com/vonage/quickstart/meetings/ListDialInNumbers.java @@ -23,18 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.DialInNumber; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; public class ListDialInNumbers { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) diff --git a/src/main/java/com/vonage/quickstart/meetings/ListRecordings.java b/src/main/java/com/vonage/quickstart/meetings/ListRecordings.java index a6bec090..8d7e2f6a 100644 --- a/src/main/java/com/vonage/quickstart/meetings/ListRecordings.java +++ b/src/main/java/com/vonage/quickstart/meetings/ListRecordings.java @@ -23,17 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.Recording; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; public class ListRecordings { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); String SESSION_ID = envVar("SESSION_ID"); VonageClient client = VonageClient.builder() diff --git a/src/main/java/com/vonage/quickstart/meetings/ListRooms.java b/src/main/java/com/vonage/quickstart/meetings/ListRooms.java index b9d2e341..98923d25 100644 --- a/src/main/java/com/vonage/quickstart/meetings/ListRooms.java +++ b/src/main/java/com/vonage/quickstart/meetings/ListRooms.java @@ -23,18 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.MeetingRoom; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; public class ListRooms { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) diff --git a/src/main/java/com/vonage/quickstart/meetings/ListRoomsByTheme.java b/src/main/java/com/vonage/quickstart/meetings/ListRoomsByTheme.java index 04a6539e..3d3aab99 100644 --- a/src/main/java/com/vonage/quickstart/meetings/ListRoomsByTheme.java +++ b/src/main/java/com/vonage/quickstart/meetings/ListRoomsByTheme.java @@ -23,18 +23,12 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.MeetingRoom; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.UUID; public class ListRoomsByTheme { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); UUID THEME_ID = UUID.fromString(envVar("THEME_ID")); VonageClient client = VonageClient.builder() diff --git a/src/main/java/com/vonage/quickstart/meetings/ListThemes.java b/src/main/java/com/vonage/quickstart/meetings/ListThemes.java index a5802cdc..06265a59 100644 --- a/src/main/java/com/vonage/quickstart/meetings/ListThemes.java +++ b/src/main/java/com/vonage/quickstart/meetings/ListThemes.java @@ -23,18 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.Theme; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; public class ListThemes { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) diff --git a/src/main/java/com/vonage/quickstart/meetings/UpdateApplication.java b/src/main/java/com/vonage/quickstart/meetings/UpdateApplication.java index 8df0e351..c71ae2d7 100644 --- a/src/main/java/com/vonage/quickstart/meetings/UpdateApplication.java +++ b/src/main/java/com/vonage/quickstart/meetings/UpdateApplication.java @@ -24,17 +24,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.Application; import com.vonage.client.meetings.UpdateApplicationRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.UUID; public class UpdateApplication { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); UUID THEME_ID = UUID.fromString(envVar("THEME_ID")); VonageClient client = VonageClient.builder() diff --git a/src/main/java/com/vonage/quickstart/meetings/UpdateRoom.java b/src/main/java/com/vonage/quickstart/meetings/UpdateRoom.java index dae0e9dc..6162cb6e 100644 --- a/src/main/java/com/vonage/quickstart/meetings/UpdateRoom.java +++ b/src/main/java/com/vonage/quickstart/meetings/UpdateRoom.java @@ -24,17 +24,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.MeetingRoom; import com.vonage.client.meetings.UpdateRoomRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.UUID; public class UpdateRoom { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); UUID ROOM_ID = UUID.fromString(envVar("ROOM_ID")); UUID THEME_ID = UUID.fromString(envVar("THEME_ID")); diff --git a/src/main/java/com/vonage/quickstart/meetings/UpdateTheme.java b/src/main/java/com/vonage/quickstart/meetings/UpdateTheme.java index d9249a54..0d621d37 100644 --- a/src/main/java/com/vonage/quickstart/meetings/UpdateTheme.java +++ b/src/main/java/com/vonage/quickstart/meetings/UpdateTheme.java @@ -23,17 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.Theme; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.UUID; public class UpdateTheme { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); UUID THEME_ID = UUID.fromString(envVar("THEME_ID")); String MAIN_COLOR = envVar("MAIN_COLOR"); String BRAND_TEXT = envVar("BRAND_TEXT"); diff --git a/src/main/java/com/vonage/quickstart/meetings/UploadLogo.java b/src/main/java/com/vonage/quickstart/meetings/UploadLogo.java index 1225c744..5c93e764 100644 --- a/src/main/java/com/vonage/quickstart/meetings/UploadLogo.java +++ b/src/main/java/com/vonage/quickstart/meetings/UploadLogo.java @@ -23,19 +23,13 @@ import com.vonage.client.VonageClient; import com.vonage.client.meetings.LogoType; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.nio.file.Path; import java.nio.file.Paths; import java.util.UUID; public class UploadLogo { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); UUID THEME_ID = UUID.fromString(envVar("THEME_ID")); LogoType LOGO_TYPE = LogoType.fromString(envVar("LOGO_TYPE")); Path LOGO_FILEPATH = Paths.get(envVar("LOGO_FILEPATH")); diff --git a/src/main/java/com/vonage/quickstart/messages/IncomingMessage.java b/src/main/java/com/vonage/quickstart/messages/IncomingMessage.java index bb4cf306..95d14592 100644 --- a/src/main/java/com/vonage/quickstart/messages/IncomingMessage.java +++ b/src/main/java/com/vonage/quickstart/messages/IncomingMessage.java @@ -22,15 +22,12 @@ package com.vonage.quickstart.messages; import com.vonage.client.messages.InboundMessage; -import static com.vonage.quickstart.Util.configureLogging; import spark.Route; import spark.Spark; public class IncomingMessage { - - public static void main(String[] args) { - configureLogging(); - + public static void main(String[] args) { + Route inboundRoute = (request, response) -> { InboundMessage messageDetails = InboundMessage.fromJson(request.body()); System.out.println( diff --git a/src/main/java/com/vonage/quickstart/messages/MessageStatusWebhook.java b/src/main/java/com/vonage/quickstart/messages/MessageStatusWebhook.java index 4ecddd15..9054f4f2 100644 --- a/src/main/java/com/vonage/quickstart/messages/MessageStatusWebhook.java +++ b/src/main/java/com/vonage/quickstart/messages/MessageStatusWebhook.java @@ -22,15 +22,12 @@ package com.vonage.quickstart.messages; import com.vonage.client.messages.MessageStatus; -import static com.vonage.quickstart.Util.configureLogging; import spark.Route; import spark.Spark; public class MessageStatusWebhook { - - public static void main(String[] args) { - configureLogging(); - + public static void main(String[] args) { + Route inboundRoute = (request, response) -> { MessageStatus messageDetails = MessageStatus.fromJson(request.body()); System.out.println( diff --git a/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerAudio.java b/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerAudio.java index b467fa87..08e0d194 100644 --- a/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerAudio.java +++ b/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerAudio.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.messenger.MessengerAudioRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMessengerAudio { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_FB_SENDER_ID = envVar("VONAGE_FB_SENDER_ID"); - private static final String FB_RECIPIENT_ID = envVar("FB_RECIPIENT_ID"); - private static final String AUDIO_URL = envVar("AUDIO_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,9 +34,9 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( MessengerAudioRequest.builder() - .from(VONAGE_FB_SENDER_ID) - .to(FB_RECIPIENT_ID) - .url(AUDIO_URL) + .from(MESSENGER_SENDER_ID) + .to(MESSENGER_RECIPIENT_ID) + .url(MESSAGES_AUDIO_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerFile.java b/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerFile.java index f9fd0bf0..3da91bec 100644 --- a/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerFile.java +++ b/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerFile.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.messenger.MessengerFileRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMessengerFile { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_FB_SENDER_ID = envVar("VONAGE_FB_SENDER_ID"); - private static final String FB_RECIPIENT_ID = envVar("FB_RECIPIENT_ID"); - private static final String FILE_URL = envVar("FILE_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,9 +34,9 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( MessengerFileRequest.builder() - .from(VONAGE_FB_SENDER_ID) - .to(FB_RECIPIENT_ID) - .url(FILE_URL) + .from(MESSENGER_SENDER_ID) + .to(MESSENGER_RECIPIENT_ID) + .url(MESSAGES_FILE_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerImage.java b/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerImage.java index adb1ffca..b0331416 100644 --- a/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerImage.java +++ b/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerImage.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.messenger.MessengerImageRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMessengerImage { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_FB_SENDER_ID = envVar("VONAGE_FB_SENDER_ID"); - private static final String FB_RECIPIENT_ID = envVar("FB_RECIPIENT_ID"); - private static final String IMAGE_URL = envVar("IMAGE_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,9 +34,9 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( MessengerImageRequest.builder() - .from(VONAGE_FB_SENDER_ID) - .to(FB_RECIPIENT_ID) - .url(IMAGE_URL) + .from(MESSENGER_SENDER_ID) + .to(MESSENGER_RECIPIENT_ID) + .url(MESSAGES_IMAGE_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerText.java b/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerText.java index b1b53a39..a8855ecd 100644 --- a/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerText.java +++ b/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerText.java @@ -23,15 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.messenger.MessengerTextRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMessengerText { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_FB_SENDER_ID = envVar("VONAGE_FB_SENDER_ID"); - private static final String FB_RECIPIENT_ID = envVar("FB_RECIPIENT_ID"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -39,7 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( MessengerTextRequest.builder() - .from(VONAGE_FB_SENDER_ID).to(FB_RECIPIENT_ID) + .from(MESSENGER_SENDER_ID) + .to(MESSENGER_RECIPIENT_ID) .text("This is a Facebook Messenger Message sent from the Messages API") .build() ); diff --git a/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerVideo.java b/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerVideo.java index 0fce3d16..3874e208 100644 --- a/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerVideo.java +++ b/src/main/java/com/vonage/quickstart/messages/messenger/SendMessengerVideo.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.messenger.MessengerVideoRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMessengerVideo { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_FB_SENDER_ID = envVar("VONAGE_FB_SENDER_ID"); - private static final String FB_RECIPIENT_ID = envVar("FB_RECIPIENT_ID"); - private static final String VIDEO_URL = envVar("VIDEO_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,9 +34,9 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( MessengerVideoRequest.builder() - .from(VONAGE_FB_SENDER_ID) - .to(FB_RECIPIENT_ID) - .url(VIDEO_URL) + .from(MESSENGER_SENDER_ID) + .to(MESSENGER_RECIPIENT_ID) + .url(MESSAGES_VIDEO_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/mms/SendMmsAudio.java b/src/main/java/com/vonage/quickstart/messages/mms/SendMmsAudio.java index 12de8dbe..f02726e9 100644 --- a/src/main/java/com/vonage/quickstart/messages/mms/SendMmsAudio.java +++ b/src/main/java/com/vonage/quickstart/messages/mms/SendMmsAudio.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.mms.MmsAudioRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMmsAudio { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String FROM_NUMBER = envVar("FROM_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String AUDIO_URL = envVar("AUDIO_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,9 +34,9 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( MmsAudioRequest.builder() - .from(FROM_NUMBER).to(TO_NUMBER) - .url(AUDIO_URL) - .build() + .from(MMS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_AUDIO_URL) + .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); } diff --git a/src/main/java/com/vonage/quickstart/messages/mms/SendMmsImage.java b/src/main/java/com/vonage/quickstart/messages/mms/SendMmsImage.java index 9517e75b..547033d1 100644 --- a/src/main/java/com/vonage/quickstart/messages/mms/SendMmsImage.java +++ b/src/main/java/com/vonage/quickstart/messages/mms/SendMmsImage.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.mms.MmsImageRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMmsImage { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String FROM_NUMBER = envVar("FROM_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String IMAGE_URL = envVar("IMAGE_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,8 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( MmsImageRequest.builder() - .from(FROM_NUMBER).to(TO_NUMBER) - .url(IMAGE_URL) + .from(MMS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_IMAGE_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/mms/SendMmsVcard.java b/src/main/java/com/vonage/quickstart/messages/mms/SendMmsVcard.java index 0f20fc59..8ba9ce77 100644 --- a/src/main/java/com/vonage/quickstart/messages/mms/SendMmsVcard.java +++ b/src/main/java/com/vonage/quickstart/messages/mms/SendMmsVcard.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.mms.MmsVcardRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMmsVcard { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String FROM_NUMBER = envVar("FROM_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String VCARD_URL = envVar("VCARD_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,8 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( MmsVcardRequest.builder() - .from(FROM_NUMBER).to(TO_NUMBER) - .url(VCARD_URL) + .from(MMS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_VCARD_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/mms/SendMmsVideo.java b/src/main/java/com/vonage/quickstart/messages/mms/SendMmsVideo.java index e57ca9d2..4478e5c4 100644 --- a/src/main/java/com/vonage/quickstart/messages/mms/SendMmsVideo.java +++ b/src/main/java/com/vonage/quickstart/messages/mms/SendMmsVideo.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.mms.MmsVideoRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMmsVideo { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String FROM_NUMBER = envVar("FROM_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String VIDEO_URL = envVar("VIDEO_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,9 +34,9 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( MmsVideoRequest.builder() - .from(FROM_NUMBER).to(TO_NUMBER) - .url(VIDEO_URL) - .build() + .from(MMS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_VIDEO_URL) + .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); } diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/RevokeMessage.java b/src/main/java/com/vonage/quickstart/messages/rcs/RevokeMessage.java index a40e5151..d62904bb 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/RevokeMessage.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/RevokeMessage.java @@ -23,19 +23,15 @@ import com.vonage.client.ApiRegion; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class RevokeMessage { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String MESSAGE_UUID = envVar("MESSAGE_UUID"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - client.getMessagesClient().revokeOutboundMessage(MESSAGE_UUID, ApiRegion.API_EU); + client.getMessagesClient().revokeOutboundMessage(MESSAGES_MESSAGE_ID, MESSAGES_GEOSPECIFIC_API_HOST); } } diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsFile.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsFile.java index a7c5ec8f..8cb51dc2 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsFile.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsFile.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsFileRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendRcsFile { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String FILE_URL = envVar("FILE_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,8 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsFileRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) - .url(FILE_URL) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_FILE_URL) .build() ); System.out.println("Message sent successfully. ID: " + response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsImage.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsImage.java index 134b38cc..63fbcc64 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsImage.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsImage.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsImageRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendRcsImage { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String IMAGE_URL = envVar("IMAGE_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,8 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsImageRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) - .url(IMAGE_URL) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_IMAGE_URL) .build() ); System.out.println("Message sent successfully. ID: " + response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsRichCard.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsRichCard.java index 29d394cc..047db595 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsRichCard.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsRichCard.java @@ -23,18 +23,12 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendRcsRichCard { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String IMAGE_URL = envVar("IMAGE_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -42,7 +36,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "richCard", Map.of("standaloneCard", Map.of( "thumbnailImageAlignment", "RIGHT", @@ -53,7 +47,7 @@ public static void main(String[] args) throws Exception { "media", Map.of( "height", "TALL", "contentInfo", Map.of( - "fileUrl", IMAGE_URL, + "fileUrl", MESSAGES_IMAGE_URL, "forceRefresh", "false" ) ), diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsRichCardCarousel.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsRichCardCarousel.java index 8fad2e12..a079ad3e 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsRichCardCarousel.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsRichCardCarousel.java @@ -23,19 +23,12 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendRcsRichCardCarousel { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String IMAGE_URL = envVar("IMAGE_URL"); - private static final String VIDEO_URL = envVar("VIDEO_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -43,7 +36,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "carouselCard", Map.of( "cardWidth", "MEDIUM", @@ -62,7 +55,7 @@ public static void main(String[] args) throws Exception { "media", Map.of( "height", "MEDIUM", "contentInfo", Map.of( - "fileUrl", IMAGE_URL, + "fileUrl", MESSAGES_IMAGE_URL, "forceRefresh", "false" ) ) @@ -81,7 +74,7 @@ public static void main(String[] args) throws Exception { "media", Map.of( "height", "MEDIUM", "contentInfo", Map.of( - "fileUrl", VIDEO_URL, + "fileUrl", MESSAGES_VIDEO_URL, "forceRefresh", "false" ) ) diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedCalendarEvent.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedCalendarEvent.java index 1ebb3d2a..55a023a0 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedCalendarEvent.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedCalendarEvent.java @@ -23,18 +23,13 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.time.Instant; import java.util.List; import java.util.Map; public class SendRcsSuggestedCalendarEvent { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -42,7 +37,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Product Launch: Save the date!", "suggestions", List.of( diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedDialNumber.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedDialNumber.java index e3c9e897..af88f16e 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedDialNumber.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedDialNumber.java @@ -23,17 +23,12 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendRcsSuggestedDialNumber { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,7 +36,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Call us to claim your free gift!", "suggestions", List.of( diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedMultipleActions.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedMultipleActions.java index e6ab7989..633fe2e9 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedMultipleActions.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedMultipleActions.java @@ -23,17 +23,12 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendRcsSuggestedMultipleActions { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,7 +36,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Need some help? Call us now or visit our website for more information.", "suggestions", List.of( diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedOpenUrl.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedOpenUrl.java index 3468d324..43e7dbc9 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedOpenUrl.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedOpenUrl.java @@ -23,17 +23,12 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendRcsSuggestedOpenUrl { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,7 +36,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Check out our latest offers!", "suggestions", List.of( diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedReply.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedReply.java index 904dfb8c..098bb817 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedReply.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedReply.java @@ -23,17 +23,12 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendRcsSuggestedReply { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,7 +36,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "What do you think of Vonage APIs?", "suggestions", List.of( diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedShareLocation.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedShareLocation.java index 5fbbc5e6..ecdd3d59 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedShareLocation.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedShareLocation.java @@ -23,17 +23,12 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendRcsSuggestedShareLocation { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,7 +36,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Your driver will come and meet you at your specified location.", "suggestions", List.of( diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedViewLocation.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedViewLocation.java index 0eb177d5..45112041 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedViewLocation.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsSuggestedViewLocation.java @@ -23,17 +23,12 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendRcsSuggestedViewLocation { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,7 +36,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsCustomRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of("contentMessage", Map.of( "text", "Drop by our office!", "suggestions", List.of( diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsText.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsText.java index 7c2324a8..d93b73a2 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsText.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsText.java @@ -23,15 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsTextRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendRcsText { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -39,7 +34,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsTextRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) .text("This is an RCS message sent via the Vonage Messages API") .build() ); diff --git a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsVideo.java b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsVideo.java index 68e8ef30..04d047a4 100644 --- a/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsVideo.java +++ b/src/main/java/com/vonage/quickstart/messages/rcs/SendRcsVideo.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.rcs.RcsVideoRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendRcsVideo { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String RCS_SENDER_ID = envVar("RCS_SENDER_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String VIDEO_URL = envVar("VIDEO_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,8 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( RcsVideoRequest.builder() - .from(RCS_SENDER_ID).to(TO_NUMBER) - .url(VIDEO_URL) + .from(RCS_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(MESSAGES_VIDEO_URL) .build() ); System.out.println("Message sent successfully. ID: " + response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/messenger/SendMessengerText.java b/src/main/java/com/vonage/quickstart/messages/sandbox/messenger/SendMessengerText.java index 210c0e4e..6904e3d5 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/messenger/SendMessengerText.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/messenger/SendMessengerText.java @@ -23,23 +23,20 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.messenger.MessengerTextRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMessengerText { - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(MessengerTextRequest.builder() - .from(envVar("MESSAGES_SANDBOX_FB_ID")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID")) + .from(MESSAGES_SANDBOX_FB_ID) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID) .text("Don't miss out on our latest offers!") .build() ).getMessageUuid() diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/messenger/SendMessengerVideo.java b/src/main/java/com/vonage/quickstart/messages/sandbox/messenger/SendMessengerVideo.java index 282e47cc..19ac9d45 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/messenger/SendMessengerVideo.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/messenger/SendMessengerVideo.java @@ -23,24 +23,21 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.messenger.MessengerVideoRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMessengerVideo { - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(MessengerVideoRequest.builder() - .from(envVar("MESSAGES_SANDBOX_FB_ID")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID")) - .url("https://file-examples.com/storage/fee788409562ada83b58ed5/2017/04/file_example_MP4_640_3MG.mp4") + .from(MESSAGES_SANDBOX_FB_ID) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID) + .url(MESSAGES_VIDEO_URL) .build() ).getMessageUuid() ); diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/viber/SendViberText.java b/src/main/java/com/vonage/quickstart/messages/sandbox/viber/SendViberText.java index 9144290a..e605da79 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/viber/SendViberText.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/viber/SendViberText.java @@ -24,23 +24,20 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.viber.Category; import com.vonage.client.messages.viber.ViberTextRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendViberText { - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(ViberTextRequest.builder() - .from(envVar("MESSAGES_SANDBOX_VIBER_SERVICE_ID")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) + .from(MESSAGES_SANDBOX_VIBER_SERVICE_ID) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) .text("Don't miss out on our latest offers!") .category(Category.PROMOTION) .build() diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/viber/SendViberVideo.java b/src/main/java/com/vonage/quickstart/messages/sandbox/viber/SendViberVideo.java index 56e5af16..80245787 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/viber/SendViberVideo.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/viber/SendViberVideo.java @@ -24,24 +24,23 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.viber.Category; import com.vonage.client.messages.viber.ViberVideoRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendViberVideo { - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient().useSandboxEndpoint() .sendMessage(ViberVideoRequest.builder() - .from(envVar("MESSAGES_SANDBOX_VIBER_SERVICE_ID")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) + .from(MESSAGES_SANDBOX_VIBER_SERVICE_ID) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) .category(Category.PROMOTION) - .duration(Integer.parseInt(envVar("VIDEO_DURATION"))) - .fileSize(Integer.parseInt(envVar("VIDEO_SIZE"))) - .thumbUrl(envVar("THUMB_URL")) - .url(envVar("VIDEO_URL")) + .duration(VIBER_VIDEO_DURATION) + .fileSize(VIBER_VIDEO_FILE_SIZE) + .thumbUrl(VIBER_THUMB_URL) + .url(MESSAGES_VIDEO_URL) .caption("Check out this video!").build() ).getMessageUuid() ); diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappAudio.java b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappAudio.java index 0c244250..cadbed07 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappAudio.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappAudio.java @@ -23,24 +23,21 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappAudioRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappAudio { - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappAudioRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .url("https://file-examples.com/storage/fee788409562ada83b58ed5/2017/11/file_example_MP3_1MG.mp3") + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .url(MESSAGES_AUDIO_URL) .build() ).getMessageUuid() ); diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappContact.java b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappContact.java index 6c8aa7d4..e99727f8 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappContact.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappContact.java @@ -23,25 +23,22 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappCustomRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendWhatsappContact { - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappCustomRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) .custom(Map.of( "type", "contacts", "contacts", List.of(Map.of( diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappFile.java b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappFile.java index 9a57c63a..014c0180 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappFile.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappFile.java @@ -23,24 +23,21 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappFileRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappFile { - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappFileRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .url("https://file-examples.com/storage/fee788409562ada83b58ed5/2017/10/file-sample_150kB.pdf") + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .url(MESSAGES_FILE_URL) .caption("Accompanying message (optional)") .build() ).getMessageUuid() diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappImage.java b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappImage.java index 5532ff9a..db58643a 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappImage.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappImage.java @@ -23,24 +23,22 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappImageRequest; -import static com.vonage.quickstart.Util.*; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappImage { - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + System.out.println(VonageClient.builder() - .apiKey(envVar("VONAGE_API_KEY")) - .apiSecret(envVar("VONAGE_API_SECRET")) + .apiKey(VONAGE_API_KEY) + .apiSecret(VONAGE_API_SECRET) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappImageRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .url("https://lastfm.freetls.fastly.net/i/u/770x0/a21ed806c65618ea1e7a6c8b4abf0402.jpg") - .caption("Fluttershy") + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .url(MESSAGES_IMAGE_URL) + .caption(MESSAGES_CAPTION) .build() ).getMessageUuid() ); diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappLocation.java b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappLocation.java index 0b55478c..52d01ad4 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappLocation.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappLocation.java @@ -23,19 +23,18 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappLocationRequest; -import static com.vonage.quickstart.Util.*; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappLocation { - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { System.out.println(VonageClient.builder() - .apiKey(envVar("VONAGE_API_KEY")) - .apiSecret(envVar("VONAGE_API_SECRET")) + .apiKey(VONAGE_API_KEY) + .apiSecret(VONAGE_API_SECRET) .build() .getMessagesClient() .sendMessage(WhatsappLocationRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) .longitude(-122.1503115) .latitude(37.4843538) .name("Facebook HQ") diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappReaction.java b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappReaction.java index 299f49df..df42e2df 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappReaction.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappReaction.java @@ -23,22 +23,21 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappReactionRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappReaction { - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappReactionRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .contextMessageId(envVar("MESSAGE_UUID")) - .reaction(envVar("EMOJI")) + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .contextMessageId(MESSAGES_MESSAGE_ID) + .reaction(MESSAGES_EMOJI) .build() ).getMessageUuid() ); diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappSticker.java b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappSticker.java index a927b855..afbe5ae3 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappSticker.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappSticker.java @@ -23,24 +23,21 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappStickerRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappSticker { - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappStickerRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .url("https://file-examples.com/storage/fe0b804ac5640668798b8d0/2020/03/file_example_WEBP_250kB.webp") + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .url(WHATSAPP_STICKER_URL) .build() ).getMessageUuid() ); diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappText.java b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappText.java index 7189daf6..dfe48611 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappText.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappText.java @@ -23,23 +23,20 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappTextRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappText { - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappTextRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) .text("Hello from Vonage, "+System.getenv("NAME")) .build() ).getMessageUuid() diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappUnreaction.java b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappUnreaction.java index 61832231..e9d89a4b 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappUnreaction.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappUnreaction.java @@ -23,21 +23,20 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappReactionRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappUnreaction { - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappReactionRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .contextMessageId(envVar("MESSAGE_UUID")) + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .contextMessageId(MESSAGES_MESSAGE_ID) .unreact().build() ).getMessageUuid() ); diff --git a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappVideo.java b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappVideo.java index c693ffcb..b1b25ed8 100644 --- a/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappVideo.java +++ b/src/main/java/com/vonage/quickstart/messages/sandbox/whatsapp/SendWhatsappVideo.java @@ -23,24 +23,21 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappVideoRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappVideo { - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + System.out.println(VonageClient.builder() - .applicationId(envVar("VONAGE_APPLICATION_ID")) - .privateKeyPath(envVar("VONAGE_PRIVATE_KEY_PATH")) + .applicationId(VONAGE_APPLICATION_ID) + .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build() .getMessagesClient() .useSandboxEndpoint() .sendMessage(WhatsappVideoRequest.builder() - .from(envVar("MESSAGES_SANDBOX_WHATSAPP_NUMBER")) - .to(envVar("MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER")) - .url("https://file-examples.com/storage/fee788409562ada83b58ed5/2017/04/file_example_MP4_640_3MG.mp4") + .from(MESSAGES_SANDBOX_WHATSAPP_NUMBER) + .to(MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER) + .url(MESSAGES_VIDEO_URL) .build() ).getMessageUuid() ); diff --git a/src/main/java/com/vonage/quickstart/messages/sms/SendSmsText.java b/src/main/java/com/vonage/quickstart/messages/sms/SendSmsText.java index 068a9656..5bf2fd53 100644 --- a/src/main/java/com/vonage/quickstart/messages/sms/SendSmsText.java +++ b/src/main/java/com/vonage/quickstart/messages/sms/SendSmsText.java @@ -23,15 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.sms.SmsTextRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendSmsText { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_BRAND_NAME = envVar("VONAGE_BRAND_NAME"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -39,7 +34,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( SmsTextRequest.builder() - .from(VONAGE_BRAND_NAME).to(TO_NUMBER) + .from(SMS_SENDER_ID).to(MESSAGES_TO_NUMBER) .text("This is an SMS text message sent using the Messages API") .build() ); diff --git a/src/main/java/com/vonage/quickstart/messages/viber/SendViberFile.java b/src/main/java/com/vonage/quickstart/messages/viber/SendViberFile.java index 53826982..736734a7 100644 --- a/src/main/java/com/vonage/quickstart/messages/viber/SendViberFile.java +++ b/src/main/java/com/vonage/quickstart/messages/viber/SendViberFile.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.viber.ViberFileRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendViberFile { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VIBER_SERVICE_MESSAGE_ID = envVar("VIBER_SERVICE_MESSAGE_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String FILE_URL = envVar("FILE_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,9 +34,9 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( ViberFileRequest.builder() - .from(VIBER_SERVICE_MESSAGE_ID) - .to(TO_NUMBER) - .url(FILE_URL) + .from(VIBER_SENDER_ID) + .to(MESSAGES_TO_NUMBER) + .url(MESSAGES_FILE_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/viber/SendViberImage.java b/src/main/java/com/vonage/quickstart/messages/viber/SendViberImage.java index 8cad1f01..8158ff24 100644 --- a/src/main/java/com/vonage/quickstart/messages/viber/SendViberImage.java +++ b/src/main/java/com/vonage/quickstart/messages/viber/SendViberImage.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.viber.ViberImageRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendViberImage { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VIBER_SERVICE_MESSAGE_ID = envVar("VIBER_SERVICE_MESSAGE_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String IMAGE_URL = envVar("IMAGE_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,9 +34,9 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( ViberImageRequest.builder() - .from(VIBER_SERVICE_MESSAGE_ID) - .to(TO_NUMBER) - .url(IMAGE_URL) + .from(VIBER_SENDER_ID) + .to(MESSAGES_TO_NUMBER) + .url(MESSAGES_IMAGE_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/viber/SendViberText.java b/src/main/java/com/vonage/quickstart/messages/viber/SendViberText.java index cc172f6b..6d1d7e42 100644 --- a/src/main/java/com/vonage/quickstart/messages/viber/SendViberText.java +++ b/src/main/java/com/vonage/quickstart/messages/viber/SendViberText.java @@ -23,15 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.viber.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendViberText { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String FROM_ID = envVar("FROM_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -39,7 +34,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( ViberTextRequest.builder() - .from(FROM_ID).to(TO_NUMBER) + .from(VIBER_SENDER_ID).to(MESSAGES_TO_NUMBER) .text("Don't miss out on our latest offers!") .category(Category.PROMOTION) .build() diff --git a/src/main/java/com/vonage/quickstart/messages/viber/SendViberVideo.java b/src/main/java/com/vonage/quickstart/messages/viber/SendViberVideo.java index cfd45480..fab1d4bf 100644 --- a/src/main/java/com/vonage/quickstart/messages/viber/SendViberVideo.java +++ b/src/main/java/com/vonage/quickstart/messages/viber/SendViberVideo.java @@ -23,15 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.viber.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendViberVideo { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_VIBER_SERVICE_MESSAGE_ID = envVar("VONAGE_VIBER_SERVICE_MESSAGE_ID"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -39,12 +34,14 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( ViberVideoRequest.builder() - .to(TO_NUMBER) - .from(VONAGE_VIBER_SERVICE_MESSAGE_ID) - .url("https://example.com/video.mp4") - .thumbUrl("https://example.com/image.jpg") + .to(MESSAGES_TO_NUMBER) + .from(VIBER_SENDER_ID) + .url(MESSAGES_VIDEO_URL) + .thumbUrl(VIBER_THUMB_URL) .category(Category.TRANSACTION) - .fileSize(42).duration(35).ttl(86400) + .fileSize(VIBER_VIDEO_FILE_SIZE) + .duration(VIBER_VIDEO_DURATION) + .ttl(VIBER_VIDEO_TTL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/MarkAsRead.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/MarkAsRead.java index 5e2244c5..9e4949b0 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/MarkAsRead.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/MarkAsRead.java @@ -23,19 +23,15 @@ import com.vonage.client.ApiRegion; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class MarkAsRead { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String MESSAGE_UUID = envVar("MESSAGE_UUID"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - client.getMessagesClient().ackInboundMessage(MESSAGE_UUID, ApiRegion.API_EU); + client.getMessagesClient().ackInboundMessage(MESSAGES_MESSAGE_ID, ApiRegion.API_EU); } } diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappAudio.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappAudio.java index 681eb981..09e5b6aa 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappAudio.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappAudio.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappAudioRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappAudio { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String AUDIO_URL = envVar("AUDIO_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,9 +34,9 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappAudioRequest.builder() - .to(TO_NUMBER) - .from(VONAGE_WHATSAPP_NUMBER) - .url(AUDIO_URL) + .to(MESSAGES_TO_NUMBER) + .from(WHATSAPP_SENDER_ID) + .url(MESSAGES_AUDIO_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappAuthenticationTemplate.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappAuthenticationTemplate.java index 06642a8b..9d2853de 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappAuthenticationTemplate.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappAuthenticationTemplate.java @@ -24,19 +24,12 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.MessageType; import com.vonage.client.messages.whatsapp.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendWhatsappAuthenticationTemplate { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String WHATSAPP_AUTH_TEMPLATE_NAME = envVar("WHATSAPP_AUTH_TEMPLATE_NAME"); - private static final String OTP = envVar("OTP"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -44,7 +37,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of( "type", MessageType.TEMPLATE, "template", Map.of( @@ -59,7 +52,7 @@ public static void main(String[] args) throws Exception { "parameters", List.of( Map.of( "type", MessageType.TEXT, - "text", OTP + "text", WHATSAPP_OTP ) ) ), @@ -70,7 +63,7 @@ public static void main(String[] args) throws Exception { "parameters", List.of( Map.of( "type", MessageType.TEXT, - "text", OTP + "text", WHATSAPP_OTP ) ) ) diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappContact.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappContact.java index 90b60930..f0105931 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappContact.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappContact.java @@ -25,15 +25,10 @@ import com.vonage.client.messages.whatsapp.WhatsappCustomRequest; import java.util.List; import java.util.Map; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappContact { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,7 +36,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of( "type", "contacts", "contacts", List.of(Map.of( diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappFile.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappFile.java index f045a3b4..d077883b 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappFile.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappFile.java @@ -23,17 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappFileRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappFile { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String FILE_URL = envVar("FILE_URL"); - private static final String FILE_CAPTION = envVar("FILE_CAPTION"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,8 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappFileRequest.builder() - .to(TO_NUMBER).from(VONAGE_WHATSAPP_NUMBER) - .url(FILE_URL).caption(FILE_CAPTION) + .to(MESSAGES_TO_NUMBER).from(WHATSAPP_SENDER_ID) + .url(MESSAGES_FILE_URL).caption(MESSAGES_CAPTION) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappImage.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappImage.java index 7850b79f..0ed6eda7 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappImage.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappImage.java @@ -23,17 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappImageRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappImage { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String IMAGE_URL = envVar("IMAGE_URL"); - private static final String IMAGE_CAPTION = envVar("IMAGE_CAPTION"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,8 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappImageRequest.builder() - .to(TO_NUMBER).from(VONAGE_WHATSAPP_NUMBER) - .url(IMAGE_URL).caption(IMAGE_CAPTION) + .to(MESSAGES_TO_NUMBER).from(WHATSAPP_SENDER_ID) + .url(MESSAGES_IMAGE_URL).caption(MESSAGES_CAPTION) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappLinkButton.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappLinkButton.java index 1c91cfcb..17f0be12 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappLinkButton.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappLinkButton.java @@ -25,20 +25,12 @@ import com.vonage.client.messages.whatsapp.Locale; import com.vonage.client.messages.whatsapp.Policy; import com.vonage.client.messages.whatsapp.WhatsappCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendWhatsappLinkButton { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String WHATSAPP_TEMPLATE_NAMESPACE = envVar("WHATSAPP_TEMPLATE_NAMESPACE"); - private static final String WHATSAPP_TEMPLATE_NAME = envVar("WHATSAPP_TEMPLATE_NAMES"); - private static final String HEADER_IMAGE_URL = envVar("HEADER_IMAGE_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -46,7 +38,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of( "type", "template", "template", Map.of( @@ -63,7 +55,7 @@ public static void main(String[] args) throws Exception { Map.of( "type", "image", "image", Map.of( - "link", HEADER_IMAGE_URL + "link", WHATSAPP_HEADER_IMAGE_URL ) ) ) diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappLocation.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappLocation.java index ced892ee..e9e726ad 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappLocation.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappLocation.java @@ -23,15 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappLocationRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappLocation { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -39,7 +34,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappLocationRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .name("Facebook HQ") .address("1 Hacker Way, Menlo Park, CA 94025") .longitude(-122.1503115).latitude(37.4843538) diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappMediaTemplate.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappMediaTemplate.java index dbe6d82b..0f5514ff 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappMediaTemplate.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappMediaTemplate.java @@ -26,20 +26,12 @@ import com.vonage.client.messages.whatsapp.Locale; import com.vonage.client.messages.whatsapp.Policy; import com.vonage.client.messages.whatsapp.WhatsappCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendWhatsappMediaTemplate { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String WHATSAPP_TEMPLATE_NAME = envVar("WHATSAPP_TEMPLATE_NAME"); - private static final String WHATSAPP_TEMPLATE_REPLACEMENT_TEXT = envVar("WHATSAPP_TEMPLATE_REPLACEMENT_TEXT"); - private static final String IMAGE_URL = envVar("IMAGE_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -47,7 +39,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of( "type", MessageType.TEMPLATE, "template", Map.of( @@ -63,7 +55,7 @@ public static void main(String[] args) throws Exception { Map.of( "type", MessageType.IMAGE, "image", Map.of( - "link", IMAGE_URL + "link", MESSAGES_IMAGE_URL ) ) ) diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappMultiProduct.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappMultiProduct.java index 08e5ba8a..ef8975ff 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappMultiProduct.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappMultiProduct.java @@ -23,16 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappMultiProductRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.Arrays; public class SendWhatsappMultiProduct { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,7 +35,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappMultiProductRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .catalogId("1166260820787549") .headerText("Our top products") .bodyText("Check out these great products") diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappOTP.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappOTP.java index f41f9ce6..800cde87 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappOTP.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappOTP.java @@ -23,21 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.*; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.*; public class SendWhatsappOTP { - - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - String TO_NUMBER = envVar("TO_NUMBER"); - String WHATSAPP_TEMPLATE_NAME = envVar("WHATSAPP_TEMPLATE_NAME"); - + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -71,7 +61,7 @@ public static void main(String[] args) throws Exception { custom.put("components", components); WhatsappCustomRequest message = WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(custom).build(); client.getMessagesClient().sendMessage(message); diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappQuickReplyButton.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappQuickReplyButton.java index fd056e7c..cab10369 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappQuickReplyButton.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappQuickReplyButton.java @@ -26,19 +26,12 @@ import com.vonage.client.messages.whatsapp.Locale; import com.vonage.client.messages.whatsapp.Policy; import com.vonage.client.messages.whatsapp.WhatsappCustomRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; import java.util.Map; public class SendWhatsappQuickReplyButton { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String WHATSAPP_TEMPLATE_NAME = envVar("WHATSAPP_TEMPLATE_NAME"); - private static final String WHATSAPP_TEMPLATE_NAMESPACE = envVar("WHATSAPP_TEMPLATE_NAMESPACE"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -46,7 +39,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappCustomRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .custom(Map.of( "type", MessageType.TEMPLATE, "template", Map.of( diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappReaction.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappReaction.java index 192f5177..815732b0 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappReaction.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappReaction.java @@ -23,17 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappReactionRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappReaction { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String EMOJI = envVar("EMOJI"); - private static final String MESSAGE_UUID = envVar("MESSAGE_UUID"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,9 +34,9 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappReactionRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) - .contextMessageId(MESSAGE_UUID) - .reaction(EMOJI).build() + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) + .contextMessageId(MESSAGES_MESSAGE_ID) + .reaction(MESSAGES_EMOJI).build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); } diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappSingleProduct.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappSingleProduct.java index fe58dcb6..0ebbead1 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappSingleProduct.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappSingleProduct.java @@ -23,17 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappSingleProductRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappSingleProduct { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String CATALOG_ID = envVar("CATALOG_ID"); - private static final String PRODUCT_ID = envVar("PRODUCT_ID"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,9 +34,9 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappSingleProductRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) - .catalogId(CATALOG_ID) - .productRetailerId(PRODUCT_ID) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) + .catalogId(WHATSAPP_CATALOG_ID) + .productRetailerId(WHATSAPP_PRODUCT_ID) .bodyText("Check out this cool product") .footerText("Sale now on!") .build() diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappStickerId.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappStickerId.java index f9898783..5b78cd75 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappStickerId.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappStickerId.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappStickerRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappStickerId { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String STICKER_ID = envVar("STICKER_ID"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,8 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappStickerRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) - .id(STICKER_ID) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) + .id(WHATSAPP_STICKER_ID) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappStickerUrl.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappStickerUrl.java index 6958510e..b2554342 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappStickerUrl.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappStickerUrl.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappStickerRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappStickerUrl { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String STICKER_URL = envVar("STICKER_URL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,8 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappStickerRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) - .url(STICKER_URL) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) + .url(WHATSAPP_STICKER_URL) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappTemplate.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappTemplate.java index 2f0b8f9c..516c3ae5 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappTemplate.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappTemplate.java @@ -26,17 +26,10 @@ import com.vonage.client.messages.whatsapp.Policy; import com.vonage.client.messages.whatsapp.WhatsappTemplateRequest; import java.util.List; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappTemplate { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String WHATSAPP_TEMPLATE_NAMESPACE = envVar("WHATSAPP_TEMPLATE_NAMESPACE"); - private static final String WHATSAPP_TEMPLATE_NAME = envVar("WHATSAPP_TEMPLATE_NAME"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -44,7 +37,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappTemplateRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .policy(Policy.DETERMINISTIC).locale(Locale.ENGLISH_UK) .name(WHATSAPP_TEMPLATE_NAMESPACE+':'+WHATSAPP_TEMPLATE_NAME) .parameters(List.of( diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappText.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappText.java index b62f4900..b3a0a418 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappText.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappText.java @@ -23,15 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappTextRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappText { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -39,7 +34,7 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappTextRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) .text("This is a WhatsApp Message text message sent using the Messages API") .build() ); diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappUnreaction.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappUnreaction.java index ec61fc97..9527f553 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappUnreaction.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappUnreaction.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappReactionRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappUnreaction { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String MESSAGE_UUID = envVar("MESSAGE_UUID"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,8 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappReactionRequest.builder() - .from(VONAGE_WHATSAPP_NUMBER).to(TO_NUMBER) - .contextMessageId(MESSAGE_UUID) + .from(WHATSAPP_SENDER_ID).to(MESSAGES_TO_NUMBER) + .contextMessageId(MESSAGES_MESSAGE_ID) .unreact().build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappVideo.java b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappVideo.java index 699ed20a..6b3339cd 100644 --- a/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappVideo.java +++ b/src/main/java/com/vonage/quickstart/messages/whatsapp/SendWhatsappVideo.java @@ -23,17 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.messages.whatsapp.WhatsappVideoRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendWhatsappVideo { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String VONAGE_WHATSAPP_NUMBER = envVar("VONAGE_WHATSAPP_NUMBER"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String VIDEO_URL = envVar("VIDEO_URL"); - private static final String VIDEO_CAPTION = envVar("VIDEO_CAPTION"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -41,8 +34,8 @@ public static void main(String[] args) throws Exception { var response = client.getMessagesClient().sendMessage( WhatsappVideoRequest.builder() - .to(TO_NUMBER).from(VONAGE_WHATSAPP_NUMBER) - .url(VIDEO_URL).caption(VIDEO_CAPTION) + .to(MESSAGES_TO_NUMBER).from(WHATSAPP_SENDER_ID) + .url(MESSAGES_VIDEO_URL).caption(MESSAGES_CAPTION) .build() ); System.out.println("Message sent successfully. ID: "+response.getMessageUuid()); diff --git a/src/main/java/com/vonage/quickstart/numberinsight2/FraudScore.java b/src/main/java/com/vonage/quickstart/numberinsight2/FraudScore.java index 1a7a2ad6..6ca04290 100644 --- a/src/main/java/com/vonage/quickstart/numberinsight2/FraudScore.java +++ b/src/main/java/com/vonage/quickstart/numberinsight2/FraudScore.java @@ -23,18 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.numberinsight2.Insight; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class FraudScore { - - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - String INSIGHT_NUMBER = envVar("INSIGHT_NUMBER"); - + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder().apiKey(VONAGE_API_KEY).apiSecret(VONAGE_API_SECRET).build(); var response = client.getNumberInsight2Client().fraudCheck(INSIGHT_NUMBER, Insight.FRAUD_SCORE); diff --git a/src/main/java/com/vonage/quickstart/numberinsight2/SimSwap.java b/src/main/java/com/vonage/quickstart/numberinsight2/SimSwap.java index 7da16d40..ead87acf 100644 --- a/src/main/java/com/vonage/quickstart/numberinsight2/SimSwap.java +++ b/src/main/java/com/vonage/quickstart/numberinsight2/SimSwap.java @@ -23,18 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.numberinsight2.Insight; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SimSwap { - - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - String INSIGHT_NUMBER = envVar("INSIGHT_NUMBER"); - + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder().apiKey(VONAGE_API_KEY).apiSecret(VONAGE_API_SECRET).build(); var response = client.getNumberInsight2Client().fraudCheck(INSIGHT_NUMBER, Insight.SIM_SWAP); diff --git a/src/main/java/com/vonage/quickstart/numbers/BuyNumber.java b/src/main/java/com/vonage/quickstart/numbers/BuyNumber.java index 9cdf11d9..cf182aae 100644 --- a/src/main/java/com/vonage/quickstart/numbers/BuyNumber.java +++ b/src/main/java/com/vonage/quickstart/numbers/BuyNumber.java @@ -22,20 +22,15 @@ package com.vonage.quickstart.numbers; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class BuyNumber { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String COUNTRY_CODE = envVar("COUNTRY_CODE"); - private static final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - client.getNumbersClient().buyNumber(COUNTRY_CODE, VONAGE_NUMBER); + client.getNumbersClient().buyNumber(NUMBER_COUNTRY_CODE, NUMBER_MSISDN); } } diff --git a/src/main/java/com/vonage/quickstart/numbers/CancelNumber.java b/src/main/java/com/vonage/quickstart/numbers/CancelNumber.java index 3fde25e2..b4c7fea5 100644 --- a/src/main/java/com/vonage/quickstart/numbers/CancelNumber.java +++ b/src/main/java/com/vonage/quickstart/numbers/CancelNumber.java @@ -22,21 +22,15 @@ package com.vonage.quickstart.numbers; import com.vonage.client.VonageClient; -import com.vonage.client.numbers.NumbersClient; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class CancelNumber { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String COUNTRY_CODE = envVar("COUNTRY_CODE"); - private static final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - client.getNumbersClient().cancelNumber(COUNTRY_CODE, VONAGE_NUMBER); + client.getNumbersClient().cancelNumber(NUMBER_COUNTRY_CODE, NUMBER_MSISDN); } } diff --git a/src/main/java/com/vonage/quickstart/numbers/ListNumbers.java b/src/main/java/com/vonage/quickstart/numbers/ListNumbers.java index f59d1e24..2d9814f2 100644 --- a/src/main/java/com/vonage/quickstart/numbers/ListNumbers.java +++ b/src/main/java/com/vonage/quickstart/numbers/ListNumbers.java @@ -23,14 +23,9 @@ import com.vonage.client.VonageClient; import com.vonage.client.numbers.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class ListNumbers { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String NUMBER_SEARCH_CRITERIA = envVar("NUMBER_SEARCH_CRITERIA"); - private static final SearchPattern NUMBER_SEARCH_PATTERN = SearchPattern.valueOf(envVar("NUMBER_SEARCH_PATTERN")); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/numbers/SearchNumbers.java b/src/main/java/com/vonage/quickstart/numbers/SearchNumbers.java index 01610181..6bf7786a 100644 --- a/src/main/java/com/vonage/quickstart/numbers/SearchNumbers.java +++ b/src/main/java/com/vonage/quickstart/numbers/SearchNumbers.java @@ -23,19 +23,9 @@ import com.vonage.client.VonageClient; import com.vonage.client.numbers.*; -import static com.vonage.quickstart.Util.envVar; -import java.util.Arrays; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SearchNumbers { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String NUMBER_SEARCH_CRITERIA = envVar("NUMBER_SEARCH_CRITERIA"); - private static final SearchPattern NUMBER_SEARCH_PATTERN = SearchPattern.valueOf(envVar("NUMBER_SEARCH_PATTERN")); - private static final String COUNTRY_CODE = envVar("COUNTRY_CODE"); - private static final Feature[] VONAGE_NUMBER_FEATURES = Arrays.stream( - envVar("VONAGE_NUMBER_FEATURES").split(",")).map(Feature::valueOf).toArray(Feature[]::new); - private static final Type VONAGE_NUMBER_TYPE = Type.valueOf(envVar("VONAGE_NUMBER_TYPE")); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) @@ -44,9 +34,9 @@ public static void main(String[] args) { SearchNumbersResponse response = client.getNumbersClient().searchNumbers( SearchNumbersFilter.builder() - .country(COUNTRY_CODE) - .type(VONAGE_NUMBER_TYPE) - .features(VONAGE_NUMBER_FEATURES) + .country(NUMBER_COUNTRY_CODE) + .type(NUMBER_TYPE) + .features(NUMBER_FEATURES) .pattern(NUMBER_SEARCH_PATTERN, NUMBER_SEARCH_CRITERIA) .build() ); diff --git a/src/main/java/com/vonage/quickstart/numbers/UpdateNumber.java b/src/main/java/com/vonage/quickstart/numbers/UpdateNumber.java index 66f6d80c..059458c3 100644 --- a/src/main/java/com/vonage/quickstart/numbers/UpdateNumber.java +++ b/src/main/java/com/vonage/quickstart/numbers/UpdateNumber.java @@ -23,19 +23,9 @@ import com.vonage.client.VonageClient; import com.vonage.client.numbers.UpdateNumberRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class UpdateNumber { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String COUNTRY_CODE = envVar("COUNTRY_CODE"); - private static final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - private static final String SMS_CALLBACK_URL = envVar("SMS_CALLBACK_URL"); - private static final UpdateNumberRequest.CallbackType VOICE_CALLBACK_TYPE = - UpdateNumberRequest.CallbackType.valueOf(envVar("VOICE_CALLBACK_TYPE")); - private static final String VOICE_CALLBACK_VALUE = envVar("VOICE_CALLBACK_VALUE"); - private static final String VOICE_STATUS_URL = envVar("VOICE_STATUS_URL"); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) @@ -43,10 +33,10 @@ public static void main(String[] args) { .build(); client.getNumbersClient().updateNumber( - UpdateNumberRequest.builder(VONAGE_NUMBER, COUNTRY_CODE) - .moHttpUrl(SMS_CALLBACK_URL) - .voiceCallback(VOICE_CALLBACK_TYPE, VOICE_CALLBACK_VALUE) - .voiceStatusCallback(VOICE_STATUS_URL) + UpdateNumberRequest.builder(NUMBER_MSISDN, NUMBER_COUNTRY_CODE) + .moHttpUrl(NUMBER_SMS_CALLBACK_URL) + .voiceCallback(NUMBER_VOICE_CALLBACK_TYPE, NUMBER_VOICE_CALLBACK_URL) + .voiceStatusCallback(NUMBER_VOICE_STATUS_CALLBACK_URL) .build() ); } diff --git a/src/main/java/com/vonage/quickstart/redact/RedactATransaction.java b/src/main/java/com/vonage/quickstart/redact/RedactATransaction.java index b8692845..032d9b3d 100644 --- a/src/main/java/com/vonage/quickstart/redact/RedactATransaction.java +++ b/src/main/java/com/vonage/quickstart/redact/RedactATransaction.java @@ -23,21 +23,15 @@ import com.vonage.client.VonageClient; import com.vonage.client.redact.RedactRequest; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class RedactATransaction { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String VONAGE_REDACT_ID = envVar("VONAGE_REDACT_ID"); - private static final RedactRequest.Product VONAGE_REDACT_PRODUCT = - RedactRequest.Product.valueOf(envVar("VONAGE_REDACT_PRODUCT")); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - client.getRedactClient().redactTransaction(VONAGE_REDACT_ID, VONAGE_REDACT_PRODUCT); + client.getRedactClient().redactTransaction(VONAGE_REDACT_ID, RedactRequest.Product.SMS); } } diff --git a/src/main/java/com/vonage/quickstart/simswap/RetrieveSimSwapDate.java b/src/main/java/com/vonage/quickstart/simswap/RetrieveSimSwapDate.java index 805afc26..94c4e9f7 100644 --- a/src/main/java/com/vonage/quickstart/simswap/RetrieveSimSwapDate.java +++ b/src/main/java/com/vonage/quickstart/simswap/RetrieveSimSwapDate.java @@ -22,24 +22,16 @@ package com.vonage.quickstart.simswap; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.time.Instant; public class RetrieveSimSwapDate { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - String TO_NUMBER = envVar("TO_NUMBER"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH).build(); - Instant lastSwapDate = client.getSimSwapClient().retrieveSimSwapDate(TO_NUMBER); + Instant lastSwapDate = client.getSimSwapClient().retrieveSimSwapDate(SIMSWAP_MSISDN); System.out.println(lastSwapDate); } } diff --git a/src/main/java/com/vonage/quickstart/simswap/SimSwapped.java b/src/main/java/com/vonage/quickstart/simswap/SimSwapped.java index c83c01a4..b5ae6095 100644 --- a/src/main/java/com/vonage/quickstart/simswap/SimSwapped.java +++ b/src/main/java/com/vonage/quickstart/simswap/SimSwapped.java @@ -22,26 +22,17 @@ package com.vonage.quickstart.simswap; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; -import java.time.Instant; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SimSwapped { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - String TO_NUMBER = envVar("TO_NUMBER"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH).build(); - boolean swapped = client.getSimSwapClient().checkSimSwap(TO_NUMBER, 960); - System.out.println("SIM for "+TO_NUMBER + - " has "+(swapped ? "" : "not ") + "been swapped in the past 960 hours." + boolean swapped = client.getSimSwapClient().checkSimSwap(SIMSWAP_MSISDN, SIMSWAP_MAX_AGE); + System.out.println("SIM for "+SIMSWAP_MSISDN + " has " + + (swapped ? "" : "not ") + "been swapped in the past "+SIMSWAP_MAX_AGE+" hours." ); } } diff --git a/src/main/java/com/vonage/quickstart/sms/ReceiveDLR.java b/src/main/java/com/vonage/quickstart/sms/ReceiveDlr.java similarity index 95% rename from src/main/java/com/vonage/quickstart/sms/ReceiveDLR.java rename to src/main/java/com/vonage/quickstart/sms/ReceiveDlr.java index b9cc600e..817ed5e8 100644 --- a/src/main/java/com/vonage/quickstart/sms/ReceiveDLR.java +++ b/src/main/java/com/vonage/quickstart/sms/ReceiveDlr.java @@ -21,15 +21,10 @@ */ package com.vonage.quickstart.sms; -import com.vonage.quickstart.Util; - import static spark.Spark.*; -public class ReceiveDLR { - +public class ReceiveDlr { public static void main(String[] args) throws Exception { - Util.configureLogging(); - port(3000); get("/webhooks/delivery-receipt", (req, res) -> { diff --git a/src/main/java/com/vonage/quickstart/sms/ReceiveSignedSms.java b/src/main/java/com/vonage/quickstart/sms/ReceiveSignedSms.java index 328095cc..1f382e6e 100644 --- a/src/main/java/com/vonage/quickstart/sms/ReceiveSignedSms.java +++ b/src/main/java/com/vonage/quickstart/sms/ReceiveSignedSms.java @@ -24,16 +24,15 @@ import com.vonage.client.auth.RequestSigning; import spark.Route; import spark.Spark; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class ReceiveSignedSms { - public static void main(String[] args) throws Exception { /* * Route to handle incoming SMS GET request. */ Route inboundSmsAsGet = (req, res) -> { - String signatureSecret = envVar("VONAGE_SIGNATURE_SECRET"); + String signatureSecret = VONAGE_SIGNATURE_SECRET; System.out.println(signatureSecret); if (RequestSigning.verifyRequestSignature( req.raw().getInputStream(), diff --git a/src/main/java/com/vonage/quickstart/sms/ReceiveSMS.java b/src/main/java/com/vonage/quickstart/sms/ReceiveSms.java similarity index 99% rename from src/main/java/com/vonage/quickstart/sms/ReceiveSMS.java rename to src/main/java/com/vonage/quickstart/sms/ReceiveSms.java index 131cab0b..68a2701c 100644 --- a/src/main/java/com/vonage/quickstart/sms/ReceiveSMS.java +++ b/src/main/java/com/vonage/quickstart/sms/ReceiveSms.java @@ -25,8 +25,7 @@ import spark.Route; import spark.Spark; -public class ReceiveSMS { - +public class ReceiveSms { public static void main(String[] args) throws Exception { /* * Route to handle incoming SMS GET request. diff --git a/src/main/java/com/vonage/quickstart/sms/SendMessage.java b/src/main/java/com/vonage/quickstart/sms/SendMessage.java index b48d93ca..06fbea87 100644 --- a/src/main/java/com/vonage/quickstart/sms/SendMessage.java +++ b/src/main/java/com/vonage/quickstart/sms/SendMessage.java @@ -25,24 +25,15 @@ import com.vonage.client.sms.MessageStatus; import com.vonage.client.sms.SmsSubmissionResponse; import com.vonage.client.sms.messages.TextMessage; - -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendMessage { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - String TO_NUMBER = envVar("TO_NUMBER"); - String VONAGE_BRAND_NAME = envVar("VONAGE_BRAND_NAME"); VonageClient client = VonageClient.builder().apiKey(VONAGE_API_KEY).apiSecret(VONAGE_API_SECRET).build(); - TextMessage message = new TextMessage(VONAGE_BRAND_NAME, - TO_NUMBER, + TextMessage message = new TextMessage( + SMS_SENDER_ID, SMS_TO_NUMBER, "A text message sent using the Vonage SMS API" ); diff --git a/src/main/java/com/vonage/quickstart/sms/SendSignedSms.java b/src/main/java/com/vonage/quickstart/sms/SendSignedSms.java index d572be74..5c934f61 100644 --- a/src/main/java/com/vonage/quickstart/sms/SendSignedSms.java +++ b/src/main/java/com/vonage/quickstart/sms/SendSignedSms.java @@ -26,27 +26,18 @@ import com.vonage.client.sms.SmsSubmissionResponse; import com.vonage.client.sms.messages.TextMessage; import com.vonage.client.auth.hashutils.HashUtil; - -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendSignedSms { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - String VONAGE_SIGNATURE_SECRET = envVar("VONAGE_SIGNATURE_SECRET"); - String TO_NUMBER = envVar("TO_NUMBER"); - String VONAGE_BRAND_NAME = envVar("VONAGE_BRAND_NAME"); VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .signatureSecret(VONAGE_SIGNATURE_SECRET) .hashType(HashUtil.HashType.MD5).build(); - TextMessage message = new TextMessage(VONAGE_BRAND_NAME, - TO_NUMBER, + TextMessage message = new TextMessage( + SMS_SENDER_ID, SMS_TO_NUMBER, "A text message sent using the Vonage SMS API" ); diff --git a/src/main/java/com/vonage/quickstart/sms/SendUnicodeMessage.java b/src/main/java/com/vonage/quickstart/sms/SendUnicodeMessage.java index 19956936..b492a215 100644 --- a/src/main/java/com/vonage/quickstart/sms/SendUnicodeMessage.java +++ b/src/main/java/com/vonage/quickstart/sms/SendUnicodeMessage.java @@ -25,23 +25,14 @@ import com.vonage.client.sms.SmsSubmissionResponse; import com.vonage.client.sms.SmsSubmissionResponseMessage; import com.vonage.client.sms.messages.TextMessage; - -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendUnicodeMessage { - public static void main(String[] args) throws Exception { - configureLogging(); - - String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - String TO_NUMBER = envVar("TO_NUMBER"); - String VONAGE_BRAND_NAME = envVar("VONAGE_BRAND_NAME"); VonageClient client = VonageClient.builder().apiKey(VONAGE_API_KEY).apiSecret(VONAGE_API_SECRET).build(); - TextMessage message = new TextMessage(VONAGE_BRAND_NAME, TO_NUMBER, "Blue Öyster Cult \uD83E\uDD18", true); + TextMessage message = new TextMessage(SMS_SENDER_ID, SMS_TO_NUMBER, "Blue Öyster Cult \uD83E\uDD18", true); SmsSubmissionResponse responses = client.getSmsClient().submitMessage(message); diff --git a/src/main/java/com/vonage/quickstart/subaccounts/CreateSubaccount.java b/src/main/java/com/vonage/quickstart/subaccounts/CreateSubaccount.java index d4ebab0a..085051ab 100644 --- a/src/main/java/com/vonage/quickstart/subaccounts/CreateSubaccount.java +++ b/src/main/java/com/vonage/quickstart/subaccounts/CreateSubaccount.java @@ -24,18 +24,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.subaccounts.Account; import com.vonage.client.subaccounts.CreateSubaccountRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class CreateSubaccount { - static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - static final String NEW_SUBACCOUNT_NAME = envVar("NEW_SUBACCOUNT_NAME"); - static final String NEW_SUBACCOUNT_SECRET = envVar("NEW_SUBACCOUNT_SECRET"); - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) @@ -43,8 +36,8 @@ public static void main(String[] args) throws Exception { Account subaccount = client.getSubaccountsClient().createSubaccount( CreateSubaccountRequest.builder() - .name(NEW_SUBACCOUNT_NAME) - .secret(NEW_SUBACCOUNT_SECRET) + .name(SUBACCOUNT_NAME) + .secret(SUBACCOUNT_SECRET) .build() ); } diff --git a/src/main/java/com/vonage/quickstart/subaccounts/DeactivateSubaccount.java b/src/main/java/com/vonage/quickstart/subaccounts/DeactivateSubaccount.java index 87fac354..95696295 100644 --- a/src/main/java/com/vonage/quickstart/subaccounts/DeactivateSubaccount.java +++ b/src/main/java/com/vonage/quickstart/subaccounts/DeactivateSubaccount.java @@ -24,17 +24,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.subaccounts.Account; import com.vonage.client.subaccounts.UpdateSubaccountRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class DeactivateSubaccount { - static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - static final String SUBACCOUNT_KEY = envVar("SUBACCOUNT_KEY"); - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) diff --git a/src/main/java/com/vonage/quickstart/subaccounts/GetSubaccount.java b/src/main/java/com/vonage/quickstart/subaccounts/GetSubaccount.java index cba99afa..91a528a0 100644 --- a/src/main/java/com/vonage/quickstart/subaccounts/GetSubaccount.java +++ b/src/main/java/com/vonage/quickstart/subaccounts/GetSubaccount.java @@ -23,17 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.subaccounts.Account; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class GetSubaccount { - static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - static final String SUBACCOUNT_KEY = envVar("SUBACCOUNT_KEY"); - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) diff --git a/src/main/java/com/vonage/quickstart/subaccounts/ListBalanceTransfers.java b/src/main/java/com/vonage/quickstart/subaccounts/ListBalanceTransfers.java index 3f0a5e1e..f62c7ca2 100644 --- a/src/main/java/com/vonage/quickstart/subaccounts/ListBalanceTransfers.java +++ b/src/main/java/com/vonage/quickstart/subaccounts/ListBalanceTransfers.java @@ -22,23 +22,20 @@ package com.vonage.quickstart.subaccounts; import com.vonage.client.VonageClient; +import com.vonage.client.subaccounts.ListTransfersFilter; import com.vonage.client.subaccounts.MoneyTransfer; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; public class ListBalanceTransfers { - static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - List transfers = client.getSubaccountsClient().listBalanceTransfers(); + List transfers = client.getSubaccountsClient().listBalanceTransfers( + ListTransfersFilter.builder().startDate(SUBACCOUNT_START_DATE).build() + ); } } diff --git a/src/main/java/com/vonage/quickstart/subaccounts/ListCreditTransfers.java b/src/main/java/com/vonage/quickstart/subaccounts/ListCreditTransfers.java index 0da99bab..74e291c4 100644 --- a/src/main/java/com/vonage/quickstart/subaccounts/ListCreditTransfers.java +++ b/src/main/java/com/vonage/quickstart/subaccounts/ListCreditTransfers.java @@ -22,23 +22,20 @@ package com.vonage.quickstart.subaccounts; import com.vonage.client.VonageClient; +import com.vonage.client.subaccounts.ListTransfersFilter; import com.vonage.client.subaccounts.MoneyTransfer; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; public class ListCreditTransfers { - static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - List transfers = client.getSubaccountsClient().listCreditTransfers(); + List transfers = client.getSubaccountsClient().listCreditTransfers( + ListTransfersFilter.builder().startDate(SUBACCOUNT_START_DATE).build() + ); } } diff --git a/src/main/java/com/vonage/quickstart/subaccounts/ListSubaccounts.java b/src/main/java/com/vonage/quickstart/subaccounts/ListSubaccounts.java index 1727d59f..1f7627fe 100644 --- a/src/main/java/com/vonage/quickstart/subaccounts/ListSubaccounts.java +++ b/src/main/java/com/vonage/quickstart/subaccounts/ListSubaccounts.java @@ -23,16 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.subaccounts.ListSubaccountsResponse; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class ListSubaccounts { - static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) diff --git a/src/main/java/com/vonage/quickstart/subaccounts/ReactivateSubaccount.java b/src/main/java/com/vonage/quickstart/subaccounts/ReactivateSubaccount.java index 943349f3..8342bb40 100644 --- a/src/main/java/com/vonage/quickstart/subaccounts/ReactivateSubaccount.java +++ b/src/main/java/com/vonage/quickstart/subaccounts/ReactivateSubaccount.java @@ -24,17 +24,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.subaccounts.Account; import com.vonage.client.subaccounts.UpdateSubaccountRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class ReactivateSubaccount { - static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - static final String SUBACCOUNT_KEY = envVar("SUBACCOUNT_KEY"); - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) diff --git a/src/main/java/com/vonage/quickstart/subaccounts/RenameSubaccount.java b/src/main/java/com/vonage/quickstart/subaccounts/RenameSubaccount.java index 8febffdc..f96c0fe2 100644 --- a/src/main/java/com/vonage/quickstart/subaccounts/RenameSubaccount.java +++ b/src/main/java/com/vonage/quickstart/subaccounts/RenameSubaccount.java @@ -24,18 +24,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.subaccounts.Account; import com.vonage.client.subaccounts.UpdateSubaccountRequest; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class RenameSubaccount { - static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - static final String SUBACCOUNT_KEY = envVar("SUBACCOUNT_KEY"); - static final String NEW_SUBACCOUNT_NAME = envVar("NEW_SUBACCOUNT_NAME"); - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) @@ -43,7 +36,7 @@ public static void main(String[] args) throws Exception { Account subaccount = client.getSubaccountsClient().updateSubaccount( UpdateSubaccountRequest.builder(SUBACCOUNT_KEY) - .name(NEW_SUBACCOUNT_NAME).build() + .name(SUBACCOUNT_NAME).build() ); } } diff --git a/src/main/java/com/vonage/quickstart/subaccounts/TransferBalance.java b/src/main/java/com/vonage/quickstart/subaccounts/TransferBalance.java index a7f77278..205febf8 100644 --- a/src/main/java/com/vonage/quickstart/subaccounts/TransferBalance.java +++ b/src/main/java/com/vonage/quickstart/subaccounts/TransferBalance.java @@ -23,18 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.subaccounts.MoneyTransfer; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class TransferBalance { - static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - static final String SUBACCOUNT_KEY = envVar("SUBACCOUNT_KEY"); - static final double AMOUNT = Double.parseDouble(envVar("AMOUNT")); - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) @@ -43,7 +36,7 @@ public static void main(String[] args) throws Exception { MoneyTransfer receipt = client.getSubaccountsClient().transferBalance( MoneyTransfer.builder() .from(VONAGE_API_KEY).to(SUBACCOUNT_KEY) - .amount(AMOUNT).build() + .amount(SUBACCOUNT_BALANCE_AMOUNT).build() ); System.out.println("Transfer successful: "+receipt.getId()); } diff --git a/src/main/java/com/vonage/quickstart/subaccounts/TransferCredit.java b/src/main/java/com/vonage/quickstart/subaccounts/TransferCredit.java index 58465b23..639e478a 100644 --- a/src/main/java/com/vonage/quickstart/subaccounts/TransferCredit.java +++ b/src/main/java/com/vonage/quickstart/subaccounts/TransferCredit.java @@ -23,18 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.subaccounts.MoneyTransfer; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class TransferCredit { - static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - static final String SUBACCOUNT_KEY = envVar("SUBACCOUNT_KEY"); - static final double AMOUNT = Double.parseDouble(envVar("AMOUNT")); - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) @@ -43,7 +36,7 @@ public static void main(String[] args) throws Exception { MoneyTransfer receipt = client.getSubaccountsClient().transferCredit( MoneyTransfer.builder() .from(VONAGE_API_KEY).to(SUBACCOUNT_KEY) - .amount(AMOUNT).build() + .amount(SUBACCOUNT_CREDIT_AMOUNT).build() ); System.out.println("Transfer successful: "+receipt.getId()); } diff --git a/src/main/java/com/vonage/quickstart/subaccounts/TransferNumber.java b/src/main/java/com/vonage/quickstart/subaccounts/TransferNumber.java index 76f4f9b7..00c90ec8 100644 --- a/src/main/java/com/vonage/quickstart/subaccounts/TransferNumber.java +++ b/src/main/java/com/vonage/quickstart/subaccounts/TransferNumber.java @@ -23,18 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.subaccounts.NumberTransfer; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class TransferNumber { - static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - static final String SUBACCOUNT_KEY = envVar("SUBACCOUNT_KEY"); - static final String NUMBER = envVar("NUMBER"); - - public static void main(String[] args) throws Exception { - configureLogging(); - + public static void main(String[] args) throws Exception { + VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) @@ -42,7 +35,8 @@ public static void main(String[] args) throws Exception { NumberTransfer transfer = NumberTransfer.builder() .from(VONAGE_API_KEY).to(SUBACCOUNT_KEY) - .number(NUMBER).build(); + .number(NUMBER_MSISDN).country(NUMBER_COUNTRY_CODE) + .build(); client.getSubaccountsClient().transferNumber(transfer); } diff --git a/src/main/java/com/vonage/quickstart/users/CreateUser.java b/src/main/java/com/vonage/quickstart/users/CreateUser.java index 31f2dd87..9135b550 100644 --- a/src/main/java/com/vonage/quickstart/users/CreateUser.java +++ b/src/main/java/com/vonage/quickstart/users/CreateUser.java @@ -24,14 +24,9 @@ import com.vonage.client.VonageClient; import com.vonage.client.users.User; import com.vonage.client.users.channels.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class CreateUser { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String USER_NAME = envVar("USER_NAME"); - private static final String USER_DISPLAY_NAME = envVar("USER_NAME"); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/users/DeleteUser.java b/src/main/java/com/vonage/quickstart/users/DeleteUser.java index d78f4986..022ec535 100644 --- a/src/main/java/com/vonage/quickstart/users/DeleteUser.java +++ b/src/main/java/com/vonage/quickstart/users/DeleteUser.java @@ -22,14 +22,9 @@ package com.vonage.quickstart.users; import com.vonage.client.VonageClient; -import com.vonage.client.users.User; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class DeleteUser { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String USER_ID = envVar("USER_ID"); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/users/GetUser.java b/src/main/java/com/vonage/quickstart/users/GetUser.java index c4e40d68..36df4425 100644 --- a/src/main/java/com/vonage/quickstart/users/GetUser.java +++ b/src/main/java/com/vonage/quickstart/users/GetUser.java @@ -23,13 +23,9 @@ import com.vonage.client.VonageClient; import com.vonage.client.users.User; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class GetUser { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String USER_ID = envVar("USER_ID"); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/users/ListUsers.java b/src/main/java/com/vonage/quickstart/users/ListUsers.java index d259b460..f8403488 100644 --- a/src/main/java/com/vonage/quickstart/users/ListUsers.java +++ b/src/main/java/com/vonage/quickstart/users/ListUsers.java @@ -23,13 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.users.BaseUser; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; public class ListUsers { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/users/UpdateUser.java b/src/main/java/com/vonage/quickstart/users/UpdateUser.java index 65935e57..887ee47f 100644 --- a/src/main/java/com/vonage/quickstart/users/UpdateUser.java +++ b/src/main/java/com/vonage/quickstart/users/UpdateUser.java @@ -23,16 +23,9 @@ import com.vonage.client.VonageClient; import com.vonage.client.users.User; -import com.vonage.client.users.channels.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class UpdateUser { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String USER_ID = envVar("USER_ID"); - private static final String USER_NEW_NAME = envVar("USER_NEW_NAME"); - private static final String USER_NEW_DISPLAY_NAME = envVar("USER_NEW_DISPLAY_NAME"); - public static void main(String... args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) diff --git a/src/main/java/com/vonage/quickstart/verify/AdvanceVerification.java b/src/main/java/com/vonage/quickstart/verify/AdvanceVerification.java index 28f6b73a..2644ae23 100644 --- a/src/main/java/com/vonage/quickstart/verify/AdvanceVerification.java +++ b/src/main/java/com/vonage/quickstart/verify/AdvanceVerification.java @@ -23,20 +23,16 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify.ControlResponse; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class AdvanceVerification { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String REQUEST_ID = envVar("REQUEST_ID"); - public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - ControlResponse response = client.getVerifyClient().advanceVerification(REQUEST_ID); + ControlResponse response = client.getVerifyClient().advanceVerification(VERIFY_REQUEST_ID); String errorText = response.getErrorText(); if (errorText != null) { diff --git a/src/main/java/com/vonage/quickstart/verify/CancelVerification.java b/src/main/java/com/vonage/quickstart/verify/CancelVerification.java index 4da7d087..36da93f6 100644 --- a/src/main/java/com/vonage/quickstart/verify/CancelVerification.java +++ b/src/main/java/com/vonage/quickstart/verify/CancelVerification.java @@ -23,20 +23,16 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify.ControlResponse; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class CancelVerification { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String REQUEST_ID = envVar("REQUEST_ID"); - public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - ControlResponse response = client.getVerifyClient().cancelVerification(REQUEST_ID); + ControlResponse response = client.getVerifyClient().cancelVerification(VERIFY_REQUEST_ID); String errorText = response.getErrorText(); if (errorText != null) { diff --git a/src/main/java/com/vonage/quickstart/verify/CheckVerification.java b/src/main/java/com/vonage/quickstart/verify/CheckVerification.java index a3affa3e..221bf4a7 100644 --- a/src/main/java/com/vonage/quickstart/verify/CheckVerification.java +++ b/src/main/java/com/vonage/quickstart/verify/CheckVerification.java @@ -24,21 +24,16 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify.CheckResponse; import com.vonage.client.verify.VerifyStatus; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class CheckVerification { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String REQUEST_ID = envVar("REQUEST_ID"); - private static final String CODE = envVar("CODE"); - public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - CheckResponse response = client.getVerifyClient().check(REQUEST_ID, CODE); + CheckResponse response = client.getVerifyClient().check(VERIFY_REQUEST_ID, VERIFY_CODE); if (response.getStatus() == VerifyStatus.OK) { System.out.println("Verification Successful"); diff --git a/src/main/java/com/vonage/quickstart/verify/SearchVerification.java b/src/main/java/com/vonage/quickstart/verify/SearchVerification.java index 1b5d68e7..e54e500c 100644 --- a/src/main/java/com/vonage/quickstart/verify/SearchVerification.java +++ b/src/main/java/com/vonage/quickstart/verify/SearchVerification.java @@ -23,22 +23,17 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify.SearchVerifyResponse; -import com.vonage.client.verify.VerifyClient; import com.vonage.client.verify.VerifyStatus; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SearchVerification { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String REQUEST_ID = envVar("REQUEST_ID"); - public static void main(String... args) throws Exception { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - SearchVerifyResponse response = client.getVerifyClient().search(REQUEST_ID); + SearchVerifyResponse response = client.getVerifyClient().search(VERIFY_REQUEST_ID); if (response.getStatus() == VerifyStatus.OK) { response.getVerificationRequests().forEach(it -> { System.out.println(it.getRequestId() + " " + it.getStatus()); diff --git a/src/main/java/com/vonage/quickstart/verify/StartPsd2Verification.java b/src/main/java/com/vonage/quickstart/verify/StartPsd2Verification.java index e160479f..e37ec0e0 100644 --- a/src/main/java/com/vonage/quickstart/verify/StartPsd2Verification.java +++ b/src/main/java/com/vonage/quickstart/verify/StartPsd2Verification.java @@ -24,22 +24,18 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify.VerifyResponse; import com.vonage.client.verify.VerifyStatus; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class StartPsd2Verification { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String RECIPIENT_NUMBER = envVar("RECIPIENT_NUMBER"); - private static final String PAYEE_NAME = envVar("PAYEE_NAME"); - private static final Double AMOUNT = Double.valueOf(envVar("AMOUNT")); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - VerifyResponse response = client.getVerifyClient().psd2Verify(RECIPIENT_NUMBER, AMOUNT, PAYEE_NAME); + VerifyResponse response = client.getVerifyClient().psd2Verify( + VERIFY_NUMBER, VERIFY_AMOUNT, VERIFY_PAYEE_NAME + ); if (response.getStatus() == VerifyStatus.OK) { System.out.printf("Request ID: %s", response.getRequestId()); diff --git a/src/main/java/com/vonage/quickstart/verify/StartPsd2VerificationWithWorkflow.java b/src/main/java/com/vonage/quickstart/verify/StartPsd2VerificationWithWorkflow.java index 0b374641..373878c0 100644 --- a/src/main/java/com/vonage/quickstart/verify/StartPsd2VerificationWithWorkflow.java +++ b/src/main/java/com/vonage/quickstart/verify/StartPsd2VerificationWithWorkflow.java @@ -23,15 +23,9 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class StartPsd2VerificationWithWorkflow { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String RECIPIENT_NUMBER = envVar("RECIPIENT_NUMBER"); - private static final String PAYEE_NAME = envVar("PAYEE_NAME"); - private static final Double AMOUNT = Double.valueOf(envVar("AMOUNT")); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) @@ -39,7 +33,7 @@ public static void main(String[] args) { .build(); VerifyResponse response = client.getVerifyClient().psd2Verify( - RECIPIENT_NUMBER, AMOUNT, PAYEE_NAME, Psd2Request.Workflow.SMS_SMS + VERIFY_NUMBER, VERIFY_AMOUNT, VERIFY_PAYEE_NAME, VERIFY_PSD2_WORKFLOW_ID ); if (response.getStatus() == VerifyStatus.OK) { diff --git a/src/main/java/com/vonage/quickstart/verify/StartVerification.java b/src/main/java/com/vonage/quickstart/verify/StartVerification.java index b8ff7a95..3943eec5 100644 --- a/src/main/java/com/vonage/quickstart/verify/StartVerification.java +++ b/src/main/java/com/vonage/quickstart/verify/StartVerification.java @@ -24,21 +24,16 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify.VerifyResponse; import com.vonage.client.verify.VerifyStatus; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class StartVerification { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String RECIPIENT_NUMBER = envVar("RECIPIENT_NUMBER"); - private static final String BRAND_NAME = envVar("BRAND_NAME"); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) .apiSecret(VONAGE_API_SECRET) .build(); - VerifyResponse response = client.getVerifyClient().verify(RECIPIENT_NUMBER, BRAND_NAME); + VerifyResponse response = client.getVerifyClient().verify(VERIFY_NUMBER, VERIFY_BRAND_NAME); if (response.getStatus() == VerifyStatus.OK) { System.out.printf("RequestID: %s", response.getRequestId()); diff --git a/src/main/java/com/vonage/quickstart/verify/StartVerificationWithWorkflow.java b/src/main/java/com/vonage/quickstart/verify/StartVerificationWithWorkflow.java index b3738c55..711a1076 100644 --- a/src/main/java/com/vonage/quickstart/verify/StartVerificationWithWorkflow.java +++ b/src/main/java/com/vonage/quickstart/verify/StartVerificationWithWorkflow.java @@ -23,14 +23,9 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class StartVerificationWithWorkflow { - private static final String VONAGE_API_KEY = envVar("VONAGE_API_KEY"); - private static final String VONAGE_API_SECRET = envVar("VONAGE_API_SECRET"); - private static final String RECIPIENT_NUMBER = envVar("RECIPIENT_NUMBER"); - private static final String BRAND_NAME = envVar("BRAND_NAME"); - public static void main(String[] args) { VonageClient client = VonageClient.builder() .apiKey(VONAGE_API_KEY) @@ -38,7 +33,7 @@ public static void main(String[] args) { .build(); VerifyResponse response = client.getVerifyClient().verify( - RECIPIENT_NUMBER,BRAND_NAME, VerifyRequest.Workflow.TTS_TTS + VERIFY_NUMBER, VERIFY_BRAND_NAME, VERIFY_WORKFLOW_ID ); if (response.getStatus() == VerifyStatus.OK) { diff --git a/src/main/java/com/vonage/quickstart/verify2/CancelRequest.java b/src/main/java/com/vonage/quickstart/verify2/CancelRequest.java index c13488c3..db95bff4 100644 --- a/src/main/java/com/vonage/quickstart/verify2/CancelRequest.java +++ b/src/main/java/com/vonage/quickstart/verify2/CancelRequest.java @@ -22,20 +22,16 @@ package com.vonage.quickstart.verify2; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.UUID; public class CancelRequest { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final UUID REQUEST_ID = UUID.fromString(envVar("REQUEST_ID")); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - client.getVerify2Client().cancelVerification(REQUEST_ID); + client.getVerify2Client().cancelVerification(VERIFY_REQUEST_UUID); } } diff --git a/src/main/java/com/vonage/quickstart/verify2/CheckVerificationCode.java b/src/main/java/com/vonage/quickstart/verify2/CheckVerificationCode.java index 243bec2e..adaddfe0 100644 --- a/src/main/java/com/vonage/quickstart/verify2/CheckVerificationCode.java +++ b/src/main/java/com/vonage/quickstart/verify2/CheckVerificationCode.java @@ -23,23 +23,18 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify2.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.UUID; public class CheckVerificationCode { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String CODE = envVar("CODE"); - private static final UUID REQUEST_ID = UUID.fromString(envVar("REQUEST_ID")); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); try { - client.getVerify2Client().checkVerificationCode(REQUEST_ID, CODE); + client.getVerify2Client().checkVerificationCode(VERIFY_REQUEST_UUID, VERIFY_CODE); System.out.println("SUCCESS - code matches!"); } catch (VerifyResponseException ex) { diff --git a/src/main/java/com/vonage/quickstart/verify2/SendRequestAllChannels.java b/src/main/java/com/vonage/quickstart/verify2/SendRequestAllChannels.java index c2904f82..f684c373 100644 --- a/src/main/java/com/vonage/quickstart/verify2/SendRequestAllChannels.java +++ b/src/main/java/com/vonage/quickstart/verify2/SendRequestAllChannels.java @@ -23,18 +23,11 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify2.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; import java.util.List; public class SendRequestAllChannels { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String BRAND_NAME = envVar("BRAND_NAME"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String WHATSAPP_BUSINESS_NUMBER = envVar("WHATSAPP_BUSINESS_NUMBER"); - private static final String TO_EMAIL = envVar("TO_EMAIL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -42,15 +35,15 @@ public static void main(String[] args) throws Exception { var request = VerificationRequest.builder() .workflows(List.of( - new SilentAuthWorkflow(TO_NUMBER), - new WhatsappCodelessWorkflow(TO_NUMBER, WHATSAPP_BUSINESS_NUMBER), - new EmailWorkflow(TO_EMAIL), - new WhatsappWorkflow(TO_NUMBER, WHATSAPP_BUSINESS_NUMBER), - new SmsWorkflow(TO_NUMBER), - new VoiceWorkflow(TO_NUMBER) + new SilentAuthWorkflow(VERIFY_NUMBER), + new WhatsappCodelessWorkflow(VERIFY_NUMBER, VERIFY_WHATSAPP_NUMBER), + new EmailWorkflow(VERIFY_TO_EMAIL, VERIFY_FROM_EMAIL), + new WhatsappWorkflow(VERIFY_NUMBER, VERIFY_WHATSAPP_NUMBER), + new SmsWorkflow(VERIFY_NUMBER), + new VoiceWorkflow(VERIFY_NUMBER) )) .codeLength(7) - .brand(BRAND_NAME) + .brand(VERIFY_BRAND_NAME) .locale("en-gb") .channelTimeout(120) .build(); diff --git a/src/main/java/com/vonage/quickstart/verify2/SendRequestEmail.java b/src/main/java/com/vonage/quickstart/verify2/SendRequestEmail.java index 32ea039b..2583756c 100644 --- a/src/main/java/com/vonage/quickstart/verify2/SendRequestEmail.java +++ b/src/main/java/com/vonage/quickstart/verify2/SendRequestEmail.java @@ -23,15 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify2.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendRequestEmail { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String BRAND_NAME = envVar("BRAND_NAME"); - private static final String TO_EMAIL = envVar("TO_EMAIL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -39,8 +34,8 @@ public static void main(String[] args) throws Exception { VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new EmailWorkflow(TO_EMAIL)) - .brand(BRAND_NAME).build() + .addWorkflow(new EmailWorkflow(VERIFY_TO_EMAIL)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); } diff --git a/src/main/java/com/vonage/quickstart/verify2/SendRequestSilentAuth.java b/src/main/java/com/vonage/quickstart/verify2/SendRequestSilentAuth.java index 1acef798..706b1c09 100644 --- a/src/main/java/com/vonage/quickstart/verify2/SendRequestSilentAuth.java +++ b/src/main/java/com/vonage/quickstart/verify2/SendRequestSilentAuth.java @@ -23,15 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify2.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendRequestSilentAuth { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String BRAND_NAME = envVar("BRAND_NAME"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -39,8 +34,8 @@ public static void main(String[] args) throws Exception { VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new SilentAuthWorkflow(TO_NUMBER)) - .brand(BRAND_NAME).build() + .addWorkflow(new SilentAuthWorkflow(VERIFY_NUMBER)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); } diff --git a/src/main/java/com/vonage/quickstart/verify2/SendRequestSms.java b/src/main/java/com/vonage/quickstart/verify2/SendRequestSms.java index 124b3820..ff71f760 100644 --- a/src/main/java/com/vonage/quickstart/verify2/SendRequestSms.java +++ b/src/main/java/com/vonage/quickstart/verify2/SendRequestSms.java @@ -23,15 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify2.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendRequestSms { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String BRAND_NAME = envVar("BRAND_NAME"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -39,8 +34,8 @@ public static void main(String[] args) throws Exception { VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new SmsWorkflow(TO_NUMBER)) - .brand(BRAND_NAME).build() + .addWorkflow(new SmsWorkflow(VERIFY_NUMBER)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); } diff --git a/src/main/java/com/vonage/quickstart/verify2/SendRequestVoice.java b/src/main/java/com/vonage/quickstart/verify2/SendRequestVoice.java index 4ed035df..7ac79e68 100644 --- a/src/main/java/com/vonage/quickstart/verify2/SendRequestVoice.java +++ b/src/main/java/com/vonage/quickstart/verify2/SendRequestVoice.java @@ -23,14 +23,9 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify2.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendRequestVoice { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String BRAND_NAME = envVar("BRAND_NAME"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) @@ -39,8 +34,8 @@ public static void main(String[] args) throws Exception { VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new VoiceWorkflow(TO_NUMBER)) - .brand(BRAND_NAME).build() + .addWorkflow(new VoiceWorkflow(VERIFY_NUMBER)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); } diff --git a/src/main/java/com/vonage/quickstart/verify2/SendRequestWhatsapp.java b/src/main/java/com/vonage/quickstart/verify2/SendRequestWhatsapp.java index 061b8193..a75c9aa6 100644 --- a/src/main/java/com/vonage/quickstart/verify2/SendRequestWhatsapp.java +++ b/src/main/java/com/vonage/quickstart/verify2/SendRequestWhatsapp.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify2.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendRequestWhatsapp { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String BRAND_NAME = envVar("BRAND_NAME"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String WHATSAPP_BUSINESS_NUMBER = envVar("WHATSAPP_BUSINESS_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,8 +34,8 @@ public static void main(String[] args) throws Exception { VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new WhatsappWorkflow(TO_NUMBER, WHATSAPP_BUSINESS_NUMBER)) - .brand(BRAND_NAME).build() + .addWorkflow(new WhatsappWorkflow(VERIFY_NUMBER, VERIFY_WHATSAPP_NUMBER)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); } diff --git a/src/main/java/com/vonage/quickstart/verify2/SendRequestWhatsappInteractive.java b/src/main/java/com/vonage/quickstart/verify2/SendRequestWhatsappInteractive.java index b6c63414..9ee729c8 100644 --- a/src/main/java/com/vonage/quickstart/verify2/SendRequestWhatsappInteractive.java +++ b/src/main/java/com/vonage/quickstart/verify2/SendRequestWhatsappInteractive.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify2.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendRequestWhatsappInteractive { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String BRAND_NAME = envVar("BRAND_NAME"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String WHATSAPP_BUSINESS_NUMBER = envVar("WHATSAPP_BUSINESS_NUMBER"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,8 +34,8 @@ public static void main(String[] args) throws Exception { VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new WhatsappCodelessWorkflow(TO_NUMBER, WHATSAPP_BUSINESS_NUMBER)) - .brand(BRAND_NAME).build() + .addWorkflow(new WhatsappCodelessWorkflow(VERIFY_NUMBER, VERIFY_WHATSAPP_NUMBER)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); } diff --git a/src/main/java/com/vonage/quickstart/verify2/SendRequestWithFallback.java b/src/main/java/com/vonage/quickstart/verify2/SendRequestWithFallback.java index 2ef54517..59cb0f08 100644 --- a/src/main/java/com/vonage/quickstart/verify2/SendRequestWithFallback.java +++ b/src/main/java/com/vonage/quickstart/verify2/SendRequestWithFallback.java @@ -23,16 +23,10 @@ import com.vonage.client.VonageClient; import com.vonage.client.verify2.*; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendRequestWithFallback { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final String BRAND_NAME = envVar("BRAND_NAME"); - private static final String TO_NUMBER = envVar("TO_NUMBER"); - private static final String TO_EMAIL = envVar("TO_EMAIL"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) @@ -40,9 +34,9 @@ public static void main(String[] args) throws Exception { VerificationResponse response = client.getVerify2Client().sendVerification( VerificationRequest.builder() - .addWorkflow(new SilentAuthWorkflow(TO_NUMBER)) - .addWorkflow(new EmailWorkflow(TO_EMAIL)) - .brand(BRAND_NAME).build() + .addWorkflow(new SilentAuthWorkflow(VERIFY_NUMBER)) + .addWorkflow(new EmailWorkflow(VERIFY_TO_EMAIL)) + .brand(VERIFY_BRAND_NAME).build() ); System.out.println("Verification sent: " + response.getRequestId()); } diff --git a/src/main/java/com/vonage/quickstart/verify2/CreateTemplate.java b/src/main/java/com/vonage/quickstart/verify2/templates/CreateTemplate.java similarity index 77% rename from src/main/java/com/vonage/quickstart/verify2/CreateTemplate.java rename to src/main/java/com/vonage/quickstart/verify2/templates/CreateTemplate.java index 27a39768..e5b27973 100644 --- a/src/main/java/com/vonage/quickstart/verify2/CreateTemplate.java +++ b/src/main/java/com/vonage/quickstart/verify2/templates/CreateTemplate.java @@ -19,22 +19,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.vonage.quickstart.verify2; +package com.vonage.quickstart.verify2.templates; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class CreateTemplate { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - var template = client.getVerify2Client().createTemplate("My_template"); + var template = client.getVerify2Client().createTemplate(VERIFY_TEMPLATE_NAME); System.out.println(template.getId()); } } diff --git a/src/main/java/com/vonage/quickstart/verify2/CreateTemplateFragment.java b/src/main/java/com/vonage/quickstart/verify2/templates/CreateTemplateFragment.java similarity index 77% rename from src/main/java/com/vonage/quickstart/verify2/CreateTemplateFragment.java rename to src/main/java/com/vonage/quickstart/verify2/templates/CreateTemplateFragment.java index fdc8795e..8bffdd10 100644 --- a/src/main/java/com/vonage/quickstart/verify2/CreateTemplateFragment.java +++ b/src/main/java/com/vonage/quickstart/verify2/templates/CreateTemplateFragment.java @@ -19,27 +19,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.vonage.quickstart.verify2; +package com.vonage.quickstart.verify2.templates; import com.vonage.client.VonageClient; import com.vonage.client.verify2.FragmentChannel; import com.vonage.client.verify2.TemplateFragment; -import static com.vonage.quickstart.Util.envVar; -import java.util.UUID; +import static com.vonage.quickstart.EnvironmentVariables.*; public class CreateTemplateFragment { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final UUID TEMPLATE_ID = UUID.fromString(envVar("TEMPLATE_ID")); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); var fragment = client.getVerify2Client().createTemplateFragment( - TEMPLATE_ID, new TemplateFragment( + VERIFY_TEMPLATE_ID, new TemplateFragment( FragmentChannel.SMS, "en-us", "The authentication code for your ${brand} is: ${code}" ) diff --git a/src/main/java/com/vonage/quickstart/verify2/DeleteTemplate.java b/src/main/java/com/vonage/quickstart/verify2/templates/DeleteTemplate.java similarity index 73% rename from src/main/java/com/vonage/quickstart/verify2/DeleteTemplate.java rename to src/main/java/com/vonage/quickstart/verify2/templates/DeleteTemplate.java index 2e6d9f76..ff85443d 100644 --- a/src/main/java/com/vonage/quickstart/verify2/DeleteTemplate.java +++ b/src/main/java/com/vonage/quickstart/verify2/templates/DeleteTemplate.java @@ -19,23 +19,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.vonage.quickstart.verify2; +package com.vonage.quickstart.verify2.templates; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; -import java.util.UUID; +import static com.vonage.quickstart.EnvironmentVariables.*; public class DeleteTemplate { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final UUID TEMPLATE_ID = UUID.fromString(envVar("TEMPLATE_ID")); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - client.getVerify2Client().deleteTemplate(TEMPLATE_ID); + client.getVerify2Client().deleteTemplate(VERIFY_TEMPLATE_ID); } } diff --git a/src/main/java/com/vonage/quickstart/verify2/DeleteTemplateFragment.java b/src/main/java/com/vonage/quickstart/verify2/templates/DeleteTemplateFragment.java similarity index 68% rename from src/main/java/com/vonage/quickstart/verify2/DeleteTemplateFragment.java rename to src/main/java/com/vonage/quickstart/verify2/templates/DeleteTemplateFragment.java index ce673566..452c40db 100644 --- a/src/main/java/com/vonage/quickstart/verify2/DeleteTemplateFragment.java +++ b/src/main/java/com/vonage/quickstart/verify2/templates/DeleteTemplateFragment.java @@ -19,24 +19,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.vonage.quickstart.verify2; +package com.vonage.quickstart.verify2.templates; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; -import java.util.UUID; +import static com.vonage.quickstart.EnvironmentVariables.*; public class DeleteTemplateFragment { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final UUID TEMPLATE_ID = UUID.fromString(envVar("TEMPLATE_ID")); - private static final UUID TEMPLATE_FRAGMENT_ID = UUID.fromString(envVar("TEMPLATE_FRAGMENT_ID")); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - client.getVerify2Client().deleteTemplateFragment(TEMPLATE_ID, TEMPLATE_FRAGMENT_ID); + client.getVerify2Client().deleteTemplateFragment(VERIFY_TEMPLATE_ID, VERIFY_TEMPLATE_FRAGMENT_ID); } } diff --git a/src/main/java/com/vonage/quickstart/verify2/GetTemplate.java b/src/main/java/com/vonage/quickstart/verify2/templates/GetTemplate.java similarity index 73% rename from src/main/java/com/vonage/quickstart/verify2/GetTemplate.java rename to src/main/java/com/vonage/quickstart/verify2/templates/GetTemplate.java index 70e3a105..ef2e3eda 100644 --- a/src/main/java/com/vonage/quickstart/verify2/GetTemplate.java +++ b/src/main/java/com/vonage/quickstart/verify2/templates/GetTemplate.java @@ -19,24 +19,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.vonage.quickstart.verify2; +package com.vonage.quickstart.verify2.templates; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; -import java.util.UUID; +import static com.vonage.quickstart.EnvironmentVariables.*; public class GetTemplate { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final UUID TEMPLATE_ID = UUID.fromString(envVar("TEMPLATE_ID")); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - var template = client.getVerify2Client().getTemplate(TEMPLATE_ID); + var template = client.getVerify2Client().getTemplate(VERIFY_TEMPLATE_ID); System.out.println(template); } } diff --git a/src/main/java/com/vonage/quickstart/verify2/GetTemplateFragment.java b/src/main/java/com/vonage/quickstart/verify2/templates/GetTemplateFragment.java similarity index 68% rename from src/main/java/com/vonage/quickstart/verify2/GetTemplateFragment.java rename to src/main/java/com/vonage/quickstart/verify2/templates/GetTemplateFragment.java index 0c87591d..ce0c3db6 100644 --- a/src/main/java/com/vonage/quickstart/verify2/GetTemplateFragment.java +++ b/src/main/java/com/vonage/quickstart/verify2/templates/GetTemplateFragment.java @@ -19,25 +19,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.vonage.quickstart.verify2; +package com.vonage.quickstart.verify2.templates; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; -import java.util.UUID; +import static com.vonage.quickstart.EnvironmentVariables.*; public class GetTemplateFragment { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final UUID TEMPLATE_ID = UUID.fromString(envVar("TEMPLATE_ID")); - private static final UUID TEMPLATE_FRAGMENT_ID = UUID.fromString(envVar("TEMPLATE_FRAGMENT_ID")); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - var fragment = client.getVerify2Client().getTemplateFragment(TEMPLATE_ID, TEMPLATE_FRAGMENT_ID); + var fragment = client.getVerify2Client().getTemplateFragment(VERIFY_TEMPLATE_ID, VERIFY_TEMPLATE_FRAGMENT_ID); System.out.println(fragment); } } diff --git a/src/main/java/com/vonage/quickstart/verify2/ListTemplateFragments.java b/src/main/java/com/vonage/quickstart/verify2/templates/ListTemplateFragments.java similarity index 76% rename from src/main/java/com/vonage/quickstart/verify2/ListTemplateFragments.java rename to src/main/java/com/vonage/quickstart/verify2/templates/ListTemplateFragments.java index 1a340cfb..9992fad4 100644 --- a/src/main/java/com/vonage/quickstart/verify2/ListTemplateFragments.java +++ b/src/main/java/com/vonage/quickstart/verify2/templates/ListTemplateFragments.java @@ -19,24 +19,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.vonage.quickstart.verify2; +package com.vonage.quickstart.verify2.templates; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; -import java.util.UUID; +import static com.vonage.quickstart.EnvironmentVariables.*; public class ListTemplateFragments { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final UUID TEMPLATE_ID = UUID.fromString(envVar("TEMPLATE_ID")); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - var fragments = client.getVerify2Client().listTemplateFragments(TEMPLATE_ID); + var fragments = client.getVerify2Client().listTemplateFragments(VERIFY_TEMPLATE_ID); fragments.forEach(f -> System.out.println(f.getFragmentId())); } } diff --git a/src/main/java/com/vonage/quickstart/verify2/ListTemplates.java b/src/main/java/com/vonage/quickstart/verify2/templates/ListTemplates.java similarity index 81% rename from src/main/java/com/vonage/quickstart/verify2/ListTemplates.java rename to src/main/java/com/vonage/quickstart/verify2/templates/ListTemplates.java index 0462c4c0..532dfd9c 100644 --- a/src/main/java/com/vonage/quickstart/verify2/ListTemplates.java +++ b/src/main/java/com/vonage/quickstart/verify2/templates/ListTemplates.java @@ -19,16 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.vonage.quickstart.verify2; +package com.vonage.quickstart.verify2.templates; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class ListTemplates { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) diff --git a/src/main/java/com/vonage/quickstart/verify2/UpdateTemplate.java b/src/main/java/com/vonage/quickstart/verify2/templates/UpdateTemplate.java similarity index 72% rename from src/main/java/com/vonage/quickstart/verify2/UpdateTemplate.java rename to src/main/java/com/vonage/quickstart/verify2/templates/UpdateTemplate.java index 59159f2b..fecc5823 100644 --- a/src/main/java/com/vonage/quickstart/verify2/UpdateTemplate.java +++ b/src/main/java/com/vonage/quickstart/verify2/templates/UpdateTemplate.java @@ -19,24 +19,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.vonage.quickstart.verify2; +package com.vonage.quickstart.verify2.templates; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; -import java.util.UUID; +import static com.vonage.quickstart.EnvironmentVariables.*; public class UpdateTemplate { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final UUID TEMPLATE_ID = UUID.fromString(envVar("TEMPLATE_ID")); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - var updated = client.getVerify2Client().updateTemplate(TEMPLATE_ID, "My_renamed_template", false); + var updated = client.getVerify2Client().updateTemplate(VERIFY_TEMPLATE_ID, VERIFY_TEMPLATE_NAME, false); System.out.println(updated); } } diff --git a/src/main/java/com/vonage/quickstart/verify2/UpdateTemplateFragment.java b/src/main/java/com/vonage/quickstart/verify2/templates/UpdateTemplateFragment.java similarity index 72% rename from src/main/java/com/vonage/quickstart/verify2/UpdateTemplateFragment.java rename to src/main/java/com/vonage/quickstart/verify2/templates/UpdateTemplateFragment.java index ab6187a2..7c9c7682 100644 --- a/src/main/java/com/vonage/quickstart/verify2/UpdateTemplateFragment.java +++ b/src/main/java/com/vonage/quickstart/verify2/templates/UpdateTemplateFragment.java @@ -19,26 +19,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.vonage.quickstart.verify2; +package com.vonage.quickstart.verify2.templates; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; -import java.util.UUID; +import static com.vonage.quickstart.EnvironmentVariables.*; public class UpdateTemplateFragment { - private static final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - private static final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - private static final UUID TEMPLATE_ID = UUID.fromString(envVar("TEMPLATE_ID")); - private static final UUID TEMPLATE_FRAGMENT_ID = UUID.fromString(envVar("TEMPLATE_FRAGMENT_ID")); - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); var updated = client.getVerify2Client().updateTemplateFragment( - TEMPLATE_ID, TEMPLATE_FRAGMENT_ID, + VERIFY_TEMPLATE_ID, VERIFY_TEMPLATE_FRAGMENT_ID, "The authentication code for your ${brand} is: ${code}" ); System.out.println(updated); diff --git a/src/main/java/com/vonage/quickstart/voice/AsrInput.java b/src/main/java/com/vonage/quickstart/voice/AsrInput.java index f64da2a0..94f31d4e 100644 --- a/src/main/java/com/vonage/quickstart/voice/AsrInput.java +++ b/src/main/java/com/vonage/quickstart/voice/AsrInput.java @@ -32,7 +32,6 @@ import java.util.Collections; public class AsrInput { - public static void main(String[] args) { /* * Route to answer incoming calls. @@ -46,7 +45,6 @@ public static void main(String[] args) { .language(SpeechSettings.Language.ENGLISH_UNITED_STATES).build(); InputAction input = InputAction.builder() - .type(Collections.singletonList("speech")) .eventUrl(String.format("%s://%s/webhooks/asr", req.scheme(), req.host())) .speech(speechSettings) .build(); diff --git a/src/main/java/com/vonage/quickstart/voice/ConnectInboundCall.java b/src/main/java/com/vonage/quickstart/voice/ConnectInboundCall.java index f7e2da42..57f220fb 100644 --- a/src/main/java/com/vonage/quickstart/voice/ConnectInboundCall.java +++ b/src/main/java/com/vonage/quickstart/voice/ConnectInboundCall.java @@ -26,20 +26,17 @@ import com.vonage.client.voice.ncco.PhoneEndpoint; import spark.Route; import spark.Spark; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class ConnectInboundCall { public static void main(String[] args) { - final String YOUR_SECOND_NUMBER = envVar("YOUR_SECOND_NUMBER"); - final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - /* * Route to answer incoming calls with an NCCO response. */ Route answerRoute = (req, res) -> { ConnectAction connect = ConnectAction.builder() - .endpoint(PhoneEndpoint.builder(YOUR_SECOND_NUMBER).build()) - .from(VONAGE_NUMBER) + .endpoint(PhoneEndpoint.builder(VOICE_TO_NUMBER).build()) + .from(VONAGE_VIRTUAL_NUMBER) .build(); res.type("application/json"); diff --git a/src/main/java/com/vonage/quickstart/voice/DownloadRecording.java b/src/main/java/com/vonage/quickstart/voice/DownloadRecording.java index 444077e7..0ff798ef 100644 --- a/src/main/java/com/vonage/quickstart/voice/DownloadRecording.java +++ b/src/main/java/com/vonage/quickstart/voice/DownloadRecording.java @@ -27,15 +27,10 @@ import spark.Spark; import java.nio.file.Path; import java.nio.file.Paths; -import static com.vonage.quickstart.Util.envVar; -import static com.vonage.quickstart.Util.configureLogging; +import static com.vonage.quickstart.EnvironmentVariables.*; public class DownloadRecording { public static void main(String[] args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) diff --git a/src/main/java/com/vonage/quickstart/voice/DtmfInput.java b/src/main/java/com/vonage/quickstart/voice/DtmfInput.java index 31d43959..ec524eca 100644 --- a/src/main/java/com/vonage/quickstart/voice/DtmfInput.java +++ b/src/main/java/com/vonage/quickstart/voice/DtmfInput.java @@ -29,8 +29,6 @@ import spark.Route; import spark.Spark; -import java.util.Collections; - public class DtmfInput { public static void main(String[] args) { /* @@ -41,13 +39,9 @@ public static void main(String[] args) { .builder("Hello. Please press any key to continue.") .build(); - DtmfSettings dtmfSettings = new DtmfSettings(); - dtmfSettings.setMaxDigits(1); - InputAction input = InputAction.builder() - .type(Collections.singletonList("dtmf")) .eventUrl(String.format("%s://%s/webhooks/dtmf", req.scheme(), req.host())) - .dtmf(dtmfSettings) + .dtmf(DtmfSettings.builder().maxDigits(1).build()) .build(); diff --git a/src/main/java/com/vonage/quickstart/voice/EarmuffCall.java b/src/main/java/com/vonage/quickstart/voice/EarmuffCall.java index 2bfd9e89..97f09e90 100644 --- a/src/main/java/com/vonage/quickstart/voice/EarmuffCall.java +++ b/src/main/java/com/vonage/quickstart/voice/EarmuffCall.java @@ -22,24 +22,17 @@ package com.vonage.quickstart.voice; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.envVar; -import static com.vonage.quickstart.Util.configureLogging; +import static com.vonage.quickstart.EnvironmentVariables.*; public class EarmuffCall { public static void main(String... args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - final String CALL_UUID = envVar("CALL_UUID"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - client.getVoiceClient().earmuffCall(CALL_UUID); + client.getVoiceClient().earmuffCall(VOICE_CALL_ID); Thread.sleep(3000); - client.getVoiceClient().unearmuffCall(CALL_UUID); + client.getVoiceClient().unearmuffCall(VOICE_CALL_ID); } } diff --git a/src/main/java/com/vonage/quickstart/voice/EndCall.java b/src/main/java/com/vonage/quickstart/voice/EndCall.java index 8c44e7f6..efddb45d 100644 --- a/src/main/java/com/vonage/quickstart/voice/EndCall.java +++ b/src/main/java/com/vonage/quickstart/voice/EndCall.java @@ -23,22 +23,15 @@ package com.vonage.quickstart.voice; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class EndCall { public static void main(String[] args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - final String CALL_UUID = envVar("CALL_UUID"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - client.getVoiceClient().terminateCall(CALL_UUID); + client.getVoiceClient().terminateCall(VOICE_CALL_ID); } } diff --git a/src/main/java/com/vonage/quickstart/voice/MuteCall.java b/src/main/java/com/vonage/quickstart/voice/MuteCall.java index e5963b82..d849b018 100644 --- a/src/main/java/com/vonage/quickstart/voice/MuteCall.java +++ b/src/main/java/com/vonage/quickstart/voice/MuteCall.java @@ -22,24 +22,17 @@ package com.vonage.quickstart.voice; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class MuteCall { public static void main(String... args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - final String CALL_UUID = envVar("CALL_UUID"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - client.getVoiceClient().muteCall(CALL_UUID); + client.getVoiceClient().muteCall(VOICE_CALL_ID); Thread.sleep(3000); - client.getVoiceClient().unmuteCall(CALL_UUID); + client.getVoiceClient().unmuteCall(VOICE_CALL_ID); } } diff --git a/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeech.java b/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeech.java index 1c5e3ab9..caf87979 100644 --- a/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeech.java +++ b/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeech.java @@ -23,25 +23,15 @@ import com.vonage.client.VonageClient; import com.vonage.client.voice.Call; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class OutboundTextToSpeech { public static void main(String[] args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - final String TO_NUMBER = envVar("TO_NUMBER"); - final String ANSWER_URL = "https://nexmo-community.github.io/ncco-examples/talk.json"; - - client.getVoiceClient().createCall(new Call(TO_NUMBER, VONAGE_NUMBER, ANSWER_URL)); + client.getVoiceClient().createCall(new Call(VOICE_TO_NUMBER, VONAGE_VIRTUAL_NUMBER, VOICE_ANSWER_URL)); } } diff --git a/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeechWithEventUrl.java b/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeechWithEventUrl.java index e27feb8d..d126294c 100644 --- a/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeechWithEventUrl.java +++ b/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeechWithEventUrl.java @@ -24,28 +24,18 @@ import com.vonage.client.VonageClient; import com.vonage.client.voice.Call; import com.vonage.client.voice.PhoneEndpoint; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class OutboundTextToSpeechWithEventUrl { public static void main(String[] args) throws Exception { - configureLogging(); - - final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - final String TO_NUMBER = envVar("TO_NUMBER"); - final String EVENT_URL = envVar("EVENT_URL"); - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - final String ANSWER_URL = "https://nexmo-community.github.io/ncco-examples/talk.json"; - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); Call call = Call.builder() - .from(VONAGE_NUMBER).to(new PhoneEndpoint(TO_NUMBER)) - .answerUrl(ANSWER_URL).eventUrl(EVENT_URL).build(); + .from(VONAGE_VIRTUAL_NUMBER).to(new PhoneEndpoint(VOICE_TO_NUMBER)) + .answerUrl(VOICE_ANSWER_URL).eventUrl(VOICE_EVENT_URL).build(); var response = client.getVoiceClient().createCall(call); System.out.println(response); diff --git a/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeechWithNcco.java b/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeechWithNcco.java index 05ebb566..f321ad60 100644 --- a/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeechWithNcco.java +++ b/src/main/java/com/vonage/quickstart/voice/OutboundTextToSpeechWithNcco.java @@ -26,26 +26,17 @@ import com.vonage.client.voice.ncco.Ncco; import com.vonage.client.voice.ncco.TalkAction; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class OutboundTextToSpeechWithNcco { public static void main(String[] args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - final String TO_NUMBER = envVar("TO_NUMBER"); - Ncco ncco = new Ncco(TalkAction.builder("This is a text to speech call from Vonage").build()); - client.getVoiceClient().createCall(new Call(TO_NUMBER, VONAGE_NUMBER, ncco.getActions())); + client.getVoiceClient().createCall(new Call(VOICE_TO_NUMBER, VONAGE_VIRTUAL_NUMBER, ncco.getActions())); } } diff --git a/src/main/java/com/vonage/quickstart/voice/RecordCall.java b/src/main/java/com/vonage/quickstart/voice/RecordCall.java index 72388b9b..79171296 100644 --- a/src/main/java/com/vonage/quickstart/voice/RecordCall.java +++ b/src/main/java/com/vonage/quickstart/voice/RecordCall.java @@ -28,14 +28,10 @@ import com.vonage.client.voice.ncco.RecordAction; import spark.Route; import spark.Spark; - -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class RecordCall { public static void main(String[] args) { - final String TO_NUMBER = envVar("TO_NUMBER"); - final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - /* * Route to answer and connect incoming calls with recording. */ @@ -44,9 +40,8 @@ public static void main(String[] args) { RecordAction record = RecordAction.builder().eventUrl(recordingUrl).build(); - ConnectAction connect = ConnectAction.builder(PhoneEndpoint.builder(TO_NUMBER).build()) - .from(VONAGE_NUMBER) - .build(); + ConnectAction connect = ConnectAction.builder(PhoneEndpoint.builder(VOICE_TO_NUMBER).build()) + .from(VONAGE_VIRTUAL_NUMBER).build(); res.type("application/json"); diff --git a/src/main/java/com/vonage/quickstart/voice/RecordCallSplitAudio.java b/src/main/java/com/vonage/quickstart/voice/RecordCallSplitAudio.java index f5488112..40ab5b78 100644 --- a/src/main/java/com/vonage/quickstart/voice/RecordCallSplitAudio.java +++ b/src/main/java/com/vonage/quickstart/voice/RecordCallSplitAudio.java @@ -25,14 +25,10 @@ import com.vonage.client.voice.ncco.*; import spark.Route; import spark.Spark; - -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class RecordCallSplitAudio { public static void main(String[] args) { - final String TO_NUMBER = envVar("TO_NUMBER"); - final String VONAGE_NUMBER = envVar("VONAGE_NUMBER"); - /* * Route to answer and connect incoming calls with recording. */ @@ -45,9 +41,8 @@ public static void main(String[] args) { .split(SplitRecording.CONVERSATION) .build(); - ConnectAction connect = ConnectAction.builder(PhoneEndpoint.builder(TO_NUMBER).build()) - .from(VONAGE_NUMBER) - .build(); + ConnectAction connect = ConnectAction.builder(PhoneEndpoint.builder(VOICE_TO_NUMBER).build()) + .from(VONAGE_VIRTUAL_NUMBER).build(); res.type("application/json"); diff --git a/src/main/java/com/vonage/quickstart/voice/RecordConversation.java b/src/main/java/com/vonage/quickstart/voice/RecordConversation.java index 3b61b779..6aa9c9d2 100644 --- a/src/main/java/com/vonage/quickstart/voice/RecordConversation.java +++ b/src/main/java/com/vonage/quickstart/voice/RecordConversation.java @@ -27,18 +27,17 @@ import com.vonage.client.voice.ncco.Ncco; import spark.Route; import spark.Spark; +import static com.vonage.quickstart.EnvironmentVariables.*; public class RecordConversation { public static void main(String[] args) { - final String CONF_NAME = "conf-name"; - /* * Route to answer and connect incoming calls with recording. */ Route answerRoute = (req, res) -> { String recordingUrl = String.format("%s://%s/webhooks/recordings", req.scheme(), req.host()); - ConversationAction conversation = ConversationAction.builder(CONF_NAME) + ConversationAction conversation = ConversationAction.builder(VOICE_CONFERENCE_NAME) .record(true) .eventMethod(EventMethod.POST) .eventUrl(recordingUrl) diff --git a/src/main/java/com/vonage/quickstart/voice/RetrieveCallInfo.java b/src/main/java/com/vonage/quickstart/voice/RetrieveCallInfo.java index 8f0c5b4b..ff9c534c 100644 --- a/src/main/java/com/vonage/quickstart/voice/RetrieveCallInfo.java +++ b/src/main/java/com/vonage/quickstart/voice/RetrieveCallInfo.java @@ -23,23 +23,16 @@ import com.vonage.client.VonageClient; import com.vonage.client.voice.CallInfo; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class RetrieveCallInfo { public static void main(String... args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - final String CALL_UUID = envVar("CALL_UUID"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - CallInfo details = client.getVoiceClient().getCallDetails(CALL_UUID); + CallInfo details = client.getVoiceClient().getCallDetails(VOICE_CALL_ID); System.out.println(details); } } diff --git a/src/main/java/com/vonage/quickstart/voice/RetrieveInfoForAllCalls.java b/src/main/java/com/vonage/quickstart/voice/RetrieveInfoForAllCalls.java index bd953028..c4c32fd9 100644 --- a/src/main/java/com/vonage/quickstart/voice/RetrieveInfoForAllCalls.java +++ b/src/main/java/com/vonage/quickstart/voice/RetrieveInfoForAllCalls.java @@ -27,16 +27,10 @@ import java.time.Duration; import java.time.Instant; import java.util.Date; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class RetrieveInfoForAllCalls { public static void main(String... args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) diff --git a/src/main/java/com/vonage/quickstart/voice/SendDtmfToCall.java b/src/main/java/com/vonage/quickstart/voice/SendDtmfToCall.java index 3af614bd..75f04185 100644 --- a/src/main/java/com/vonage/quickstart/voice/SendDtmfToCall.java +++ b/src/main/java/com/vonage/quickstart/voice/SendDtmfToCall.java @@ -23,23 +23,16 @@ package com.vonage.quickstart.voice; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendDtmfToCall { public static void main(String[] args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - final String CALL_UUID = envVar("CALL_UUID"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - var response = client.getVoiceClient().sendDtmf(CALL_UUID, "332393"); + var response = client.getVoiceClient().sendDtmf(VOICE_CALL_ID, VOICE_DTMF_DIGITS); System.out.println(response); } } diff --git a/src/main/java/com/vonage/quickstart/voice/SendTalkToCall.java b/src/main/java/com/vonage/quickstart/voice/SendTalkToCall.java index 973ee84b..af1a98aa 100644 --- a/src/main/java/com/vonage/quickstart/voice/SendTalkToCall.java +++ b/src/main/java/com/vonage/quickstart/voice/SendTalkToCall.java @@ -23,25 +23,16 @@ import com.vonage.client.VonageClient; import com.vonage.client.voice.TalkPayload; -import com.vonage.client.voice.TextToSpeechLanguage; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class SendTalkToCall { public static void main(String[] args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - final String CALL_UUID = envVar("CALL_UUID"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - final String TEXT = "Hello World! Would you like to know more? I bet you would."; - var payload = TalkPayload.builder(TEXT).language(TextToSpeechLanguage.AMERICAN_ENGLISH).build(); - client.getVoiceClient().startTalk(CALL_UUID, payload); + var payload = TalkPayload.builder(VOICE_TEXT).language(VOICE_LANGUAGE).build(); + client.getVoiceClient().startTalk(VOICE_CALL_ID, payload); } } diff --git a/src/main/java/com/vonage/quickstart/voice/StreamAudioToCall.java b/src/main/java/com/vonage/quickstart/voice/StreamAudioToCall.java index 80cfb9bc..41c335a8 100644 --- a/src/main/java/com/vonage/quickstart/voice/StreamAudioToCall.java +++ b/src/main/java/com/vonage/quickstart/voice/StreamAudioToCall.java @@ -19,29 +19,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ - package com.vonage.quickstart.voice; + import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class StreamAudioToCall { public static void main(String[] args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - final String CALL_UUID = envVar("CALL_UUID"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - final String URL = "https://nexmo-community.github.io/ncco-examples/assets/voice_api_audio_streaming.mp3"; - - var response = client.getVoiceClient().startStream(CALL_UUID, URL, 0); + var response = client.getVoiceClient().startStream(VOICE_CALL_ID, VOICE_STREAM_URL, 0); Thread.sleep(5000); - response = client.getVoiceClient().stopStream(CALL_UUID); + response = client.getVoiceClient().stopStream(VOICE_CALL_ID); } } diff --git a/src/main/java/com/vonage/quickstart/voice/TransferCall.java b/src/main/java/com/vonage/quickstart/voice/TransferCall.java index df29e3f5..ae241ce5 100644 --- a/src/main/java/com/vonage/quickstart/voice/TransferCall.java +++ b/src/main/java/com/vonage/quickstart/voice/TransferCall.java @@ -22,24 +22,15 @@ package com.vonage.quickstart.voice; import com.vonage.client.VonageClient; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class TransferCall { public static void main(String... args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - final String CALL_UUID = envVar("CALL_UUID"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); - final String NCCO_URL = "https://nexmo-community.github.io/ncco-examples/talk.json"; - - client.getVoiceClient().transferCall(CALL_UUID, NCCO_URL); + client.getVoiceClient().transferCall(VOICE_CALL_ID, VOICE_NCCO_URL); } } diff --git a/src/main/java/com/vonage/quickstart/voice/TransferCallNCCO.java b/src/main/java/com/vonage/quickstart/voice/TransferCallNCCO.java index 8de809b9..fb418c27 100644 --- a/src/main/java/com/vonage/quickstart/voice/TransferCallNCCO.java +++ b/src/main/java/com/vonage/quickstart/voice/TransferCallNCCO.java @@ -24,24 +24,16 @@ import com.vonage.client.VonageClient; import com.vonage.client.voice.ncco.Ncco; import com.vonage.client.voice.ncco.TalkAction; -import static com.vonage.quickstart.Util.configureLogging; -import static com.vonage.quickstart.Util.envVar; +import static com.vonage.quickstart.EnvironmentVariables.*; public class TransferCallNCCO { - public static void main(String... args) throws Exception { - configureLogging(); - - final String VONAGE_APPLICATION_ID = envVar("VONAGE_APPLICATION_ID"); - final String VONAGE_PRIVATE_KEY_PATH = envVar("VONAGE_PRIVATE_KEY_PATH"); - final String CALL_UUID = envVar("CALL_UUID"); - VonageClient client = VonageClient.builder() .applicationId(VONAGE_APPLICATION_ID) .privateKeyPath(VONAGE_PRIVATE_KEY_PATH) .build(); TalkAction talkAction = TalkAction.builder("This is a transfer action using an inline NCCO.").build(); - client.getVoiceClient().transferCall(CALL_UUID, new Ncco(talkAction)); + client.getVoiceClient().transferCall(VOICE_CALL_ID, new Ncco(talkAction)); } }