Skip to content

Commit 7219a9e

Browse files
committed
clients can be retrieved with custom API url now
1 parent ff2612f commit 7219a9e

4 files changed

Lines changed: 17 additions & 2 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ target
66
out
77
src/test/java/temp
88
src/test/resources/*properties*
9+
.gradle
910

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</developers>
2525

2626
<properties>
27-
<postmark.version>1.5.5</postmark.version>
27+
<postmark.version>1.5.6</postmark.version>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2929
<java.version>1.8</java.version>
3030
<jackson.minimum.version>2.9.7</jackson.minimum.version>

src/main/java/com/wildbit/java/postmark/Postmark.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ public static ApiClient getApiClient(String apiToken, Boolean secureConnection)
6666
return new ApiClient(DEFAULTS.API_URL.value, getHeadersWithAuth(DEFAULTS.SERVER_AUTH_HEADER, apiToken), secureConnection);
6767
}
6868

69+
/**
70+
* In rare cases, other than default API url might need to be used, mainly for testing purposes.
71+
*/
72+
public static ApiClient getApiClient(String apiToken, Boolean secureConnection, String customApiUrl) {
73+
return new ApiClient(customApiUrl, getHeadersWithAuth(DEFAULTS.SERVER_AUTH_HEADER, apiToken), secureConnection);
74+
}
75+
6976
public static AccountApiClient getAccountApiClient(String apiToken) {
7077
return new AccountApiClient(DEFAULTS.API_URL.value, getHeadersWithAuth(DEFAULTS.ACOUNT_AUTH_HEADER, apiToken));
7178
}
@@ -74,6 +81,13 @@ public static AccountApiClient getAccountApiClient(String apiToken, Boolean secu
7481
return new AccountApiClient(DEFAULTS.API_URL.value, getHeadersWithAuth(DEFAULTS.ACOUNT_AUTH_HEADER, apiToken), secureConnection);
7582
}
7683

84+
/**
85+
* In rare cases, other than default API url might need to be used, mainly for testing purposes.
86+
*/
87+
public static AccountApiClient getAccountApiClient(String apiToken, Boolean secureConnection, String customApiUrl) {
88+
return new AccountApiClient(customApiUrl, getHeadersWithAuth(DEFAULTS.ACOUNT_AUTH_HEADER, apiToken), secureConnection);
89+
}
90+
7791
// private methods
7892

7993
private Postmark() {}

src/test/java/integration/MessageStreamsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void edit() throws PostmarkException, IOException {
6363

6464
@Test
6565
void archive() throws PostmarkException, IOException {
66-
String streamId = "bulk";
66+
String streamId = "bulk1";
6767
MessageStreams messages = client.getMessageStreams(Parameters.init().build("messageStreamType", "all")
6868
.build("includeArchivedStreams", "true"));
6969

0 commit comments

Comments
 (0)