Skip to content

Commit b80b28b

Browse files
DX-BandwidthDX-Bandwidth
committed
Deploy
1 parent f3c0217 commit b80b28b

File tree

592 files changed

+8210
-2811
lines changed

Some content is hidden

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

592 files changed

+8210
-2811
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<project><modelVersion>4.0.0</modelVersion><groupId>com.bandwidth.sdk</groupId><artifactId>bandwidth-sdk</artifactId><version>3.9.0</version><packaging>jar</packaging><name>BandwidthLib</name><build><pluginManagement><plugins><plugin><groupId>org.eclipse.m2e</groupId><artifactId>lifecycle-mapping</artifactId><version>1.0.0</version><configuration><lifecycleMappingMetadata><pluginExecutions><pluginExecution><pluginExecutionFilter><groupId>org.apache.maven.plugins</groupId><artifactId>maven-enforcer-plugin</artifactId><versionRange>[2.0.0,)</versionRange><goals><goal>enforce</goal></goals></pluginExecutionFilter><action><execute><runOnIncremental>true</runOnIncremental></execute></action></pluginExecution></pluginExecutions></lifecycleMappingMetadata></configuration></plugin></plugins></pluginManagement><plugins><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-enforcer-plugin</artifactId><version>3.0.0-M2</version><executions><execution><id>enforce-versions</id><goals><goal>enforce</goal></goals><configuration><fail>true</fail><rules><requireJavaVersion><version>1.8</version></requireJavaVersion></rules></configuration></execution></executions></plugin><plugin><artifactId>maven-assembly-plugin</artifactId><configuration><descriptorRefs><descriptorRef>jar-with-dependencies</descriptorRef></descriptorRefs><appendAssemblyId>false</appendAssemblyId></configuration></plugin><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-source-plugin</artifactId><version>3.1.0</version><executions><execution><id>attach-sources</id><goals><goal>jar</goal></goals></execution></executions></plugin><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-gpg-plugin</artifactId><version>1.5</version><executions><execution><id>sign-artifacts</id><phase>verify</phase><goals><goal>sign</goal></goals></execution></executions></plugin><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-javadoc-plugin</artifactId><version>3.1.1</version><configuration><failOnError>false</failOnError></configuration><executions><execution><id>attach-javadocs</id><goals><goal>jar</goal></goals></execution></executions></plugin><plugin><groupId>org.sonatype.plugins</groupId><artifactId>nexus-staging-maven-plugin</artifactId><version>1.6.2</version><extensions>true</extensions><configuration><serverId>ossrh</serverId><nexusUrl>https://oss.sonatype.org/</nexusUrl><autoReleaseAfterClose>true</autoReleaseAfterClose></configuration></plugin></plugins></build><properties><jackson.version>2.9.10</jackson.version><jackson.databind.version>2.9.10.4</jackson.databind.version><maven.compiler.source>1.8</maven.compiler.source><maven.compiler.target>1.8</maven.compiler.target><project.build.sourceEncoding>UTF-8</project.build.sourceEncoding></properties><dependencies><dependency><groupId>javax.xml.bind</groupId><artifactId>jaxb-api</artifactId><version>2.3.0</version></dependency><dependency><groupId>com.sun.xml.bind</groupId><artifactId>jaxb-core</artifactId><version>2.3.0</version></dependency><dependency><groupId>com.sun.xml.bind</groupId><artifactId>jaxb-impl</artifactId><version>2.3.0</version></dependency><dependency><groupId>org.projectlombok</groupId><artifactId>lombok</artifactId><version>1.18.8</version></dependency><dependency><groupId>com.squareup.okhttp3</groupId><artifactId>okhttp</artifactId><version>3.12.1</version></dependency><dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-databind</artifactId><version>${jackson.databind.version}</version></dependency><dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-core</artifactId><version>${jackson.version}</version></dependency><dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-annotations</artifactId><version>${jackson.version}</version></dependency></dependencies><distributionManagement><snapshotRepository><id>ossrh</id><url>https://oss.sonatype.org/content/repositories/snapshots</url></snapshotRepository><repository><id>ossrh</id><url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url></repository></distributionManagement><parent><groupId>org.sonatype.oss</groupId><artifactId>oss-parent</artifactId><version>7</version></parent><licenses><license><name>Apache License, Version 2.0</name><url>http://www.apache.org/licenses/LICENSE-2.0.txt</url><distribution>repo</distribution></license></licenses><scm><url>https://github.com/Bandwidth/java-sdk</url><connection>scm:git:git@github.com:Bandwidth/java-sdk.git</connection><developerConnection>scm:git:git@github.com:Bandwidth/java-sdk.git</developerConnection></scm><developers><developer><id>support</id><name>Bandwidth Support</name><email>info@bandwidth.com</email><organization>Bandwidth, Inc.</organization><organizationUrl>http://bandwidth.com</organizationUrl><timezone>-5</timezone></developer></developers></project>
1+
<project><modelVersion>4.0.0</modelVersion><groupId>com.bandwidth.sdk</groupId><artifactId>bandwidth-sdk</artifactId><version>3.10.0</version><packaging>jar</packaging><name>BandwidthLib</name><build><pluginManagement><plugins><plugin><groupId>org.eclipse.m2e</groupId><artifactId>lifecycle-mapping</artifactId><version>1.0.0</version><configuration><lifecycleMappingMetadata><pluginExecutions><pluginExecution><pluginExecutionFilter><groupId>org.apache.maven.plugins</groupId><artifactId>maven-enforcer-plugin</artifactId><versionRange>[2.0.0,)</versionRange><goals><goal>enforce</goal></goals></pluginExecutionFilter><action><execute><runOnIncremental>true</runOnIncremental></execute></action></pluginExecution></pluginExecutions></lifecycleMappingMetadata></configuration></plugin></plugins></pluginManagement><plugins><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-enforcer-plugin</artifactId><version>3.0.0-M2</version><executions><execution><id>enforce-versions</id><goals><goal>enforce</goal></goals><configuration><fail>true</fail><rules><requireJavaVersion><version>1.8</version></requireJavaVersion></rules></configuration></execution></executions></plugin><plugin><artifactId>maven-assembly-plugin</artifactId><configuration><descriptorRefs><descriptorRef>jar-with-dependencies</descriptorRef></descriptorRefs><appendAssemblyId>false</appendAssemblyId></configuration></plugin><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-source-plugin</artifactId><version>3.1.0</version><executions><execution><id>attach-sources</id><goals><goal>jar</goal></goals></execution></executions></plugin><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-gpg-plugin</artifactId><version>1.5</version><executions><execution><id>sign-artifacts</id><phase>verify</phase><goals><goal>sign</goal></goals></execution></executions></plugin><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-javadoc-plugin</artifactId><version>3.1.1</version><configuration><failOnError>false</failOnError></configuration><executions><execution><id>attach-javadocs</id><goals><goal>jar</goal></goals></execution></executions></plugin><plugin><groupId>org.sonatype.plugins</groupId><artifactId>nexus-staging-maven-plugin</artifactId><version>1.6.2</version><extensions>true</extensions><configuration><serverId>ossrh</serverId><nexusUrl>https://oss.sonatype.org/</nexusUrl><autoReleaseAfterClose>true</autoReleaseAfterClose></configuration></plugin></plugins></build><properties><jackson.version>2.9.10</jackson.version><jackson.databind.version>2.9.10.5</jackson.databind.version><maven.compiler.source>1.8</maven.compiler.source><maven.compiler.target>1.8</maven.compiler.target><project.build.sourceEncoding>UTF-8</project.build.sourceEncoding></properties><dependencies><dependency><groupId>javax.xml.bind</groupId><artifactId>jaxb-api</artifactId><version>2.3.0</version></dependency><dependency><groupId>com.sun.xml.bind</groupId><artifactId>jaxb-core</artifactId><version>2.3.0</version></dependency><dependency><groupId>com.sun.xml.bind</groupId><artifactId>jaxb-impl</artifactId><version>2.3.0</version></dependency><dependency><groupId>org.projectlombok</groupId><artifactId>lombok</artifactId><version>1.18.8</version></dependency><dependency><groupId>com.squareup.okhttp3</groupId><artifactId>okhttp</artifactId><version>3.12.1</version></dependency><dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-databind</artifactId><version>${jackson.databind.version}</version></dependency><dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-core</artifactId><version>${jackson.version}</version></dependency><dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-annotations</artifactId><version>${jackson.version}</version></dependency></dependencies><distributionManagement><snapshotRepository><id>ossrh</id><url>https://oss.sonatype.org/content/repositories/snapshots</url></snapshotRepository><repository><id>ossrh</id><url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url></repository></distributionManagement><parent><groupId>org.sonatype.oss</groupId><artifactId>oss-parent</artifactId><version>7</version></parent><licenses><license><name>Apache License, Version 2.0</name><url>http://www.apache.org/licenses/LICENSE-2.0.txt</url><distribution>repo</distribution></license></licenses><scm><url>https://github.com/Bandwidth/java-sdk</url><connection>scm:git:git@github.com:Bandwidth/java-sdk.git</connection><developerConnection>scm:git:git@github.com:Bandwidth/java-sdk.git</developerConnection></scm><developers><developer><id>support</id><name>Bandwidth Support</name><email>info@bandwidth.com</email><organization>Bandwidth, Inc.</organization><organizationUrl>http://bandwidth.com</organizationUrl><timezone>-5</timezone></developer></developers></project>

‎src/main/java/com/bandwidth/BandwidthClient.java‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,13 @@ public static void shutdown() {
6666
OkClient.shutdown();
6767
}
6868

69-
private BandwidthClient(Environment environment, String messagingBasicAuthUserName,
69+
private BandwidthClient(Environment environment, String baseUrl, String messagingBasicAuthUserName,
7070
String messagingBasicAuthPassword, String twoFactorAuthBasicAuthUserName,
7171
String twoFactorAuthBasicAuthPassword, String voiceBasicAuthUserName, String voiceBasicAuthPassword,
7272
String webRtcBasicAuthUserName, String webRtcBasicAuthPassword, HttpClient httpClient, long timeout,
7373
ReadonlyHttpClientConfiguration httpClientConfig, Map<String, AuthManager> authManagers) {
7474
this.environment = environment;
75+
this.baseUrl = baseUrl;
7576
this.httpClient = httpClient;
7677
this.timeout = timeout;
7778
this.httpClientConfig = httpClientConfig;
@@ -127,6 +128,11 @@ private BandwidthClient(Environment environment, String messagingBasicAuthUserNa
127128
*/
128129
private final Environment environment;
129130

131+
/**
132+
* baseUrl value
133+
*/
134+
private final String baseUrl;
135+
130136
/**
131137
* The HTTP Client instance to use for making HTTP requests.
132138
*/
@@ -175,6 +181,14 @@ public Environment getEnvironment() {
175181
return environment;
176182
}
177183

184+
/**
185+
* baseUrl value
186+
* @return baseUrl
187+
*/
188+
public String getBaseUrl() {
189+
return baseUrl;
190+
}
191+
178192
/**
179193
* The HTTP Client instance to use for making HTTP requests.
180194
* @return httpClient
@@ -279,6 +293,7 @@ public Map<String, AuthManager> getAuthManagers() {
279293
public String getBaseUri(Server server) {
280294
StringBuilder baseUrl = new StringBuilder(environmentMapper(environment, server));
281295
Map<String, SimpleEntry<Object, Boolean>> parameters = new HashMap<>();
296+
parameters.put("base_url", new SimpleEntry<Object, Boolean>(this.baseUrl, false));
282297
ApiHelper.appendUrlWithTemplateParameters(baseUrl, parameters);
283298
return baseUrl.toString();
284299
}
@@ -315,6 +330,23 @@ private static String environmentMapper(Environment environment, Server server)
315330
return "https://api.webrtc.bandwidth.com/v1";
316331
}
317332
}
333+
if (environment.equals(Environment.CUSTOM)) {
334+
if (server.equals(Server.ENUM_DEFAULT)) {
335+
return "{base_url}";
336+
}
337+
if (server.equals(Server.MESSAGINGDEFAULT)) {
338+
return "{base_url}";
339+
}
340+
if (server.equals(Server.TWOFACTORAUTHDEFAULT)) {
341+
return "{base_url}";
342+
}
343+
if (server.equals(Server.VOICEDEFAULT)) {
344+
return "{base_url}";
345+
}
346+
if (server.equals(Server.WEBRTCDEFAULT)) {
347+
return "{base_url}";
348+
}
349+
}
318350
return "api.bandwidth.com";
319351
}
320352

@@ -327,6 +359,7 @@ private static String environmentMapper(Environment environment, Server server)
327359
public Builder newBuilder() {
328360
Builder builder = new Builder();
329361
builder.environment = getEnvironment();
362+
builder.baseUrl = getBaseUrl();
330363
builder.messagingBasicAuthUserName = getMessagingBasicAuthUserName();
331364
builder.messagingBasicAuthPassword = getMessagingBasicAuthPassword();
332365
builder.twoFactorAuthBasicAuthUserName = getTwoFactorAuthBasicAuthUserName();
@@ -347,6 +380,7 @@ public Builder newBuilder() {
347380
*/
348381
public static class Builder {
349382
private Environment environment = Environment.PRODUCTION;
383+
private String baseUrl = "https://www.example.com";
350384
private String messagingBasicAuthUserName = "TODO: Replace";
351385
private String messagingBasicAuthPassword = "TODO: Replace";
352386
private String twoFactorAuthBasicAuthUserName = "TODO: Replace";
@@ -433,6 +467,14 @@ public Builder environment(Environment environment) {
433467
this.environment = environment;
434468
return this;
435469
}
470+
/**
471+
* baseUrl value
472+
* @param baseUrl
473+
*/
474+
public Builder baseUrl(String baseUrl) {
475+
this.baseUrl = baseUrl;
476+
return this;
477+
}
436478
/**
437479
* The timeout to use for making HTTP requests.
438480
* @param timeout must be greater then 0.
@@ -457,7 +499,7 @@ public BandwidthClient build() {
457499
httpClientConfig.setTimeout(timeout);
458500
httpClient = new OkClient(httpClientConfig);
459501

460-
return new BandwidthClient(environment, messagingBasicAuthUserName, messagingBasicAuthPassword,
502+
return new BandwidthClient(environment, baseUrl, messagingBasicAuthUserName, messagingBasicAuthPassword,
461503
twoFactorAuthBasicAuthUserName, twoFactorAuthBasicAuthPassword, voiceBasicAuthUserName,
462504
voiceBasicAuthPassword, webRtcBasicAuthUserName, webRtcBasicAuthPassword, httpClient, timeout,
463505
httpClientConfig, authManagers);

‎src/main/java/com/bandwidth/Configuration.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ public interface Configuration {
1818
*/
1919
Environment getEnvironment();
2020

21+
/**
22+
* baseUrl value
23+
* @return a copy of baseUrl
24+
*/
25+
String getBaseUrl();
26+
2127
/**
2228
* The timeout to use for making HTTP requests.
2329
* @return a copy of timeout

‎src/main/java/com/bandwidth/DateTimeHelper.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,13 @@ public static List<String> toRfc1123DateTime(List<LocalDateTime> values) {
119119
* @return The parsed DateTime object
120120
*/
121121
public static LocalDateTime fromRfc8601DateTime(String date) {
122-
LocalDateTime localDateTime = LocalDateTime.parse(date, DateTimeFormatter.ISO_DATE_TIME);
123122
Pattern pattern = Pattern.compile("(Z|([+-])(\\d{2}:\\d{2}))$");
124123
Matcher patternMatcher = pattern.matcher(date);
125124
if (patternMatcher.find()) {
126-
OffsetDateTime timeUtc = localDateTime.atOffset(ZoneOffset.UTC);
127-
String offsetInfo = patternMatcher.group(1);
128-
OffsetDateTime offsetTime = timeUtc.withOffsetSameInstant(ZoneOffset.of(offsetInfo));
129-
return LocalDateTime.from(offsetTime);
125+
OffsetDateTime parsed = OffsetDateTime.parse(date, DateTimeFormatter.ISO_DATE_TIME);
126+
return LocalDateTime.from(parsed.withOffsetSameInstant(ZoneOffset.UTC));
130127
} else {
131-
return localDateTime;
128+
return LocalDateTime.parse(date, DateTimeFormatter.ISO_DATE_TIME);
132129
}
133130
}
134131

@@ -138,7 +135,7 @@ public static LocalDateTime fromRfc8601DateTime(String date) {
138135
* @return The converted String
139136
*/
140137
public static String toRfc8601DateTime(LocalDateTime value) {
141-
return value.atOffset(OffsetDateTime.now().getOffset()).toString();
138+
return value.toString() + "Z";
142139
}
143140

144141
/**

‎src/main/java/com/bandwidth/Environment.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,20 @@
1313
* Environment to be used.
1414
*/
1515
public enum Environment {
16-
PRODUCTION;
16+
PRODUCTION,
17+
18+
CUSTOM;
1719

1820

1921
private static TreeMap<String, Environment> valueMap = new TreeMap<>();
2022
private String value;
2123

2224
static {
2325
PRODUCTION.value = "production";
26+
CUSTOM.value = "custom";
2427

2528
valueMap.put("production", PRODUCTION);
29+
valueMap.put("custom", CUSTOM);
2630
}
2731

2832
/**

‎src/main/java/com/bandwidth/controllers/BaseController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public abstract class BaseController {
2929
* Protected variables to hold an instance of Configuration
3030
*/
3131
protected final Configuration config;
32-
protected static final String userAgent = "java-sdk-refs/tags/java3.9.0";
32+
protected static final String userAgent = "java-sdk-refs/tags/java3.10.0";
3333

3434

3535
protected Map<String, AuthManager> authManagers;

‎src/main/java/com/bandwidth/http/client/OkClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
*/
3333
public class OkClient implements HttpClient {
3434
private final static Object syncObject = new Object();
35-
private static okhttp3.OkHttpClient defaultOkHttpClient;
35+
private static volatile okhttp3.OkHttpClient defaultOkHttpClient;
3636

3737
/**
3838
* Private instance of the okhttp3.OkHttpClient

‎src/main/java/com/bandwidth/messaging/models/BandwidthCallbackMessage.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public String getTime() {
6060
* Setter for Time.
6161
*/
6262
@JsonSetter("time")
63-
public void setTime(String value) {
64-
this.time = value;
63+
public void setTime(String time) {
64+
this.time = time;
6565
}
6666

6767
/**
@@ -75,8 +75,8 @@ public String getType() {
7575
* Setter for Type.
7676
*/
7777
@JsonSetter("type")
78-
public void setType(String value) {
79-
this.type = value;
78+
public void setType(String type) {
79+
this.type = type;
8080
}
8181

8282
/**
@@ -90,8 +90,8 @@ public String getTo() {
9090
* Setter for To.
9191
*/
9292
@JsonSetter("to")
93-
public void setTo(String value) {
94-
this.to = value;
93+
public void setTo(String to) {
94+
this.to = to;
9595
}
9696

9797
/**
@@ -105,8 +105,8 @@ public String getErrorCode() {
105105
* Setter for ErrorCode.
106106
*/
107107
@JsonSetter("errorCode")
108-
public void setErrorCode(String value) {
109-
this.errorCode = value;
108+
public void setErrorCode(String errorCode) {
109+
this.errorCode = errorCode;
110110
}
111111

112112
/**
@@ -120,8 +120,8 @@ public String getDescription() {
120120
* Setter for Description.
121121
*/
122122
@JsonSetter("description")
123-
public void setDescription(String value) {
124-
this.description = value;
123+
public void setDescription(String description) {
124+
this.description = description;
125125
}
126126

127127
/**
@@ -135,8 +135,8 @@ public BandwidthMessage getMessage() {
135135
* Setter for Message.
136136
*/
137137
@JsonSetter("message")
138-
public void setMessage(BandwidthMessage value) {
139-
this.message = value;
138+
public void setMessage(BandwidthMessage message) {
139+
this.message = message;
140140
}
141141

142142

0 commit comments

Comments
 (0)