Skip to content

Commit db1f3ec

Browse files
committed
Rename Util, implicit configureLogging()
1 parent aff40bb commit db1f3ec

File tree

182 files changed

+256
-413
lines changed

Some content is hidden

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

182 files changed

+256
-413
lines changed

SNIPPETS.md

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,6 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid());
914914
### Incoming Message
915915

916916
```java
917-
configureLogging();
918917

919918
Route inboundRoute = (request, response) -> {
920919
InboundMessage messageDetails = InboundMessage.fromJson(request.body());
@@ -987,7 +986,6 @@ System.out.println("Message sent successfully. ID: "+response.getMessageUuid());
987986
##### Send Messenger Text
988987

989988
```java
990-
configureLogging();
991989

992990
System.out.println(VonageClient.builder()
993991
.applicationId(envVar("VONAGE_APPLICATION_ID"))
@@ -1006,7 +1004,6 @@ System.out.println(VonageClient.builder()
10061004
##### Send Messenger Video
10071005

10081006
```java
1009-
configureLogging();
10101007

10111008
System.out.println(VonageClient.builder()
10121009
.applicationId(envVar("VONAGE_APPLICATION_ID"))
@@ -1046,7 +1043,6 @@ System.out.println(VonageClient.builder()
10461043
##### Send Viber Text
10471044

10481045
```java
1049-
configureLogging();
10501046

10511047
System.out.println(VonageClient.builder()
10521048
.applicationId(envVar("VONAGE_APPLICATION_ID"))
@@ -1086,7 +1082,6 @@ System.out.println(VonageClient.builder()
10861082
##### Send WhatsApp Text
10871083

10881084
```java
1089-
configureLogging();
10901085

10911086
System.out.println(VonageClient.builder()
10921087
.applicationId(envVar("VONAGE_APPLICATION_ID"))
@@ -1122,7 +1117,6 @@ System.out.println(VonageClient.builder()
11221117
##### Send WhatsApp Contact
11231118

11241119
```java
1125-
configureLogging();
11261120

11271121
System.out.println(VonageClient.builder()
11281122
.applicationId(envVar("VONAGE_APPLICATION_ID"))
@@ -1203,7 +1197,6 @@ System.out.println(VonageClient.builder()
12031197
##### Send WhatsApp Sticker
12041198

12051199
```java
1206-
configureLogging();
12071200

12081201
System.out.println(VonageClient.builder()
12091202
.applicationId(envVar("VONAGE_APPLICATION_ID"))
@@ -1222,7 +1215,6 @@ System.out.println(VonageClient.builder()
12221215
##### Send WhatsApp Audio
12231216

12241217
```java
1225-
configureLogging();
12261218

12271219
System.out.println(VonageClient.builder()
12281220
.applicationId(envVar("VONAGE_APPLICATION_ID"))
@@ -1241,7 +1233,6 @@ System.out.println(VonageClient.builder()
12411233
##### Send WhatsApp File
12421234

12431235
```java
1244-
configureLogging();
12451236

12461237
System.out.println(VonageClient.builder()
12471238
.applicationId(envVar("VONAGE_APPLICATION_ID"))
@@ -1261,7 +1252,6 @@ System.out.println(VonageClient.builder()
12611252
##### Send WhatsApp Image
12621253

12631254
```java
1264-
configureLogging();
12651255

12661256
System.out.println(VonageClient.builder()
12671257
.apiKey(envVar("VONAGE_API_KEY"))
@@ -1299,7 +1289,6 @@ System.out.println(VonageClient.builder()
12991289
##### Send WhatsApp Video
13001290

13011291
```java
1302-
configureLogging();
13031292

13041293
System.out.println(VonageClient.builder()
13051294
.applicationId(envVar("VONAGE_APPLICATION_ID"))
@@ -1318,7 +1307,6 @@ System.out.println(VonageClient.builder()
13181307
### Message Status Webhook
13191308

13201309
```java
1321-
configureLogging();
13221310

13231311
Route inboundRoute = (request, response) -> {
13241312
MessageStatus messageDetails = MessageStatus.fromJson(request.body());
@@ -1962,8 +1950,7 @@ Spark.get("/webhooks/inbound-sms", inboundSmsAsGet);
19621950
### ReceiveDL R
19631951

19641952
```java
1965-
Util.configureLogging();
1966-
1953+
Util.
19671954
port(3000);
19681955

19691956
get("/webhooks/delivery-receipt", (req, res) -> {
@@ -2101,8 +2088,7 @@ import static com.vonage.quickstart.Util.*;
21012088
public class SendSignedSms {
21022089

21032090
public static void main(String[] args) throws Exception {
2104-
configureLogging();
2105-
2091+
21062092
String VONAGE_API_KEY = envVar("VONAGE_API_KEY");
21072093
String VONAGE_SIGNATURE_SECRET = envVar("VONAGE_SIGNATURE_SECRET");
21082094
String TO_NUMBER = envVar("TO_NUMBER");

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ java {
1313
}
1414

1515
dependencies {
16+
implementation 'io.github.cdimascio:dotenv-java:3.+'
1617
implementation 'com.vonage:server-sdk:8.+'
1718
implementation 'com.vonage:jwt:2.+'
1819
implementation 'com.sparkjava:spark-core:2.+'

src/main/java/com/vonage/quickstart/Util.java renamed to src/main/java/com/vonage/quickstart/EnvironmentVariables.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,23 @@
2929
import com.vonage.client.verify.Psd2Request;
3030
import com.vonage.client.verify.VerifyRequest;
3131
import com.vonage.client.voice.TextToSpeechLanguage;
32-
import java.time.Instant;
32+
import io.github.cdimascio.dotenv.Dotenv;
3333
import java.util.Arrays;
3434
import java.util.logging.ConsoleHandler;
3535
import java.util.logging.Handler;
3636
import java.util.logging.Level;
3737
import java.util.logging.Logger;
3838

3939
/**
40-
* This class contains utility methods and environment variables designed to be statically
41-
* imported into the quickstart main classes.
40+
* This class contains environment variables designed to be statically imported into the quickstart main classes.
4241
*/
43-
public class Util {
42+
public final class EnvironmentVariables {
43+
private EnvironmentVariables() {}
4444

45-
/**
46-
* Configures logging if the QUICKSTART_DEBUG environment variable is set.
47-
*/
48-
public static void configureLogging() {
49-
String value = System.getenv("QUICKSTART_DEBUG");
50-
if (value != null) {
45+
private static final Dotenv dotenv = Dotenv.load();
46+
47+
static {
48+
if (System.getenv("QUICKSTART_DEBUG") != null) {
5149
Handler handler = new ConsoleHandler();
5250
handler.setLevel(Level.FINEST);
5351
Logger logger = Logger.getLogger("com.vonage");
@@ -64,7 +62,7 @@ public static void configureLogging() {
6462
* @return the value
6563
*/
6664
public static String envVar(String key) {
67-
String value = System.getenv(key);
65+
String value = dotenv.get(key);
6866
if (value == null) {
6967
throw new IllegalArgumentException("You must provide the " + key + " environment variable!");
7068
}

src/main/java/com/vonage/quickstart/account/ConfigureAccount.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import com.vonage.client.VonageClient;
2525
import com.vonage.client.account.SettingsResponse;
26-
import static com.vonage.quickstart.Util.*;
26+
import static com.vonage.quickstart.EnvironmentVariables.*;
2727

2828
public class ConfigureAccount {
2929

src/main/java/com/vonage/quickstart/account/CreateSecret.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import com.vonage.client.VonageClient;
2525
import com.vonage.client.account.SecretResponse;
26-
import static com.vonage.quickstart.Util.*;
26+
import static com.vonage.quickstart.EnvironmentVariables.*;
2727

2828
public class CreateSecret {
2929
public static void main(String[] args) {

src/main/java/com/vonage/quickstart/account/GetBalance.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import com.vonage.client.VonageClient;
2525
import com.vonage.client.account.BalanceResponse;
26-
import static com.vonage.quickstart.Util.*;
26+
import static com.vonage.quickstart.EnvironmentVariables.*;
2727

2828
public class GetBalance {
2929
public static void main(String[] args) throws Exception {

src/main/java/com/vonage/quickstart/account/GetSecret.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import com.vonage.client.VonageClient;
2525
import com.vonage.client.account.SecretResponse;
26-
import static com.vonage.quickstart.Util.*;
26+
import static com.vonage.quickstart.EnvironmentVariables.*;
2727

2828
public class GetSecret {
2929
public static void main(String[] args) {

src/main/java/com/vonage/quickstart/account/ListSecrets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.vonage.client.VonageClient;
2525
import com.vonage.client.account.ListSecretsResponse;
2626
import com.vonage.client.account.SecretResponse;
27-
import static com.vonage.quickstart.Util.*;
27+
import static com.vonage.quickstart.EnvironmentVariables.*;
2828

2929
public class ListSecrets {
3030
public static void main(String[] args) {

src/main/java/com/vonage/quickstart/account/RevokeSecret.java

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

2424
import com.vonage.client.VonageClient;
25-
import static com.vonage.quickstart.Util.*;
25+
import static com.vonage.quickstart.EnvironmentVariables.*;
2626

2727
public class RevokeSecret {
2828
public static void main(String[] args) throws Exception {

src/main/java/com/vonage/quickstart/application/CreateApplication.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@
2323

2424
import com.vonage.client.VonageClient;
2525
import com.vonage.client.application.Application;
26-
import com.vonage.client.application.ApplicationClient;
27-
import com.vonage.client.application.capabilities.Capability;
2826
import com.vonage.client.application.capabilities.Messages;
2927
import com.vonage.client.common.HttpMethod;
3028
import com.vonage.client.common.Webhook;
3129

32-
import static com.vonage.quickstart.Util.*;
30+
import static com.vonage.quickstart.EnvironmentVariables.*;
3331

3432
public class CreateApplication {
3533
private static final String APPLICATION_NAME = envVar("APPLICATION_NAME");

0 commit comments

Comments
 (0)