Merge pull request #29 from FreeClimbAPI/VCSWP-18939

Resolve VCSWP-18939 (Increment patch version for package release)

Author: amahadaya

CHANGELOG.md

@@ -9,6 +9,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 None
 
+<a name="5.1.1"></a>
+
+## [5.1.1] 2023-02-14
+
+### Changed
+
+- Application Request model allows for null values
+
 <a name="5.1.0"></a>
 
 ## [5.1.0] 2023-01-06

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.1.0</version>
+  <version>5.1.1</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.1.0"
+     implementation "com.github.freeclimbapi:freeclimb-java-client:5.1.1"
   }
 ```
 
@@ -70,7 +70,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/freeclimb-java-client-5.1.0.jar`
+* `target/freeclimb-java-client-5.1.1.jar`
 * `target/lib/*.jar`
 
 ## Getting Started

build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'java'
 apply plugin: 'com.diffplug.spotless'
 
 group = 'com.github.freeclimbapi'
-version = '5.1.0'
+version = '5.1.1'
 
 buildscript {
     repositories {

build.sbt

@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.github.freeclimbapi",
     name := "freeclimb-java-client",
-    version := "5.1.0",
+    version := "5.1.1",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),

openapi.json

@@ -1379,27 +1379,33 @@
           },
           "voiceUrl": {
             "type": "string",
-            "description": "The URL that FreeClimb will request when an inbound call arrives on a phone number assigned to this application. Used only for inbound calls."
+            "description": "The URL that FreeClimb will request when an inbound call arrives on a phone number assigned to this application. Used only for inbound calls.",
+            "nullable": true
           },
           "voiceFallbackUrl": {
             "type": "string",
-            "description": "The URL that FreeClimb will request if it times out waiting for a response from the voiceUrl. Used for inbound calls only. Note: A PerCL response is expected to control the inbound call."
+            "description": "The URL that FreeClimb will request if it times out waiting for a response from the voiceUrl. Used for inbound calls only. Note: A PerCL response is expected to control the inbound call.",
+            "nullable": true
           },
           "callConnectUrl": {
             "type": "string",
-            "description": "The URL that FreeClimb will request when an outbound call request is complete. Used for outbound calls only.  Note: A PerCL response is expected if the outbound call is connected (status=InProgress) to control the call."
+            "description": "The URL that FreeClimb will request when an outbound call request is complete. Used for outbound calls only.  Note: A PerCL response is expected if the outbound call is connected (status=InProgress) to control the call.",
+            "nullable": true
           },
           "statusCallbackUrl": {
             "type": "string",
-            "description": "The URL that FreeClimb will request to pass call status (such as call ended) to the application.  Note: This is a notification only; any PerCL returned will be ignored."
+            "description": "The URL that FreeClimb will request to pass call status (such as call ended) to the application.  Note: This is a notification only; any PerCL returned will be ignored.",
+            "nullable": true
           },
           "smsUrl": {
             "type": "string",
-            "description": "The URL that FreeClimb will request when a phone number assigned to this application receives an incoming SMS message. Used for inbound SMS only.  Note: Any PerCL returned will be ignored."
+            "description": "The URL that FreeClimb will request when a phone number assigned to this application receives an incoming SMS message. Used for inbound SMS only.  Note: Any PerCL returned will be ignored.",
+            "nullable": true
           },
           "smsFallbackUrl": {
             "type": "string",
-            "description": "The URL that FreeClimb will request if it times out waiting for a response from the smsUrl. Used for inbound SMS only.  Note: Any PerCL returned will be ignored."
+            "description": "The URL that FreeClimb will request if it times out waiting for a response from the smsUrl. Used for inbound SMS only.  Note: Any PerCL returned will be ignored.",
+            "nullable": true
           }
         }
       },

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>freeclimb-java-client</artifactId>
     <packaging>jar</packaging>
     <name>freeclimb-java-client</name>
-    <version>5.1.0</version>
+    <version>5.1.1</version>
     <url>https://github.com/freeclimbapi/java-sdk</url>
     <description>FreeClimb Java Client</description>
     <scm>

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.1.0/java");
+        setUserAgent("OpenAPI-Generator/5.1.1/java");
 
         authentications = new HashMap<String, Authentication>();
     }

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

@@ -249,11 +249,22 @@ public boolean equals(Object o) {
         Objects.equals(this.smsFallbackUrl, applicationRequest.smsFallbackUrl);
   }
 
+  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
+    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
+  }
+
   @Override
   public int hashCode() {
     return Objects.hash(alias, voiceUrl, voiceFallbackUrl, callConnectUrl, statusCallbackUrl, smsUrl, smsFallbackUrl);
   }
 
+  private static <T> int hashCodeNullable(JsonNullable<T> a) {
+    if (a == null) {
+      return 1;
+    }
+    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
+  }
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();