Skip to content

Commit c546e2e

Browse files
authored
Merge pull request #31 from FreeClimbAPI/VCSWP-19213
Resolves VCSWP-19213
2 parents 344c031 + 89d946a commit c546e2e

File tree

13 files changed

+48
-43
lines changed

13 files changed

+48
-43
lines changed

.openapi-generator/FILES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,3 +286,4 @@ src/main/java/com/github/freeclimbapi/auth/ApiKeyAuth.java
286286
src/main/java/com/github/freeclimbapi/auth/Authentication.java
287287
src/main/java/com/github/freeclimbapi/auth/HttpBasicAuth.java
288288
src/main/java/com/github/freeclimbapi/auth/HttpBearerAuth.java
289+
src/test/java/com/github/freeclimbapi/DefaultApiTest.java

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Add this dependency to your project's POM:
4040
<dependency>
4141
<groupId>com.github.freeclimbapi</groupId>
4242
<artifactId>freeclimb-java-client</artifactId>
43-
<version>5.1.2</version>
43+
<version>5.1.3</version>
4444
<scope>compile</scope>
4545
</dependency>
4646
```
@@ -56,7 +56,7 @@ Add this dependency to your project's build file:
5656
}
5757
5858
dependencies {
59-
implementation "com.github.freeclimbapi:freeclimb-java-client:5.1.2"
59+
implementation "com.github.freeclimbapi:freeclimb-java-client:5.1.3"
6060
}
6161
```
6262

@@ -70,7 +70,7 @@ mvn clean package
7070

7171
Then manually install the following JARs:
7272

73-
* `target/freeclimb-java-client-5.1.2.jar`
73+
* `target/freeclimb-java-client-5.1.3.jar`
7474
* `target/lib/*.jar`
7575

7676
## Getting Started

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'java'
44
apply plugin: 'com.diffplug.spotless'
55

66
group = 'com.github.freeclimbapi'
7-
version = '5.1.2'
7+
version = '5.1.3'
88

99
buildscript {
1010
repositories {

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
22
settings(
33
organization := "com.github.freeclimbapi",
44
name := "freeclimb-java-client",
5-
version := "5.1.2",
5+
version := "5.1.3",
66
scalaVersion := "2.11.4",
77
scalacOptions ++= Seq("-feature"),
88
javacOptions in compile ++= Seq("-Xlint:deprecation"),

docs/CallResult.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Name | Type | Description | Notes
1717
**from** | **String** | Phone number that initiated this Call. | [optional]
1818
**to** | **String** | Phone number that received this Call. | [optional]
1919
**phoneNumberId** | **String** | If the Call was inbound, this is the ID of the IncomingPhoneNumber that received the Call (DNIS). If the Call was outbound, this is the ID of the phone number from which the Call was placed (ANI). | [optional]
20-
**status** | **CallStatus** | | [optional]
20+
**callStatus** | **CallStatus** | | [optional]
2121
**startTime** | **String** | Start time of the Call (GMT) in RFC 1123 format (e.g., Mon, 15 Jun 2009 20:45:30 GMT). Empty if the Call has not yet been dialed. | [optional]
2222
**connectTime** | **String** | Time the Call was answered (GMT) in RFC 1123 format (e.g., Mon, 15 Jun 2009 20:45:30 GMT). Empty if the Call has not yet been dialed. | [optional]
2323
**endTime** | **String** | End time of the Call (GMT) in RFC 1123 format (e.g., Mon, 15 Jun 2009 20:45:30 GMT). Empty if the Call did not complete successfully. | [optional]

docs/CallResultAllOf.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Name | Type | Description | Notes
1313
**from** | **String** | Phone number that initiated this Call. | [optional]
1414
**to** | **String** | Phone number that received this Call. | [optional]
1515
**phoneNumberId** | **String** | If the Call was inbound, this is the ID of the IncomingPhoneNumber that received the Call (DNIS). If the Call was outbound, this is the ID of the phone number from which the Call was placed (ANI). | [optional]
16-
**status** | **CallStatus** | | [optional]
16+
**callStatus** | **CallStatus** | | [optional]
1717
**startTime** | **String** | Start time of the Call (GMT) in RFC 1123 format (e.g., Mon, 15 Jun 2009 20:45:30 GMT). Empty if the Call has not yet been dialed. | [optional]
1818
**connectTime** | **String** | Time the Call was answered (GMT) in RFC 1123 format (e.g., Mon, 15 Jun 2009 20:45:30 GMT). Empty if the Call has not yet been dialed. | [optional]
1919
**endTime** | **String** | End time of the Call (GMT) in RFC 1123 format (e.g., Mon, 15 Jun 2009 20:45:30 GMT). Empty if the Call did not complete successfully. | [optional]

openapi.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,7 +1647,7 @@
16471647
"description": "If the Call was inbound, this is the ID of the IncomingPhoneNumber that received the Call (DNIS). If the Call was outbound, this is the ID of the phone number from which the Call was placed (ANI).",
16481648
"nullable": true
16491649
},
1650-
"status": {
1650+
"callStatus": {
16511651
"$ref": "#/components/schemas/CallStatus",
16521652
"nullable": true
16531653
},
@@ -1835,7 +1835,7 @@
18351835
},
18361836
"level": {
18371837
"$ref": "#/components/schemas/LogLevel",
1838-
1838+
18391839
"nullable": true
18401840
},
18411841
"requestId": {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>freeclimb-java-client</artifactId>
66
<packaging>jar</packaging>
77
<name>freeclimb-java-client</name>
8-
<version>5.1.2</version>
8+
<version>5.1.3</version>
99
<url>https://github.com/freeclimbapi/java-sdk</url>
1010
<description>FreeClimb Java Client</description>
1111
<scm>

src/main/java/com/github/freeclimbapi/ApiClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ private void init() {
131131
json = new JSON();
132132

133133
// Set default User-Agent.
134-
setUserAgent("OpenAPI-Generator/5.1.2/java");
134+
setUserAgent("OpenAPI-Generator/5.1.3/java");
135135

136136
authentications = new HashMap<String, Authentication>();
137137
}

src/main/java/com/github/freeclimbapi/models/CallResult.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ public class CallResult {
7979
@SerializedName(SERIALIZED_NAME_PHONE_NUMBER_ID)
8080
private String phoneNumberId;
8181

82-
public static final String SERIALIZED_NAME_STATUS = "status";
83-
@SerializedName(SERIALIZED_NAME_STATUS)
84-
private CallStatus status;
82+
public static final String SERIALIZED_NAME_CALL_STATUS = "callStatus";
83+
@SerializedName(SERIALIZED_NAME_CALL_STATUS)
84+
private CallStatus callStatus;
8585

8686
public static final String SERIALIZED_NAME_START_TIME = "startTime";
8787
@SerializedName(SERIALIZED_NAME_START_TIME)
@@ -348,26 +348,26 @@ public void setPhoneNumberId(String phoneNumberId) {
348348
}
349349

350350

351-
public CallResult status(CallStatus status) {
351+
public CallResult callStatus(CallStatus callStatus) {
352352

353-
this.status = status;
353+
this.callStatus = callStatus;
354354
return this;
355355
}
356356

357357
/**
358-
* Get status
359-
* @return status
358+
* Get callStatus
359+
* @return callStatus
360360
**/
361361
@javax.annotation.Nullable
362362
@ApiModelProperty(value = "")
363363

364-
public CallStatus getStatus() {
365-
return status;
364+
public CallStatus getCallStatus() {
365+
return callStatus;
366366
}
367367

368368

369-
public void setStatus(CallStatus status) {
370-
this.status = status;
369+
public void setCallStatus(CallStatus callStatus) {
370+
this.callStatus = callStatus;
371371
}
372372

373373

@@ -574,7 +574,7 @@ public boolean equals(Object o) {
574574
Objects.equals(this.from, callResult.from) &&
575575
Objects.equals(this.to, callResult.to) &&
576576
Objects.equals(this.phoneNumberId, callResult.phoneNumberId) &&
577-
Objects.equals(this.status, callResult.status) &&
577+
Objects.equals(this.callStatus, callResult.callStatus) &&
578578
Objects.equals(this.startTime, callResult.startTime) &&
579579
Objects.equals(this.connectTime, callResult.connectTime) &&
580580
Objects.equals(this.endTime, callResult.endTime) &&
@@ -591,7 +591,7 @@ private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b)
591591

592592
@Override
593593
public int hashCode() {
594-
return Objects.hash(uri, dateCreated, dateUpdated, revision, callId, parentCallId, accountId, from, to, phoneNumberId, status, startTime, connectTime, endTime, duration, connectDuration, direction, answeredBy, subresourceUris);
594+
return Objects.hash(uri, dateCreated, dateUpdated, revision, callId, parentCallId, accountId, from, to, phoneNumberId, callStatus, startTime, connectTime, endTime, duration, connectDuration, direction, answeredBy, subresourceUris);
595595
}
596596

597597
private static <T> int hashCodeNullable(JsonNullable<T> a) {
@@ -615,7 +615,7 @@ public String toString() {
615615
sb.append(" from: ").append(toIndentedString(from)).append("\n");
616616
sb.append(" to: ").append(toIndentedString(to)).append("\n");
617617
sb.append(" phoneNumberId: ").append(toIndentedString(phoneNumberId)).append("\n");
618-
sb.append(" status: ").append(toIndentedString(status)).append("\n");
618+
sb.append(" callStatus: ").append(toIndentedString(callStatus)).append("\n");
619619
sb.append(" startTime: ").append(toIndentedString(startTime)).append("\n");
620620
sb.append(" connectTime: ").append(toIndentedString(connectTime)).append("\n");
621621
sb.append(" endTime: ").append(toIndentedString(endTime)).append("\n");

0 commit comments

Comments
 (0)