Skip to content

Commit ff8b202

Browse files
SMadaniSMadani
committed
Update variable names (except Messages)
1 parent 714374b commit ff8b202

File tree

74 files changed

+129
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+129
-287
lines changed

‎src/main/java/com/vonage/quickstart/EnvironmentVariables.java‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.vonage.client.voice.TextToSpeechLanguage;
3232
import io.github.cdimascio.dotenv.Dotenv;
3333
import java.util.Arrays;
34+
import java.util.UUID;
3435
import java.util.logging.ConsoleHandler;
3536
import java.util.logging.Handler;
3637
import java.util.logging.Level;
@@ -61,7 +62,7 @@ private EnvironmentVariables() {}
6162
* @param key the name of the environment variable
6263
* @return the value
6364
*/
64-
private static String envVar(String key) {
65+
static String envVar(String key) {
6566
String value = dotenv.get(key);
6667
if (value == null) {
6768
throw new IllegalArgumentException("You must provide the " + key + " environment variable!");
@@ -149,25 +150,39 @@ private static String envVar(String key) {
149150
VERIFY_FROM_EMAIL = envVar("VERIFY_FROM_EMAIL"),
150151
VERIFY_WHATSAPP_NUMBER = envVar("VERIFY_WHATSAPP_NUMBER"),
151152
VERIFY_TEMPLATE_NAME = envVar("VERIFY_TEMPLATE_NAME"),
152-
VERIFY_TEMPLATE_ID = envVar("VERIFY_TEMPLATE_ID"),
153-
VERIFY_TEMPLATE_FRAGMENT_ID = envVar("VERIFY_TEMPLATE_FRAGMENT_ID"),
154153
VOICE_CALL_ID = envVar("VOICE_CALL_ID"),
155154
VOICE_TO_NUMBER = envVar("VOICE_TO_NUMBER"),
156155
VOICE_TEXT = envVar("VOICE_TEXT"),
157156
VOICE_DTMF_DIGITS = envVar("VOICE_DTMF_DIGITS"),
158157
VOICE_CONFERENCE_NAME = envVar("VOICE_CONFERENCE_NAME"),
159158
VOICE_NCCO_URL = envVar("VOICE_NCCO_URL"),
160159
VOICE_ANSWER_URL = envVar("VOICE_ANSWER_URL"),
160+
VOICE_EVENT_URL = envVar("VOICE_EVENT_URL"),
161161
VOICE_STREAM_URL = envVar("VOICE_STREAM_URL"),
162162
VOICE_RECORDING_URL = envVar("VOICE_RECORDING_URL");
163163

164+
public static final byte[]
165+
VONAGE_PRIVATE_KEY_CONTENTS = envVar("VONAGE_PRIVATE_KEY_CONTENTS").getBytes();
166+
164167
public static final int
165168
VIBER_VIDEO_DURATION = Integer.parseInt(envVar("VIBER_VIDEO_DURATION")),
166169
VIBER_VIDEO_FILE_SIZE = Integer.parseInt(envVar("VIBER_VIDEO_FILE_SIZE")),
167170
VIBER_VIDEO_TTL = Integer.parseInt(envVar("VIBER_VIDEO_TTL")),
168171
SIMSWAP_MAX_AGE = Integer.parseInt(envVar("SIMSWAP_MAX_AGE")),
169172
VBC_EXTENSION = Integer.parseInt(envVar("VBC_EXTENSION"));
170173

174+
public static final double
175+
SUBACCOUNT_BALANCE_AMOUNT = Double.parseDouble(envVar("SUBACCOUNT_BALANCE_AMOUNT")),
176+
SUBACCOUNT_CREDIT_AMOUNT = Double.parseDouble(envVar("SUBACCOUNT_CREDIT_AMOUNT")),
177+
VERIFY_AMOUNT = Double.parseDouble(envVar("VERIFY_AMOUNT"));
178+
179+
public static final UUID
180+
VERIFY_TEMPLATE_ID = UUID.fromString(envVar("VERIFY_TEMPLATE_ID")),
181+
VERIFY_TEMPLATE_FRAGMENT_ID = UUID.fromString(envVar("VERIFY_TEMPLATE_FRAGMENT_ID"));
182+
183+
public static final java.time.Instant
184+
SUBACCOUNT_START_DATE = java.time.Instant.parse(envVar("SUBACCOUNT_START_DATE"));
185+
171186
public static final Type
172187
NUMBER_TYPE = Type.fromString(envVar("NUMBER_TYPE"));
173188

‎src/main/java/com/vonage/quickstart/initialize/ApplicationAuthWithKeyContents.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
package com.vonage.quickstart.initialize;
2323

2424
import com.vonage.client.VonageClient;
25-
2625
import static com.vonage.quickstart.EnvironmentVariables.*;
2726

2827
/**
@@ -31,12 +30,9 @@
3130
public class ApplicationAuthWithKeyContents {
3231
public static void main(String[] argv) throws Exception {
3332

34-
String VONAGE_APPLICATION_ID = VONAGE_APPLICATION_ID;
35-
String VONAGE_APPLICATION_PRIVATE_KEY= VONAGE_PRIVATE_KEY;
36-
3733
VonageClient client = VonageClient.builder()
3834
.applicationId(VONAGE_APPLICATION_ID)
39-
.privateKeyContents(VONAGE_APPLICATION_PRIVATE_KEY)
35+
.privateKeyContents(VONAGE_PRIVATE_KEY_CONTENTS)
4036
.build();
4137
}
4238
}

‎src/main/java/com/vonage/quickstart/initialize/ApplicationAuthWithKeyPath.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
package com.vonage.quickstart.initialize;
2323

2424
import com.vonage.client.VonageClient;
25-
2625
import static com.vonage.quickstart.EnvironmentVariables.*;
2726

2827
/**
@@ -31,12 +30,9 @@
3130
public class ApplicationAuthWithKeyPath {
3231
public static void main(String[] argv) throws Exception {
3332

34-
String VONAGE_APPLICATION_ID = VONAGE_APPLICATION_ID;
35-
String VONAGE_APPLICATION_PRIVATE_KEY_PATH = VONAGE_PRIVATE_KEY_PATH;
36-
3733
VonageClient client = VonageClient.builder()
3834
.applicationId(VONAGE_APPLICATION_ID)
39-
.privateKeyPath(VONAGE_APPLICATION_PRIVATE_KEY_PATH)
35+
.privateKeyPath(VONAGE_PRIVATE_KEY_PATH)
4036
.build();
4137
}
4238
}

‎src/main/java/com/vonage/quickstart/initialize/BasicAuth.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,13 @@
2222
package com.vonage.quickstart.initialize;
2323

2424
import com.vonage.client.VonageClient;
25-
2625
import static com.vonage.quickstart.EnvironmentVariables.*;
2726

2827
/**
2928
* Example of configuring a VonageClient with an API secret.
3029
*/
3130
public class BasicAuth {
3231
public static void main(String[] argv) throws Exception {
33-
String VONAGE_API_KEY = VONAGE_API_KEY;
34-
String VONAGE_API_SECRET = VONAGE_API_SECRET;
35-
3632
VonageClient client = VonageClient.builder().apiKey(VONAGE_API_KEY).apiSecret(VONAGE_API_SECRET).build();
3733
}
3834
}

‎src/main/java/com/vonage/quickstart/initialize/FullAuth.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
package com.vonage.quickstart.initialize;
2323

2424
import com.vonage.client.VonageClient;
25-
2625
import static com.vonage.quickstart.EnvironmentVariables.*;
2726

2827
/**
@@ -31,16 +30,11 @@
3130
*/
3231
public class FullAuth {
3332
public static void main(String[] argv) throws Exception {
34-
String VONAGE_API_KEY = VONAGE_API_KEY;
35-
String VONAGE_API_SECRET = VONAGE_API_SECRET;
36-
String VONAGE_APPLICATION_ID = VONAGE_APPLICATION_ID;
37-
String VONAGE_APPLICATION_PRIVATE_KEY_PATH = VONAGE_PRIVATE_KEY_PATH;
38-
3933
VonageClient client = VonageClient.builder()
4034
.apiKey(VONAGE_API_KEY)
4135
.apiSecret(VONAGE_API_SECRET)
4236
.applicationId(VONAGE_APPLICATION_ID)
43-
.privateKeyPath(VONAGE_APPLICATION_PRIVATE_KEY_PATH)
37+
.privateKeyPath(VONAGE_PRIVATE_KEY_PATH)
4438
.build();
4539
}
4640
}

‎src/main/java/com/vonage/quickstart/insight/AdvancedInsightAsync.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static void main(String... args) {
3434

3535
client.getInsightClient().getAdvancedNumberInsight(
3636
AdvancedInsightRequest.builder(INSIGHT_NUMBER)
37-
.async(true).callback(CALLBACK_URL).build()
37+
.async(true).callback(INSIGHT_CALLBACK_URL).build()
3838
);
3939
}
4040
}

‎src/main/java/com/vonage/quickstart/insight/AdvancedInsightWithCnam.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030

3131
public class AdvancedInsightWithCnam {
3232
public static void main(String[] args) throws Exception {
33-
34-
String VONAGE_API_KEY = VONAGE_API_KEY;
35-
String VONAGE_API_SECRET = VONAGE_API_SECRET;
36-
String INSIGHT_NUMBER = INSIGHT_NUMBER;
3733

3834
VonageClient client = VonageClient.builder().apiKey(VONAGE_API_KEY).apiSecret(VONAGE_API_SECRET).build();
3935

‎src/main/java/com/vonage/quickstart/jwt/ValidateInboundJwt.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@
2929
public class ValidateInboundJwt {
3030
public static void main(String[] args) throws Exception {
3131

32-
final String signatureSecret = VONAGE_SIGNATURE_SECRET;
33-
3432
Route validateJwt = (req, res) -> {
3533
String token = req.headers("Authorization").substring(7);
3634

37-
if (Jwt.verifySignature(token, signatureSecret)) {
35+
if (Jwt.verifySignature(token, VONAGE_SIGNATURE_SECRET)) {
3836
res.status(204);
3937
}
4038
else {

‎src/main/java/com/vonage/quickstart/numberinsight2/FraudScore.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727

2828
public class FraudScore {
2929
public static void main(String[] args) throws Exception {
30-
31-
String VONAGE_API_KEY = VONAGE_API_KEY;
32-
String VONAGE_API_SECRET = VONAGE_API_SECRET;
33-
String INSIGHT_NUMBER = INSIGHT_NUMBER;
34-
3530
VonageClient client = VonageClient.builder().apiKey(VONAGE_API_KEY).apiSecret(VONAGE_API_SECRET).build();
3631

3732
var response = client.getNumberInsight2Client().fraudCheck(INSIGHT_NUMBER, Insight.FRAUD_SCORE);

‎src/main/java/com/vonage/quickstart/numberinsight2/SimSwap.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727

2828
public class SimSwap {
2929
public static void main(String[] args) throws Exception {
30-
31-
String VONAGE_API_KEY = VONAGE_API_KEY;
32-
String VONAGE_API_SECRET = VONAGE_API_SECRET;
33-
String INSIGHT_NUMBER = INSIGHT_NUMBER;
34-
3530
VonageClient client = VonageClient.builder().apiKey(VONAGE_API_KEY).apiSecret(VONAGE_API_SECRET).build();
3631

3732
var response = client.getNumberInsight2Client().fraudCheck(INSIGHT_NUMBER, Insight.SIM_SWAP);

0 commit comments

Comments
 (0)