diff --git a/.gitignore b/.gitignore index 261a3274..10fae6f1 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ target .gradle build -api/openapi.yaml \ No newline at end of file +api/openapi.yaml +node_modules \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 267f709e..a8cece52 100644 --- 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 + + +## [6.1.2] - 2025-02-18 + +### Changed + +- Make statusCallbackURL property mandatory for CreateConference + ## [6.1.1] - 2025-02-05 diff --git a/README.md b/README.md index 089056e9..693fc335 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Add this dependency to your project's POM: com.github.freeclimbapi freeclimb-java-client - 6.1.1 + 6.1.2 compile ``` @@ -56,7 +56,7 @@ Add this dependency to your project's build file: } dependencies { - implementation "com.github.freeclimbapi:freeclimb-java-client:6.1.1" + implementation "com.github.freeclimbapi:freeclimb-java-client:6.1.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-6.1.1.jar` +* `target/freeclimb-java-client-6.1.2.jar` * `target/lib/*.jar` ## Getting Started diff --git a/build.gradle b/build.gradle index afe949a5..70500cd8 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'java' apply plugin: 'com.diffplug.spotless' group = 'com.github.freeclimbapi' -version = '6.1.1' +version = '6.1.2' buildscript { repositories { @@ -119,7 +119,7 @@ dependencies { implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation 'junit:junit:4.13.2' testImplementation 'org.mockito:mockito-core:3.12.4' - implementation 'org.json:json:20171018' + implementation 'org.json:json:20231013' } javadoc { diff --git a/build.sbt b/build.sbt index a724b481..b4ec2543 100644 --- 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 := "6.1.1", + version := "6.1.2", scalaVersion := "2.11.4", scalacOptions ++= Seq("-feature"), javacOptions in compile ++= Seq("-Xlint:deprecation"), diff --git a/docs/CreateConferenceRequest.md b/docs/CreateConferenceRequest.md index 9b35428d..8beb2b59 100644 --- a/docs/CreateConferenceRequest.md +++ b/docs/CreateConferenceRequest.md @@ -11,7 +11,7 @@ Name | Type | Description | Notes **playBeep** | **PlayBeep** | | [optional] **record** | **Boolean** | Setting to `true` records the entire Conference. | [optional] **waitUrl** | **URI** | If specified, a URL for the audio file that provides custom hold music for the Conference when it is in the populated state. Otherwise, FreeClimb uses a system default audio file. This is always fetched using HTTP GET and is fetched just once — when the Conference is created. | [optional] -**statusCallbackUrl** | **URI** | This URL is invoked when the status of the Conference changes. For more information, see **statusCallbackUrl** (below). | [optional] +**statusCallbackUrl** | **URI** | This URL is invoked when the status of the Conference changes. For more information, see **statusCallbackUrl** (below). | diff --git a/openapi.json b/openapi.json index 0302013f..e8f5da9d 100644 --- a/openapi.json +++ b/openapi.json @@ -3658,6 +3658,9 @@ }, "CreateConferenceRequest": { "type": "object", + "required": [ + "statusCallbackUrl" + ], "properties": { "alias": { "type": "string", diff --git a/package.json b/package.json index c6f6aac1..f06550a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "dependencies": { - "@stoplight/prism-cli": "5.6.0" + "@stoplight/prism-cli": "5.6.0", + "jsonpath-plus": "^10.3.0" }, "resolutions": { "@stoplight/json": "3.20.0", diff --git a/pom.xml b/pom.xml index fe4291fa..d9ace901 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ freeclimb-java-client jar freeclimb-java-client - 6.1.1 + 6.1.2 https://github.com/freeclimbapi/java-sdk FreeClimb Java Client diff --git a/src/main/java/com/github/freeclimbapi/ApiClient.java b/src/main/java/com/github/freeclimbapi/ApiClient.java index dbf25770..00f8266c 100644 --- a/src/main/java/com/github/freeclimbapi/ApiClient.java +++ b/src/main/java/com/github/freeclimbapi/ApiClient.java @@ -121,7 +121,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/6.1.1/java"); + setUserAgent("OpenAPI-Generator/6.1.2/java"); authentications = new HashMap(); } diff --git a/src/main/java/com/github/freeclimbapi/models/CreateConferenceRequest.java b/src/main/java/com/github/freeclimbapi/models/CreateConferenceRequest.java index c9944592..0c345823 100644 --- a/src/main/java/com/github/freeclimbapi/models/CreateConferenceRequest.java +++ b/src/main/java/com/github/freeclimbapi/models/CreateConferenceRequest.java @@ -159,8 +159,9 @@ public CreateConferenceRequest statusCallbackUrl(URI statusCallbackUrl) { * * @return statusCallbackUrl */ - @javax.annotation.Nullable + @javax.annotation.Nonnull @ApiModelProperty( + required = true, value = "This URL is invoked when the status of the Conference changes. For more" + " information, see **statusCallbackUrl** (below).") diff --git a/yarn.lock b/yarn.lock index b8d243ad..962ed376 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,11 +22,21 @@ resolved "https://registry.yarnpkg.com/@jsep-plugin/assignment/-/assignment-1.2.1.tgz#07277bdd7862451a865d391e2142efba33f46c9b" integrity sha512-gaHqbubTi29aZpVbBlECRpmdia+L5/lh2BwtIJTmtxdbecEyyX/ejAOg7eQDGNvGOUmPY7Z2Yxdy9ioyH/VJeA== +"@jsep-plugin/assignment@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@jsep-plugin/assignment/-/assignment-1.3.0.tgz#fcfc5417a04933f7ceee786e8ab498aa3ce2b242" + integrity sha512-VVgV+CXrhbMI3aSusQyclHkenWSAm95WaiKrMxRFam3JSUiIaQjoMIw2sEs/OX4XifnqeQUN4DYbJjlA8EfktQ== + "@jsep-plugin/regex@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@jsep-plugin/regex/-/regex-1.0.3.tgz#3aeaa2e5fa45d89de116aeafbfa41c95935b7f6d" integrity sha512-XfZgry4DwEZvSFtS/6Y+R48D7qJYJK6R9/yJFyUFHCIUMEEHuJ4X95TDgJp5QkmzfLYvapMPzskV5HpIDrREug== +"@jsep-plugin/regex@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@jsep-plugin/regex/-/regex-1.0.4.tgz#cb2fc423220fa71c609323b9ba7f7d344a755fcc" + integrity sha512-q7qL4Mgjs1vByCaTnDFcBnV9HS7GVPJX5vyVoCgZHNSC9rjwIlmbXG5sUuorR5ndfHAIlJ8pVStxvjXHbNvtUg== + "@stoplight/http-spec@^7.0.2", "@stoplight/http-spec@^7.0.3": version "7.1.0" resolved "https://registry.yarnpkg.com/@stoplight/http-spec/-/http-spec-7.1.0.tgz#516fec5f4b08cc93dadfb4969a6f9616165b0553" @@ -721,6 +731,11 @@ jsep@^1.3.9: resolved "https://registry.yarnpkg.com/jsep/-/jsep-1.3.9.tgz#8ce42df80ee9c1b39e52d0dd062a465342f35440" integrity sha512-i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw== +jsep@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/jsep/-/jsep-1.4.0.tgz#19feccbfa51d8a79f72480b4b8e40ce2e17152f0" + integrity sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw== + json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -783,6 +798,15 @@ jsonpath-plus@^10.0.0, jsonpath-plus@^7.2.0: "@jsep-plugin/regex" "^1.0.3" jsep "^1.3.9" +jsonpath-plus@^10.3.0: + version "10.3.0" + resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-10.3.0.tgz#59e22e4fa2298c68dfcd70659bb47f0cad525238" + integrity sha512-8TNmfeTCk2Le33A3vRRwtuworG/L5RrgMvdjhKZxvyShO+mBu2fP50OWUjRLNtvw344DdDarFh9buFAZs5ujeA== + dependencies: + "@jsep-plugin/assignment" "^1.3.0" + "@jsep-plugin/regex" "^1.0.4" + jsep "^1.4.0" + liquid-json@0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/liquid-json/-/liquid-json-0.3.1.tgz#9155a18136d8a6b2615e5f16f9a2448ab6b50eea"