Resolve VCSWP-19961 (Change AddToConference CallId property type) (#43)

amahadaya · web-flow · commit 2b8ecd889f99 · 2023-07-26T11:22:19.000-04:00
* Change AddToConference CallId property type

* Add changelog entry
diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES
@@ -306,3 +306,5 @@ src/main/java/com/github/freeclimbapi/auth/ApiKeyAuth.java
 src/main/java/com/github/freeclimbapi/auth/Authentication.java
 src/main/java/com/github/freeclimbapi/auth/HttpBasicAuth.java
 src/main/java/com/github/freeclimbapi/auth/HttpBearerAuth.java
+src/test/java/com/github/freeclimbapi/AddToConferenceAllOfTest.java
+src/test/java/com/github/freeclimbapi/AddToConferenceTest.java
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 None
 
+<a name="5.4.2"></a>
+
+## [5.4.2] 2023-07-26
+
+### Changed
+
+- Changed AddToConference CallId property type from boolean to string
+
 <a name="5.4.1"></a>
 
 ## [5.4.1] 2023-07-19
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>com.github.freeclimbapi</groupId>
   <artifactId>freeclimb-java-client</artifactId>
-  <version>5.4.1</version>
+  <version>5.4.2</version>
   <scope>compile</scope>
 </dependency>
 ```
@@ -56,7 +56,7 @@ Add this dependency to your project's build file:
   }
 
   dependencies {
-     implementation "com.github.freeclimbapi:freeclimb-java-client:5.4.1"
+     implementation "com.github.freeclimbapi:freeclimb-java-client:5.4.2"
      implementation("com.squareup.okhttp3:okhttp:4.9.3")
      implementation("com.squareup.okhttp3:logging-interceptor:4.9.3")
   }
@@ -72,7 +72,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/freeclimb-java-client-5.4.1.jar`
+* `target/freeclimb-java-client-5.4.2.jar`
 * `target/lib/*.jar`
 
 ## Getting Started
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'java'
 apply plugin: 'com.diffplug.spotless'
 
 group = 'com.github.freeclimbapi'
-version = '5.4.1'
+version = '5.4.2'
 
 buildscript {
     repositories {
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.github.freeclimbapi",
     name := "freeclimb-java-client",
-    version := "5.4.1",
+    version := "5.4.2",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),
diff --git a/docs/AddToConference.md b/docs/AddToConference.md
@@ -12,7 +12,7 @@ Name | Type | Description | Notes
 **callControlSequence** | **String** | Defines a sequence of digits that, when entered by this caller, invokes the &#x60;callControlUrl&#x60;. Only digits plus &#39;*&#39;, and &#39;#&#39; may be used. |  [optional]
 **callControlUrl** | **String** | URL to be invoked when this Participant enters the digit sequence defined in the &#x60;callControlSequence&#x60; attribute. |  [optional]
 **conferenceId** | **String** | ID of the Conference to which to add the Participant (Call leg). Conference must exist or an error will result. | 
-**callId** | **Boolean** | ID of the Call that will be added to the specified Conference. The Call must be in progress or an error will result. If the Call is part of an existing Conference, it is first removed from that Conference and is then moved to the new one. |  [optional]
+**callId** | **String** | ID of the Call that will be added to the specified Conference. The Call must be in progress or an error will result. If the Call is part of an existing Conference, it is first removed from that Conference and is then moved to the new one. |  [optional]
 **leaveConferenceUrl** | **String** | URL to be invoked when the Participant leaves the Conference.  |  [optional]
 **listen** | **Boolean** | If &#x60;true&#x60;, the Participant joins the Conference with listen privileges. This may be modified later via the REST API or &#x60;SetListen&#x60; PerCL command. |  [optional]
 **notificationUrl** | **String** | When the Participant enters the Conference, this URL will be invoked using an HTTP POST request with the standard request parameters. |  [optional]
diff --git a/docs/AddToConferenceAllOf.md b/docs/AddToConferenceAllOf.md
@@ -11,7 +11,7 @@ Name | Type | Description | Notes
 **callControlSequence** | **String** | Defines a sequence of digits that, when entered by this caller, invokes the &#x60;callControlUrl&#x60;. Only digits plus &#39;*&#39;, and &#39;#&#39; may be used. |  [optional]
 **callControlUrl** | **String** | URL to be invoked when this Participant enters the digit sequence defined in the &#x60;callControlSequence&#x60; attribute. |  [optional]
 **conferenceId** | **String** | ID of the Conference to which to add the Participant (Call leg). Conference must exist or an error will result. | 
-**callId** | **Boolean** | ID of the Call that will be added to the specified Conference. The Call must be in progress or an error will result. If the Call is part of an existing Conference, it is first removed from that Conference and is then moved to the new one. |  [optional]
+**callId** | **String** | ID of the Call that will be added to the specified Conference. The Call must be in progress or an error will result. If the Call is part of an existing Conference, it is first removed from that Conference and is then moved to the new one. |  [optional]
 **leaveConferenceUrl** | **String** | URL to be invoked when the Participant leaves the Conference.  |  [optional]
 **listen** | **Boolean** | If &#x60;true&#x60;, the Participant joins the Conference with listen privileges. This may be modified later via the REST API or &#x60;SetListen&#x60; PerCL command. |  [optional]
 **notificationUrl** | **String** | When the Participant enters the Conference, this URL will be invoked using an HTTP POST request with the standard request parameters. |  [optional]
diff --git a/openapi.json b/openapi.json
@@ -506,7 +506,7 @@
               },
               "callId": {
                 "description": "ID of the Call that will be added to the specified Conference. The Call must be in progress or an error will result. If the Call is part of an existing Conference, it is first removed from that Conference and is then moved to the new one.",
-                "type": "boolean"
+                "type": "string"
               },
               "leaveConferenceUrl": {
                 "description": "URL to be invoked when the Participant leaves the Conference. ",
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>freeclimb-java-client</artifactId>
     <packaging>jar</packaging>
     <name>freeclimb-java-client</name>
-    <version>5.4.1</version>
+    <version>5.4.2</version>
     <url>https://github.com/freeclimbapi/java-sdk</url>
     <description>FreeClimb Java Client</description>
     <scm>
diff --git a/src/main/java/com/github/freeclimbapi/ApiClient.java b/src/main/java/com/github/freeclimbapi/ApiClient.java
@@ -131,7 +131,7 @@ private void init() {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/5.4.1/java");
+        setUserAgent("OpenAPI-Generator/5.4.2/java");
 
         authentications = new HashMap<String, Authentication>();
     }
diff --git a/src/main/java/com/github/freeclimbapi/models/AddToConference.java b/src/main/java/com/github/freeclimbapi/models/AddToConference.java
@@ -63,7 +63,7 @@ public class AddToConference extends PerclCommand {
 
   public static final String SERIALIZED_NAME_CALL_ID = "callId";
   @SerializedName(SERIALIZED_NAME_CALL_ID)
-  private Boolean callId;
+  private String callId;
 
   public static final String SERIALIZED_NAME_LEAVE_CONFERENCE_URL = "leaveConferenceUrl";
   @SerializedName(SERIALIZED_NAME_LEAVE_CONFERENCE_URL)
@@ -181,7 +181,7 @@ public void setConferenceId(String conferenceId) {
   }
 
 
-  public AddToConference callId(Boolean callId) {
+  public AddToConference callId(String callId) {
     
     this.callId = callId;
     return this;
@@ -194,12 +194,12 @@ public AddToConference callId(Boolean callId) {
   @javax.annotation.Nullable
   @ApiModelProperty(value = "ID of the Call that will be added to the specified Conference. The Call must be in progress or an error will result. If the Call is part of an existing Conference, it is first removed from that Conference and is then moved to the new one.")
 
-  public Boolean getCallId() {
+  public String getCallId() {
     return callId;
   }
 
 
-  public void setCallId(Boolean callId) {
+  public void setCallId(String callId) {
     this.callId = callId;
   }
 
diff --git a/src/main/java/com/github/freeclimbapi/models/AddToConferenceAllOf.java b/src/main/java/com/github/freeclimbapi/models/AddToConferenceAllOf.java
@@ -62,7 +62,7 @@ public class AddToConferenceAllOf {
 
   public static final String SERIALIZED_NAME_CALL_ID = "callId";
   @SerializedName(SERIALIZED_NAME_CALL_ID)
-  private Boolean callId;
+  private String callId;
 
   public static final String SERIALIZED_NAME_LEAVE_CONFERENCE_URL = "leaveConferenceUrl";
   @SerializedName(SERIALIZED_NAME_LEAVE_CONFERENCE_URL)
@@ -179,7 +179,7 @@ public void setConferenceId(String conferenceId) {
   }
 
 
-  public AddToConferenceAllOf callId(Boolean callId) {
+  public AddToConferenceAllOf callId(String callId) {
     
     this.callId = callId;
     return this;
@@ -192,12 +192,12 @@ public AddToConferenceAllOf callId(Boolean callId) {
   @javax.annotation.Nullable
   @ApiModelProperty(value = "ID of the Call that will be added to the specified Conference. The Call must be in progress or an error will result. If the Call is part of an existing Conference, it is first removed from that Conference and is then moved to the new one.")
 
-  public Boolean getCallId() {
+  public String getCallId() {
     return callId;
   }
 
 
-  public void setCallId(Boolean callId) {
+  public void setCallId(String callId) {
     this.callId = callId;
   }
 
diff --git a/src/test/java/com/github/freeclimbapi/AddToConferenceAllOfTest.java b/src/test/java/com/github/freeclimbapi/AddToConferenceAllOfTest.java
@@ -83,8 +83,8 @@ public void conferenceIdTest() {
      */
     @Test
     public void callIdTest() {
-      model.setCallId(false);
-      Assert.assertEquals(false, model.getCallId());       
+      model.setCallId("TEST_STRING");
+      Assert.assertEquals("TEST_STRING", model.getCallId());
       
     }
 
@@ -149,7 +149,7 @@ public void equalsTrueTest() {
       test1.setCallControlSequence("TS");
       test1.setCallControlUrl("TS");
       test1.setConferenceId("TS");
-      test1.setCallId(true);
+      test1.setCallId("TS");
       test1.setLeaveConferenceUrl("TS");
       test1.setListen(true);
       test1.setNotificationUrl("TS");
@@ -160,7 +160,7 @@ public void equalsTrueTest() {
       test2.setCallControlSequence("TS");
       test2.setCallControlUrl("TS");
       test2.setConferenceId("TS");
-      test2.setCallId(true);
+      test2.setCallId("TS");
       test2.setLeaveConferenceUrl("TS");
       test2.setListen(true);
       test2.setNotificationUrl("TS");
@@ -181,7 +181,7 @@ public void equalsFalseTest() {
       test1.setCallControlSequence("TS");
       test1.setCallControlUrl("TS");
       test1.setConferenceId("TS");
-      test1.setCallId(true);
+      test1.setCallId("TS");
       test1.setLeaveConferenceUrl("TS");
       test1.setListen(true);
       test1.setNotificationUrl("TS");
@@ -192,7 +192,7 @@ public void equalsFalseTest() {
       test2.setCallControlSequence("tS");
       test2.setCallControlUrl("tS");
       test2.setConferenceId("tS");
-      test2.setCallId(false);
+      test2.setCallId("tS");
       test2.setLeaveConferenceUrl("tS");
       test2.setListen(false);
       test2.setNotificationUrl("tS");
@@ -213,7 +213,7 @@ public void hashCodeTypeTest() {
       test1.setCallControlSequence("TS");
       test1.setCallControlUrl("TS");
       test1.setConferenceId("TS");
-      test1.setCallId(true);
+      test1.setCallId("TS");
       test1.setLeaveConferenceUrl("TS");
       test1.setListen(true);
       test1.setNotificationUrl("TS");
@@ -235,7 +235,7 @@ public void toStringEqualsTest() {
       test1.setCallControlSequence("TS");
       test1.setCallControlUrl("TS");
       test1.setConferenceId("TS");
-      test1.setCallId(true);
+      test1.setCallId("TS");
       test1.setLeaveConferenceUrl("TS");
       test1.setListen(true);
       test1.setNotificationUrl("TS");
@@ -246,7 +246,7 @@ public void toStringEqualsTest() {
       test2.setCallControlSequence("TS");
       test2.setCallControlUrl("TS");
       test2.setConferenceId("TS");
-      test2.setCallId(true);
+      test2.setCallId("TS");
       test2.setLeaveConferenceUrl("TS");
       test2.setListen(true);
       test2.setNotificationUrl("TS");
@@ -269,7 +269,7 @@ public void toStringTypeTest() {
       test1.setCallControlSequence("TS");
       test1.setCallControlUrl("TS");
       test1.setConferenceId("TS");
-      test1.setCallId(true);
+      test1.setCallId("TS");
       test1.setLeaveConferenceUrl("TS");
       test1.setListen(true);
       test1.setNotificationUrl("TS");
diff --git a/src/test/java/com/github/freeclimbapi/AddToConferenceTest.java b/src/test/java/com/github/freeclimbapi/AddToConferenceTest.java
@@ -83,8 +83,8 @@ public void conferenceIdTest() {
      */
     @Test
     public void callIdTest() {
-      model.setCallId(false);
-      Assert.assertEquals(false, model.getCallId());       
+      model.setCallId("TEST_STRING");
+      Assert.assertEquals("TEST_STRING", model.getCallId());
       
     }
 
@@ -149,7 +149,7 @@ public void equalsTrueTest() {
       test1.setCallControlSequence("TS");
       test1.setCallControlUrl("TS");
       test1.setConferenceId("TS");
-      test1.setCallId(true);
+      test1.setCallId("TS");
       test1.setLeaveConferenceUrl("TS");
       test1.setListen(true);
       test1.setNotificationUrl("TS");
@@ -160,7 +160,7 @@ public void equalsTrueTest() {
       test2.setCallControlSequence("TS");
       test2.setCallControlUrl("TS");
       test2.setConferenceId("TS");
-      test2.setCallId(true);
+      test2.setCallId("TS");
       test2.setLeaveConferenceUrl("TS");
       test2.setListen(true);
       test2.setNotificationUrl("TS");
@@ -181,7 +181,7 @@ public void equalsFalseTest() {
       test1.setCallControlSequence("TS");
       test1.setCallControlUrl("TS");
       test1.setConferenceId("TS");
-      test1.setCallId(true);
+      test1.setCallId("TS");
       test1.setLeaveConferenceUrl("TS");
       test1.setListen(true);
       test1.setNotificationUrl("TS");
@@ -192,7 +192,7 @@ public void equalsFalseTest() {
       test2.setCallControlSequence("tS");
       test2.setCallControlUrl("tS");
       test2.setConferenceId("tS");
-      test2.setCallId(false);
+      test2.setCallId("tS");
       test2.setLeaveConferenceUrl("tS");
       test2.setListen(false);
       test2.setNotificationUrl("tS");
@@ -213,7 +213,7 @@ public void hashCodeTypeTest() {
       test1.setCallControlSequence("TS");
       test1.setCallControlUrl("TS");
       test1.setConferenceId("TS");
-      test1.setCallId(true);
+      test1.setCallId("TS");
       test1.setLeaveConferenceUrl("TS");
       test1.setListen(true);
       test1.setNotificationUrl("TS");
@@ -235,7 +235,7 @@ public void toStringEqualsTest() {
       test1.setCallControlSequence("TS");
       test1.setCallControlUrl("TS");
       test1.setConferenceId("TS");
-      test1.setCallId(true);
+      test1.setCallId("TS");
       test1.setLeaveConferenceUrl("TS");
       test1.setListen(true);
       test1.setNotificationUrl("TS");
@@ -246,7 +246,7 @@ public void toStringEqualsTest() {
       test2.setCallControlSequence("TS");
       test2.setCallControlUrl("TS");
       test2.setConferenceId("TS");
-      test2.setCallId(true);
+      test2.setCallId("TS");
       test2.setLeaveConferenceUrl("TS");
       test2.setListen(true);
       test2.setNotificationUrl("TS");
@@ -269,7 +269,7 @@ public void toStringTypeTest() {
       test1.setCallControlSequence("TS");
       test1.setCallControlUrl("TS");
       test1.setConferenceId("TS");
-      test1.setCallId(true);
+      test1.setCallId("TS");
       test1.setLeaveConferenceUrl("TS");
       test1.setListen(true);
       test1.setNotificationUrl("TS");
@@ -291,7 +291,7 @@ public void buildTest() throws Exception {
         model.setCallControlSequence("TEST_STRING");
         model.setCallControlUrl("TEST_STRING");
         model.setConferenceId("TEST_STRING");
-        model.setCallId(false);
+        model.setCallId("TEST_STRING");
         model.setLeaveConferenceUrl("TEST_STRING");
         model.setListen(false);
         model.setNotificationUrl("TEST_STRING");

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private void init() {`
`131`	`131`	`json = new JSON();`
`132`	`132`
`133`	`133`	`// Set default User-Agent.`
`134`		`- setUserAgent("OpenAPI-Generator/5.4.1/java");`
	`134`	`+ setUserAgent("OpenAPI-Generator/5.4.2/java");`
`135`	`135`
`136`	`136`	`authentications = new HashMap<String, Authentication>();`
`137`	`137`	`}`