Merge pull request #443 from gotify/openapi-gen

Update openapi gen

Author: jmattheis

README.md

@@ -62,11 +62,7 @@ $ ./gradlew build
 
 ## Update client
 
-* Run `./gradlew generateSwaggerCode`
-* Delete `client/settings.gradle` (client is a gradle sub project and must not have a settings.gradle)
-* Delete `repositories` block from `client/build.gradle`
-* Delete `implementation "com.sun.xml.ws:jaxws-rt:x.x.x“` from `client/build.gradle`
-* Insert missing bracket in `retryingIntercept` method of class `src/main/java/com/github/gotify/client/auth/OAuth`
+* Run `./gradlew openApiGenerate`
 * Commit changes
 
 ## Versioning

app/build.gradle.kts

@@ -13,7 +13,7 @@ android {
     compileSdk = 36
     defaultConfig {
         applicationId = "com.github.gotify"
-        minSdk = 23
+        minSdk = 26
         targetSdk = 36
         versionCode = 34
         versionName = "2.9.0"
@@ -101,7 +101,7 @@ dependencies {
 
     implementation("com.google.code.gson:gson:2.13.1")
     implementation("com.squareup.retrofit2:retrofit:3.0.0")
-    implementation("org.threeten:threetenbp:1.7.1")
+
 }
 
 configurations {

app/src/main/kotlin/com/github/gotify/Utils.kt

@@ -16,12 +16,12 @@ import java.net.MalformedURLException
 import java.net.URI
 import java.net.URISyntaxException
 import java.net.URL
+import java.time.OffsetDateTime
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import org.threeten.bp.OffsetDateTime
 import org.tinylog.kotlin.Logger
 
 internal object Utils {

app/src/main/kotlin/com/github/gotify/init/InitializationActivity.kt

@@ -138,7 +138,7 @@ internal class InitializationActivity : AppCompatActivity() {
     private fun authenticated(user: User) {
         Logger.info("Authenticated as ${user.name}")
 
-        settings.setUser(user.name, user.isAdmin)
+        settings.setUser(user.name, user.admin)
         requestVersion {
             splashScreenActive = false
             startActivity(Intent(this, MessagesActivity::class.java))

app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt

@@ -30,8 +30,8 @@ import com.github.gotify.databinding.MessageItemCompactBinding
 import com.github.gotify.messages.provider.MessageWithImage
 import io.noties.markwon.Markwon
 import java.text.DateFormat
+import java.time.OffsetDateTime
 import java.util.Date
-import org.threeten.bp.OffsetDateTime
 
 internal class ListMessageAdapter(
     private val context: Context,

app/src/main/kotlin/com/github/gotify/service/WebSocketService.kt

@@ -235,7 +235,7 @@ internal class WebSocketService : Service() {
         messages.forEach { message ->
             if (lastReceivedMessage.get() < message.id) {
                 lastReceivedMessage.set(message.id)
-                highestPriority = highestPriority.coerceAtLeast(message.priority)
+                highestPriority = highestPriority.coerceAtLeast(message.priority ?: 0L)
             }
             broadcast(message)
         }
@@ -256,9 +256,9 @@ internal class WebSocketService : Service() {
         broadcast(message)
         showNotification(
             message.id,
-            message.title,
+            message.title ?: "",
             message.message,
-            message.priority,
+            message.priority ?: 0L,
             message.extras,
             message.appid
         )

build.gradle.kts

@@ -1,11 +1,10 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
 import java.io.File
 import java.net.URI
 
 plugins {
     id("com.android.application") version "8.11.0" apply false
     id("org.jetbrains.kotlin.android") version "2.2.0" apply false
-    id("org.hidetake.swagger.generator") version "2.19.2"
+    id("org.openapi.generator") version "7.19.0"
 }
 
 fun download(url: String, filename: String) {
@@ -29,19 +28,23 @@ tasks.register("downloadSpec") {
     }
 }
 
-swaggerSources {
-    create("swagger") {
-        setInputFile(file("$projectDir/build/gotify.spec.json"))
-        code.apply {
-            language = "java"
-            configFile = file("$projectDir/swagger.config.json")
-            outputDir = file("$projectDir/client")
-        }
-    }
+openApiGenerate {
+    generatorName.set("java")
+    inputSpec.set("$projectDir/build/gotify.spec.json")
+    outputDir.set("$projectDir/client")
+    apiPackage.set("com.github.gotify.client.api")
+    modelPackage.set("com.github.gotify.client.model")
+    configOptions.set(mapOf(
+        "library" to "retrofit2",
+        "hideGenerationTimestamp" to "true",
+        "dateLibrary" to "java8"
+    ))
+    generateApiTests.set(false)
+    generateModelTests.set(false)
+    generateApiDocumentation.set(false)
+    generateModelDocumentation.set(false)
 }
 
-dependencies {
-    "swaggerCodegen"("io.swagger.codegen.v3:swagger-codegen-cli:3.0.63")
+tasks.named("openApiGenerate").configure {
+    dependsOn("downloadSpec")
 }
-
-tasks.named("generateSwaggerCode").dependsOn("downloadSpec")

client/.swagger-codegen-ignore client/.openapi-generator-ignoreclient/.swagger-codegen-ignore renamed to client/.openapi-generator-ignore

@@ -1,12 +1,22 @@
-# Swagger Codegen Ignore
-# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
 
 # Use this file to prevent files from being overwritten by the generator.
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
 #ApiClient.cs
+build.gradle
+build.sbt
+gradle/**
+gradlew
+gradlew.bat
+pom.xml
+settings.gradle
+.github/**
+.travis.yml
+api/openapi.yaml
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):
 #foo/*/qux

client/.openapi-generator/FILES

@@ -0,0 +1,37 @@
+.gitignore
+README.md
+git_push.sh
+gradle.properties
+src/main/AndroidManifest.xml
+src/main/java/com/github/gotify/client/ApiClient.java
+src/main/java/com/github/gotify/client/CollectionFormats.java
+src/main/java/com/github/gotify/client/JSON.java
+src/main/java/com/github/gotify/client/ServerConfiguration.java
+src/main/java/com/github/gotify/client/ServerVariable.java
+src/main/java/com/github/gotify/client/StringUtil.java
+src/main/java/com/github/gotify/client/api/ApplicationApi.java
+src/main/java/com/github/gotify/client/api/ClientApi.java
+src/main/java/com/github/gotify/client/api/HealthApi.java
+src/main/java/com/github/gotify/client/api/MessageApi.java
+src/main/java/com/github/gotify/client/api/PluginApi.java
+src/main/java/com/github/gotify/client/api/UserApi.java
+src/main/java/com/github/gotify/client/api/VersionApi.java
+src/main/java/com/github/gotify/client/auth/ApiKeyAuth.java
+src/main/java/com/github/gotify/client/auth/HttpBasicAuth.java
+src/main/java/com/github/gotify/client/auth/HttpBearerAuth.java
+src/main/java/com/github/gotify/client/auth/OAuthOkHttpClient.java
+src/main/java/com/github/gotify/client/model/Application.java
+src/main/java/com/github/gotify/client/model/ApplicationParams.java
+src/main/java/com/github/gotify/client/model/Client.java
+src/main/java/com/github/gotify/client/model/ClientParams.java
+src/main/java/com/github/gotify/client/model/CreateUserExternal.java
+src/main/java/com/github/gotify/client/model/Error.java
+src/main/java/com/github/gotify/client/model/Health.java
+src/main/java/com/github/gotify/client/model/Message.java
+src/main/java/com/github/gotify/client/model/PagedMessages.java
+src/main/java/com/github/gotify/client/model/Paging.java
+src/main/java/com/github/gotify/client/model/PluginConf.java
+src/main/java/com/github/gotify/client/model/UpdateUserExternal.java
+src/main/java/com/github/gotify/client/model/User.java
+src/main/java/com/github/gotify/client/model/UserPass.java
+src/main/java/com/github/gotify/client/model/VersionInfo.java

client/.openapi-generator/VERSION

@@ -0,0 +1 @@
+7.19.0