refactor! Prepare v2.0.0 based on Java SDK v9.0.0 (#33)

* ci: Bump GH Action digest hashes

* refactor!: Update based on Java SDK 9.0.0

* chore(deps): Bump Maven Surefire plugin

* chore(deps): Bump JaCoCo version

* ci: Post release notification to Slack

* chore: Fix security policy mail link

Author: SMadani

.github/dependabot.yml

@@ -5,6 +5,6 @@ updates:
   - package-ecosystem: "maven"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     commit-message:
       prefix: "build"

.github/workflows/build.yml

@@ -21,9 +21,9 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - name: Checkout the repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
       - name: Setup Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@3b6c050358614dd082e53cdbc55580431fc4e437
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
@@ -44,9 +44,9 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - name: Checkout the repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
       - name: Setup Java
-        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
+        uses: actions/setup-java@3b6c050358614dd082e53cdbc55580431fc4e437
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}

.github/workflows/codeql.yml

@@ -37,11 +37,11 @@ jobs:
           build-mode: autobuild
     steps:
     - name: Checkout repository
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a
+      uses: github/codeql-action/init@486ab5a2922b634015408a83e10f6867efb5922c
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -51,6 +51,6 @@ jobs:
         # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a
+      uses: github/codeql-action/analyze@486ab5a2922b634015408a83e10f6867efb5922c
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: Publish to Central
+name: Publish to Maven Central
 on:
   release:
     types: [published]
@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
         with:
           ref: ${{ github.event.release.target_commitish }}
       - name: Setup Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@3b6c050358614dd082e53cdbc55580431fc4e437
         with:
           java-version: 21
           distribution: 'temurin'
@@ -33,3 +33,32 @@ jobs:
           MAVEN_PASSWORD: ${{ secrets.OSS_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSWORD }}
         run: mvn -e --no-transfer-progress --batch-mode deploy -P release-sign-artifacts
+  notify-release:
+    runs-on: ubuntu-latest
+    name: Notify Release
+    strategy:
+      matrix:
+        url: [SLACK_WEBHOOK_ASK_DEVREL_URL, SLACK_WEBHOOK_DEVREL_TOOLING_URL, SLACK_WEBHOOK_DEVREL_PRIVATE_URL]
+    steps:
+      - name: Send to Slack channels
+        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d
+        with:
+          webhook: ${{ secrets[matrix.url] }}
+          webhook-type: incoming-webhook
+          errors: true
+          payload: |
+            blocks:
+              - type: "header"
+                text:
+                  type: "plain_text"
+                  text: ":initial_external_notification_sent: Kotlin Server SDK ${{ github.event.release.name }} has been released."
+              - type: "section"
+                text:
+                  type: "mrkdwn"
+                  text: "${{ github.event.release.body }}"
+                  emoji: true
+              - type: "divider"
+              - type: "section"
+                text:
+                  type: "mrkdwn"
+                  text: "View the full change log <${{ github.event.release.html_url }}|here>."

.github/workflows/scorecard.yml

@@ -32,12 +32,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46
+        uses: ossf/scorecard-action@5e6e801bdc1342ad294f36b91afd06af2e4a0f3b
         with:
           results_file: results.sarif
           results_format: sarif
@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
+        uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47
         with:
           name: SARIF file
           path: results.sarif
@@ -68,6 +68,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@86b04fb0e47484f7282357688f21d5d0e32175fe
+        uses: github/codeql-action/upload-sarif@486ab5a2922b634015408a83e10f6867efb5922c
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.0] - 2025-04-08
+Major release for compatibility with [Java SDK v9.0.0](https://github.com/Vonage/vonage-java-sdk/releases/tag/v9.0.0)
+
+### Changed
+- Bumped Java SDK version to 9.0.0 (see Java SDK changelog for details of breaking changes)
+  - Moved most enums from inner classes
+  - Stronger typing for response fields
+  - Removed deprecated methods, constructors, classes, fields, packages etc.
+  - Internal refactoring
+- Refactored `Archive.setLayout` and `Broadcast.setLayout` parameters to take `StreamCompositionLayout` directly
+
+### Removed
+- `Verify.whatsappCodeless` workflow
+- Pricing API
+- `dateStart` and `dateEnd` methods in `CallsFilter` (as previously deprecated)
+- `realTimeData` in `NumberInsight.advanced` (as previously deprecated)
+
 ## [1.2.1] - 2025-03-19
 
 ### Changed

README.md

@@ -53,7 +53,7 @@ See all of our SDKs and integrations on the [Vonage Developer portal](https://de
 ## Installation
 Releases are published to [Maven Central](https://central.sonatype.com/artifact/com.vonage/server-sdk-kotlin).
 Instructions for your build system can be found in the snippets section.
-They're also available from [here](https://search.maven.org/artifact/com.vonage/server-sdk-kotlin/1.2.1/jar).
+They're also available from [here](https://search.maven.org/artifact/com.vonage/server-sdk-kotlin/2.0.0/jar).
 Release notes for each version can be found in the [changelog](CHANGELOG.md).
 
 Here are the instructions for including the SDK in your project:
@@ -63,7 +63,7 @@ Add the following to your `build.gradle` or `build.gradle.kts` file:
 
 ```groovy
 dependencies {
-    implementation("com.vonage:server-sdk-kotlin:1.2.1")
+    implementation("com.vonage:server-sdk-kotlin:2.0.0")
 }
 ```
 
@@ -74,7 +74,7 @@ Add the following to the `<dependencies>` section of your `pom.xml` file:
 <dependency>
     <groupId>com.vonage</groupId>
     <artifactId>server-sdk-kotlin</artifactId>
-    <version>1.2.1</version>
+    <version>2.0.0</version>
 </dependency>
 ```
 
@@ -160,8 +160,8 @@ including [**a searchable list of snippets**](https://github.com/Vonage/vonage-k
 
 The SDK is fully documented with [KDocs](https://kotlinlang.org/docs/kotlin-doc.html), so you should have complete
 documentation from your IDE. You may need to click "Download Sources" in IntelliJ to get the full documentation.
-Alternatively, you can browse the documentation  using a service like [Javadoc.io](https://javadoc.io/doc/com.vonage/server-sdk-kotlin/1.2.1/index.html),
-which renders the documentation for you from [the artifacts on Maven Central](https://repo.maven.apache.org/maven2/com/vonage/server-sdk-kotlin/1.2.1/).
+Alternatively, you can browse the documentation  using a service like [Javadoc.io](https://javadoc.io/doc/com.vonage/server-sdk-kotlin/2.0.0/index.html),
+which renders the documentation for you from [the artifacts on Maven Central](https://repo.maven.apache.org/maven2/com/vonage/server-sdk-kotlin/2.0.0/).
 
 For help with any specific APIs, refer to the relevant documentation on our [developer portal](https://developer.vonage.com/en/documentation),
 using the links provided in the [Supported APIs](#supported-apis) section. For completeness, you can also consult the

SECURITY.md

@@ -8,6 +8,6 @@ a planned release, to allow time for the fix to be included in the next release.
 
 ## Reporting a Vulnerability
 To report a security concern, use the "[Report a Vulnerability](https://github.com/Vonage/vonage-kotlin-sdk/security/advisories/new)" tab.
-You can also contact the Developer Relations team directly via [email](devrel@vonage.com) for more private disclosure.
+You can also contact the Developer Relations team directly via [email](mailto:devrel@vonage.com) for more private disclosure.
 You can also [raise an Issue](https://github.com/Vonage/vonage-kotlin-sdk/issues/new/choose) and/or create a [Pull Request](https://github.com/Vonage/vonage-kotlin-sdk/pulls) from your fork of the repo.
 Please include as much detail as possible, an indication of severity and, ideally, a minimal reproducible example to demonstrate the issue if possible.

bumpversion.sh

@@ -4,7 +4,7 @@ then
   exit 1
 fi
 
-mvn versions:set -DnewVersion=$1
+mvn versions:set -DnewVersion="$1"
 mvn validate
 rm pom.xml.versionsBackup #pom.xml.releaseBackup
 #mvn versions:display-plugin-updates

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.vonage</groupId>
   <artifactId>server-sdk-kotlin</artifactId>
-  <version>1.2.1</version>
+  <version>2.0.0</version>
 
   <name>Vonage Kotlin Server SDK</name>
   <description>Kotlin client for Vonage APIs</description>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>com.vonage</groupId>
       <artifactId>server-sdk</artifactId>
-      <version>8.20.1</version>
+      <version>9.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
@@ -156,12 +156,12 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.5.2</version>
+        <version>3.5.3</version>
       </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.12</version>
+        <version>0.8.13</version>
         <executions>
           <execution>
             <id>jacoco-init</id>

src/main/kotlin/com/vonage/client/kt/Account.kt

@@ -86,7 +86,7 @@ class Account internal constructor(private val client: AccountClient) {
         fun list(): List<SecretResponse> = (
                 if (apiKey == null) client.listSecrets()
                 else client.listSecrets(apiKey)
-            ).secrets
+        )
 
         /**
          * Creates a new secret for the account.

src/main/kotlin/com/vonage/client/kt/Application.kt

@@ -21,7 +21,6 @@ import com.vonage.client.application.capabilities.*
 import com.vonage.client.application.capabilities.Messages
 import com.vonage.client.application.capabilities.Verify
 import com.vonage.client.application.capabilities.Voice
-import com.vonage.client.common.Webhook
 import java.util.*
 
 /**
@@ -108,8 +107,8 @@ class Application internal constructor(private val client: ApplicationClient) {
      */
     fun list(page: Int? = null, pageSize: Int? = null): List<Application> {
         val filter = ListApplicationRequest.builder()
-        if (page != null) filter.page(page.toLong())
-        if (pageSize != null) filter.pageSize(pageSize.toLong())
+        if (page != null) filter.page(page)
+        if (pageSize != null) filter.pageSize(pageSize)
         return client.listApplications(filter.build()).applications
     }
 
@@ -147,7 +146,7 @@ fun Webhook.Builder.url(url: String): Webhook.Builder = address(url)
  * @return The Voice capability builder.
  */
 fun Voice.Builder.answer(properties: Webhook.Builder.() -> Unit): Voice.Builder =
-    addWebhook(Webhook.Type.ANSWER, webhookBuilder(properties))
+    answer(webhookBuilder(properties))
 
 /**
  * Adds an `fallback_answer_url` webhook to the [Voice] capability.
@@ -157,7 +156,7 @@ fun Voice.Builder.answer(properties: Webhook.Builder.() -> Unit): Voice.Builder
  * @return The Voice capability builder.
  */
 fun Voice.Builder.fallbackAnswer(properties: Webhook.Builder.() -> Unit): Voice.Builder =
-    addWebhook(Webhook.Type.FALLBACK_ANSWER, webhookBuilder(properties))
+    fallbackAnswer(webhookBuilder(properties))
 
 /**
  * Adds an `event_url` webhook to the [Voice] capability.
@@ -167,7 +166,7 @@ fun Voice.Builder.fallbackAnswer(properties: Webhook.Builder.() -> Unit): Voice.
  * @return The Voice capability builder.
  */
 fun Voice.Builder.event(properties: Webhook.Builder.() -> Unit): Voice.Builder =
-    addWebhook(Webhook.Type.EVENT, webhookBuilder(properties))
+    event(webhookBuilder(properties))
 
 /**
  * Adds an `event_url` webhook to the [Rtc] capability.
@@ -177,7 +176,7 @@ fun Voice.Builder.event(properties: Webhook.Builder.() -> Unit): Voice.Builder =
  * @return The RTC capability builder.
  */
 fun Rtc.Builder.event(properties: Webhook.Builder.() -> Unit): Rtc.Builder =
-    addWebhook(Webhook.Type.EVENT, webhookBuilder(properties))
+    event(webhookBuilder(properties))
 
 /**
  * Adds a `status_url` webhook to the [Verify] capability.
@@ -187,7 +186,7 @@ fun Rtc.Builder.event(properties: Webhook.Builder.() -> Unit): Rtc.Builder =
  * @return The Verify capability builder.
  */
 fun Verify.Builder.status(properties: Webhook.Builder.() -> Unit): Verify.Builder =
-    addWebhook(Webhook.Type.STATUS, webhookBuilder(properties))
+    status(webhookBuilder(properties))
 
 /**
  * Adds an `inbound_url` webhook to the [Messages] capability.
@@ -197,7 +196,7 @@ fun Verify.Builder.status(properties: Webhook.Builder.() -> Unit): Verify.Builde
  * @return The Messages capability builder.
  */
 fun Messages.Builder.inbound(properties: Webhook.Builder.() -> Unit): Messages.Builder =
-    addWebhook(Webhook.Type.INBOUND, webhookBuilder(properties))
+    inbound(webhookBuilder(properties))
 
 /**
  * Adds an `status_url` webhook to the [Messages] capability.
@@ -207,7 +206,7 @@ fun Messages.Builder.inbound(properties: Webhook.Builder.() -> Unit): Messages.B
  * @return The Messages capability builder.
  */
 fun Messages.Builder.status(properties: Webhook.Builder.() -> Unit): Messages.Builder =
-    addWebhook(Webhook.Type.STATUS, webhookBuilder(properties))
+    status(webhookBuilder(properties))
 
 /**
  * Adds the [Voice] capability to the application.

src/main/kotlin/com/vonage/client/kt/Conversion.kt

@@ -26,8 +26,7 @@ import java.util.*
  */
 class Conversion internal constructor(private val client: ConversionClient) {
 
-    private fun convert(type: ConversionRequest.Type,
-                        messageId: String, delivered: Boolean, timestamp: Instant?): Unit =
+    private fun convert(type: Type, messageId: String, delivered: Boolean, timestamp: Instant?): Unit =
         client.submitConversion(type, messageId, delivered,
             if (timestamp != null) Date.from(timestamp) else null
         )
@@ -40,7 +39,7 @@ class Conversion internal constructor(private val client: ConversionClient) {
      * @param timestamp (OPTIONAL) Timestamp of the conversion.
      */
     fun convertSms(messageId: String, delivered: Boolean, timestamp: Instant? = null): Unit =
-        convert(ConversionRequest.Type.SMS, messageId, delivered, timestamp)
+        convert(Type.SMS, messageId, delivered, timestamp)
 
     /**
      * Submit conversion for a voice call.
@@ -50,5 +49,5 @@ class Conversion internal constructor(private val client: ConversionClient) {
      * @param timestamp (OPTIONAL) Timestamp of the conversion.
      */
     fun convertVoice(callId: String, delivered: Boolean, timestamp: Instant? = null): Unit =
-        convert(ConversionRequest.Type.VOICE, callId, delivered, timestamp)
+        convert(Type.VOICE, callId, delivered, timestamp)
 }