fix anyof and remove need for any local patching of java files

Author: James Robertson

.openapi-generator/FILES

@@ -600,16 +600,14 @@ src/main/java/org/openapitools/client/model/ViewSecondaryApiTokenByTokenResponse
 src/main/java/org/openapitools/client/model/ViewTotalNumberOfMessagesInChannelResponse.java
 src/main/java/org/openapitools/client/model/ViewUserMetadataResponse.java
 src/main/java/org/openapitools/client/model/ViewWhoOwnsRegistrationOrDeviceTokenByTokenResponseInner.java
-src/main/java/org/sendbird/client/ApiCallback.java
 src/main/java/org/sendbird/client/ApiClient.java
 src/main/java/org/sendbird/client/ApiException.java
 src/main/java/org/sendbird/client/ApiResponse.java
 src/main/java/org/sendbird/client/Configuration.java
-src/main/java/org/sendbird/client/GzipRequestInterceptor.java
 src/main/java/org/sendbird/client/JSON.java
+src/main/java/org/sendbird/client/JavaTimeFormatter.java
 src/main/java/org/sendbird/client/Pair.java
-src/main/java/org/sendbird/client/ProgressRequestBody.java
-src/main/java/org/sendbird/client/ProgressResponseBody.java
+src/main/java/org/sendbird/client/RFC3339DateFormat.java
 src/main/java/org/sendbird/client/ServerConfiguration.java
 src/main/java/org/sendbird/client/ServerVariable.java
 src/main/java/org/sendbird/client/StringUtil.java

README.md

@@ -91,14 +91,14 @@ Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) f
 
 ### Maven users
 
-Add this dependency to your project's POM:
+Add these dependency to your project's POM:
 
 ```xml
 <dependencies>
     <dependency>
         <groupId>org.sendbird</groupId>
         <artifactId>sendbird-platform-sdk</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.9</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.8"
+    implementation "org.sendbird:sendbird-platform-sdk:1.0.9"
 }
 
 allprojects {

api/openapi.yaml

@@ -10475,6 +10475,7 @@ components:
           type: boolean
       type: object
     SendBird.Member:
+      additionalProperties: true
       example:
         metadata: "{}"
         is_active: true
@@ -16829,6 +16830,7 @@ components:
           type: string
       type: object
     reportMessageByIdResponse:
+      additionalProperties: true
       example:
         reported_message:
           data: data

build.gradle

@@ -1,10 +1,9 @@
 apply plugin: 'idea'
 apply plugin: 'eclipse'
-apply plugin: 'java'
 apply plugin: 'com.diffplug.spotless'
 
 group = 'org.sendbird'
-version = '1.0.8'
+version = '1.0.9'
 
 buildscript {
     repositories {
@@ -20,9 +19,6 @@ buildscript {
 repositories {
     mavenCentral()
 }
-sourceSets {
-    main.java.srcDirs = ['src/main/java']
-}
 
 if(hasProperty('target') && target == 'android') {
 
@@ -82,14 +78,14 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven-publish'
-
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 
     publishing {
         publications {
             maven(MavenPublication) {
                artifactId = 'sendbird-platform-sdk'
+
                from components.java
             }
         }
@@ -102,23 +98,35 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
+    swagger_annotations_version = "1.6.5"
+    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"
+    junit_version = "5.8.2"
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.5'
+    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
-    implementation 'io.gsonfire:gson-fire:1.8.5'
-    implementation 'javax.ws.rs:jsr311-api:1.1.1'
-    implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.2'
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
+    implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
+    implementation "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
+    implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
+    implementation "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version"
+    implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
+    implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
-    testImplementation 'org.mockito:mockito-core:3.12.4'
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+}
+
+test {
+    useJUnitPlatform()
 }
 
 javadoc {
@@ -135,18 +143,15 @@ spotless {
     format 'misc', {
         // define the files (e.g. '*.gradle', '*.md') to apply `misc` to
         target '.gitignore'
-
         // define the steps to apply to those files
         trimTrailingWhitespace()
         indentWithSpaces() // Takes an integer argument if you don't like 4
         endWithNewline()
     }
     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()
-
         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.8",
+    version := "1.0.9",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
-    javacOptions in compile ++= Seq("-Xlint:deprecation"),
-    publishArtifact in (Compile, packageDoc) := false,
+    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",
-      "com.squareup.okhttp3" % "okhttp" % "4.9.3",
-      "com.squareup.okhttp3" % "logging-interceptor" % "4.9.3",
-      "com.google.code.gson" % "gson" % "2.9.0",
-      "org.apache.commons" % "commons-lang3" % "3.12.0",
-      "javax.ws.rs" % "jsr311-api" % "1.1.1",
-      "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
-      "org.openapitools" % "jackson-databind-nullable" % "0.2.2",
-      "io.gsonfire" % "gson-fire" % "1.8.5" % "compile",
+      "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",
+      "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",
-      "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
-      "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.8.2" % "test",
-      "com.novocode" % "junit-interface" % "0.10" % "test"
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.8.2" % "test"
     )
   )