Java 17 + Jakarta EE 10 migration (Spring Boot 3 support)

README.md

@@ -98,7 +98,7 @@ Add these dependency to your project's POM:
     <dependency>
         <groupId>org.sendbird</groupId>
         <artifactId>sendbird-platform-sdk</artifactId>
-        <version>1.0.20</version>
+        <version>1.1.0</version>
     </dependency>
 </dependencies>
 ```
@@ -110,7 +110,7 @@ Add this dependency to your project's build file:
 ```groovy
 
 dependencies {
-    implementation "org.sendbird:sendbird-platform-sdk:1.0.20"
+    implementation "org.sendbird:sendbird-platform-sdk:1.1.0"
 }
 
 allprojects {

build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'eclipse'
 apply plugin: 'com.diffplug.spotless'
 
 group = 'org.sendbird'
-version = '1.0.20'
+version = '1.1.0'
 
 buildscript {
     repositories {
@@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven-publish'
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 
     publishing {
         publications {
@@ -102,8 +102,8 @@ ext {
     jackson_version = "2.13.2"
     jackson_databind_version = "2.13.2.2"
     jackson_databind_nullable_version = "0.2.2"
-    jakarta_annotation_version = "1.3.5"
-    jersey_version = "2.35"
+    jakarta_annotation_version = "2.1.1"
+    jersey_version = "3.1.5"
     junit_version = "5.8.2"
 }
 
@@ -151,7 +151,7 @@ spotless {
     java {
         // don't need to set target, it is inferred from java
         // apply a specific flavor of google-java-format
-        googleJavaFormat('1.8').aosp().reflowLongStrings()
+        googleJavaFormat('17').aosp().reflowLongStrings()
         removeUnusedImports()
         importOrder()
     }

build.sbt

@@ -2,26 +2,26 @@ lazy val root = (project in file(".")).
   settings(
     organization := "org.sendbird",
     name := "sendbird-platform-sdk",
-    version := "1.0.20",
-    scalaVersion := "2.11.4",
+    version := "1.1.0",
+    scalaVersion := "2.13.6",
     scalacOptions ++= Seq("-feature"),
     Compile / javacOptions ++= Seq("-Xlint:deprecation"),
     Compile / packageDoc / publishArtifact := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       "com.google.code.findbugs" % "jsr305" % "3.0.0",
       "io.swagger" % "swagger-annotations" % "1.6.5",
-      "org.glassfish.jersey.core" % "jersey-client" % "2.35",
-      "org.glassfish.jersey.inject" % "jersey-hk2" % "2.35",
-      "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.35",
-      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.35",
-      "org.glassfish.jersey.connectors" % "jersey-apache-connector" % "2.35",
+      "org.glassfish.jersey.core" % "jersey-client" % "3.1.5",
+      "org.glassfish.jersey.inject" % "jersey-hk2" % "3.1.5",
+      "org.glassfish.jersey.media" % "jersey-media-multipart" % "3.1.5",
+      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "3.1.5",
+      "org.glassfish.jersey.connectors" % "jersey-apache-connector" % "3.1.5",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.13.2" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.2" % "compile",
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.2.2" % "compile",
       "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.13.2" % "compile",
       "org.openapitools" % "jackson-databind-nullable" % "0.2.2" % "compile",
-      "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
+      "jakarta.annotation" % "jakarta.annotation-api" % "2.1.1" % "compile",
       "org.junit.jupiter" % "junit-jupiter-api" % "5.8.2" % "test"
     )
   )

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>sendbird-platform-sdk</artifactId>
     <packaging>jar</packaging>
     <name>sendbird-platform-sdk</name>
-    <version>1.0.20</version>
+    <version>1.1.0</version>
     <url>https://github.com/sendbird/sendbird-platform-sdk-java</url>
     <description>Sendbird Platform API SDK</description>
     <scm>
@@ -135,8 +135,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                     <fork>true</fork>
                     <meminitial>128m</meminitial>
                     <maxmem>512m</maxmem>
@@ -160,7 +160,7 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
-                    <source>1.8</source>
+                    <source>17</source>
                     <tags>
                         <tag>
                             <name>http.response.details</name>
@@ -214,7 +214,7 @@
 
                   <!-- apply a specific flavor of google-java-format and reflow long strings -->
                   <googleJavaFormat>
-                    <version>1.8</version>
+                    <version>17</version>
                     <style>AOSP</style>
                     <reflowLongStrings>true</reflowLongStrings>
                   </googleJavaFormat>
@@ -334,11 +334,11 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>1.6.5</swagger-annotations-version>
-        <jersey-version>2.35</jersey-version>
+        <jersey-version>3.1.5</jersey-version>
         <jackson-version>2.13.2</jackson-version>
         <jackson-databind-version>2.13.2.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.2</jackson-databind-nullable-version>
-        <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
         <junit-version>5.8.2</junit-version>
         <spotless.version>2.21.0</spotless.version>
     </properties>

src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java

@@ -17,14 +17,14 @@
 import java.util.Objects;
 import java.lang.reflect.Type;
 import java.util.Map;
-import javax.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.GenericType;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-11-24T21:22:01.103596+09:00[Asia/Seoul]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-11-24T21:22:01.103596+09:00[Asia/Seoul]")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object

src/main/java/org/openapitools/client/model/AddApnsPushConfigurationData.java

@@ -43,7 +43,7 @@
   AddApnsPushConfigurationData.JSON_PROPERTY_APNS_TYPE
 })
 @JsonTypeName("addApnsPushConfigurationData")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-11-24T21:22:01.103596+09:00[Asia/Seoul]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-11-24T21:22:01.103596+09:00[Asia/Seoul]")
 public class AddApnsPushConfigurationData {
   public static final String JSON_PROPERTY_APNS_CERT = "apns_cert";
   private File apnsCert;
@@ -81,7 +81,7 @@ public AddApnsPushConfigurationData apnsCert(File apnsCert) {
    * In a form of the `multipart/form-data` content type, specifies a [.p12](/docs/chat/v3/ios/guides/push-notifications#2-step-3-export-a-p12-file-and-upload-to-sendbird-dashboard) file of which type is either development or production. Sendbird server scans the content of the file, finds out the certificate type, and then registers the file as the corresponding type. If you upload a wrong file, you will receive an error.
    * @return apnsCert
   **/
-  @javax.annotation.Nonnull
+  @jakarta.annotation.Nonnull
   @ApiModelProperty(required = true, value = "In a form of the `multipart/form-data` content type, specifies a [.p12](/docs/chat/v3/ios/guides/push-notifications#2-step-3-export-a-p12-file-and-upload-to-sendbird-dashboard) file of which type is either development or production. Sendbird server scans the content of the file, finds out the certificate type, and then registers the file as the corresponding type. If you upload a wrong file, you will receive an error.")
   @JsonProperty(JSON_PROPERTY_APNS_CERT)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -107,7 +107,7 @@ public AddApnsPushConfigurationData apnsCertEnvType(String apnsCertEnvType) {
    * Specifies the certificate type of the [.p12](/docs/chat/v3/ios/guides/push-notifications#2-step-3-export-a-p12-file-and-upload-to-sendbird-dashboard) file. Acceptable values are development and production. There is no need to specify this property when the apns_cert above is specified.
    * @return apnsCertEnvType
   **/
-  @javax.annotation.Nonnull
+  @jakarta.annotation.Nonnull
   @ApiModelProperty(required = true, value = "Specifies the certificate type of the [.p12](/docs/chat/v3/ios/guides/push-notifications#2-step-3-export-a-p12-file-and-upload-to-sendbird-dashboard) file. Acceptable values are development and production. There is no need to specify this property when the apns_cert above is specified.")
   @JsonProperty(JSON_PROPERTY_APNS_CERT_ENV_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -133,7 +133,7 @@ public AddApnsPushConfigurationData apnsCertPassword(String apnsCertPassword) {
    * Specifies the password of the cerfificate file which has been set during the [.p12](/docs/chat/v3/ios/guides/push-notifications#2-step-3-export-a-p12-file-and-upload-to-sendbird-dashboard) export.
    * @return apnsCertPassword
   **/
-  @javax.annotation.Nonnull
+  @jakarta.annotation.Nonnull
   @ApiModelProperty(required = true, value = "Specifies the password of the cerfificate file which has been set during the [.p12](/docs/chat/v3/ios/guides/push-notifications#2-step-3-export-a-p12-file-and-upload-to-sendbird-dashboard) export.")
   @JsonProperty(JSON_PROPERTY_APNS_CERT_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -159,7 +159,7 @@ public AddApnsPushConfigurationData hasUnreadCountBadge(Boolean hasUnreadCountBa
    * Determines whether to badge your client app's icon with the number of a user's unread messages. (Default: true)
    * @return hasUnreadCountBadge
   **/
-  @javax.annotation.Nonnull
+  @jakarta.annotation.Nonnull
   @ApiModelProperty(required = true, value = "Determines whether to badge your client app's icon with the number of a user's unread messages. (Default: true)")
   @JsonProperty(JSON_PROPERTY_HAS_UNREAD_COUNT_BADGE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -185,7 +185,7 @@ public AddApnsPushConfigurationData contentAvailable(Boolean contentAvailable) {
    * Determines for your client app whether to perform a silent background update on a user's device. For more information, see the Apple Developer Documentation's [Pushing Updates to Your App Silently](https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/pushing_updates_to_your_app_silently). (Default: false)
    * @return contentAvailable
   **/
-  @javax.annotation.Nonnull
+  @jakarta.annotation.Nonnull
   @ApiModelProperty(required = true, value = "Determines for your client app whether to perform a silent background update on a user's device. For more information, see the Apple Developer Documentation's [Pushing Updates to Your App Silently](https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/pushing_updates_to_your_app_silently). (Default: false)")
   @JsonProperty(JSON_PROPERTY_CONTENT_AVAILABLE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -211,7 +211,7 @@ public AddApnsPushConfigurationData mutableContent(Boolean mutableContent) {
    * Determines for your client app whether or not to modify the payload of a push notification before it is displayed on a user's device. For more information, see the Apple Developer Documentation's [Modifying Content in Newly Delivered Notifications](https://developer.apple.com/documentation/usernotifications/modifying_content_in_newly_delivered_notifications). (Default: false)
    * @return mutableContent
   **/
-  @javax.annotation.Nonnull
+  @jakarta.annotation.Nonnull
   @ApiModelProperty(required = true, value = "Determines for your client app whether or not to modify the payload of a push notification before it is displayed on a user's device. For more information, see the Apple Developer Documentation's [Modifying Content in Newly Delivered Notifications](https://developer.apple.com/documentation/usernotifications/modifying_content_in_newly_delivered_notifications). (Default: false)")
   @JsonProperty(JSON_PROPERTY_MUTABLE_CONTENT)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -237,7 +237,7 @@ public AddApnsPushConfigurationData pushSound(String pushSound) {
    * Specifies the name of a sound file to be played when a push notification is delivered to your client app. The file can be in the app's main bundle or in the `Library/Sounds` folder of the app's data container.
    * @return pushSound
   **/
-  @javax.annotation.Nonnull
+  @jakarta.annotation.Nonnull
   @ApiModelProperty(required = true, value = "Specifies the name of a sound file to be played when a push notification is delivered to your client app. The file can be in the app's main bundle or in the `Library/Sounds` folder of the app's data container.")
   @JsonProperty(JSON_PROPERTY_PUSH_SOUND)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -263,7 +263,7 @@ public AddApnsPushConfigurationData apnsType(String apnsType) {
    * (Deprecated)  Specifies the certificate type of the [.p12](/docs/chat/v3/ios/guides/push-notifications#2-step-3-export-a-p12-file-and-upload-to-sendbird-dashboard) file. Acceptable values are development and production. You should specify either this property or the apns_cert above to inform the server of which certificate type to update.
    * @return apnsType
   **/
-  @javax.annotation.Nonnull
+  @jakarta.annotation.Nonnull
   @ApiModelProperty(required = true, value = "(Deprecated)  Specifies the certificate type of the [.p12](/docs/chat/v3/ios/guides/push-notifications#2-step-3-export-a-p12-file-and-upload-to-sendbird-dashboard) file. Acceptable values are development and production. You should specify either this property or the apns_cert above to inform the server of which certificate type to update.")
   @JsonProperty(JSON_PROPERTY_APNS_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)

src/main/java/org/openapitools/client/model/AddApnsPushConfigurationResponse.java

@@ -38,7 +38,7 @@
   AddApnsPushConfigurationResponse.JSON_PROPERTY_PUSH_CONFIGURATIONS
 })
 @JsonTypeName("addApnsPushConfigurationResponse")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-11-24T21:22:01.103596+09:00[Asia/Seoul]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-11-24T21:22:01.103596+09:00[Asia/Seoul]")
 public class AddApnsPushConfigurationResponse {
   public static final String JSON_PROPERTY_PUSH_CONFIGURATIONS = "push_configurations";
   private List<AddApnsPushConfigurationResponsePushConfigurationsInner> pushConfigurations = null;
@@ -63,7 +63,7 @@ public AddApnsPushConfigurationResponse addPushConfigurationsItem(AddApnsPushCon
    * Get pushConfigurations
    * @return pushConfigurations
   **/
-  @javax.annotation.Nullable
+  @jakarta.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_PUSH_CONFIGURATIONS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)