Updated Compose, Javalin, Ktor and Micronaut samples to use GroupDocs.Comparison for Java v22.11

oleksii-unnamed · oleksii-unnamed · commit 501e00661a6e · 2022-11-04T17:14:28.000+02:00
diff --git a/Demos/Compose/build.gradle.kts b/Demos/Compose/build.gradle.kts
@@ -12,6 +12,7 @@ version = "22.11"
 
 repositories {
     google()
+    mavenLocal()
     mavenCentral()
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     maven("https://repository.groupdocs.com/repo/")
@@ -20,7 +21,7 @@ repositories {
 dependencies {
     implementation(compose.desktop.currentOs)
     implementation("commons-io:commons-io:2.11.0")
-    implementation("com.groupdocs:groupdocs-comparison:22.11")
+    implementation("com.groupdocs:groupdocs-comparison:$version")
 }
 
 tasks.withType<KotlinCompile> {
@@ -33,7 +34,7 @@ compose.desktop {
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
             packageName = "groupdocs-comparison-compose"
-            packageVersion = "22.11.0"
+            packageVersion = "$version.0"
 
             windows {
                 shortcut = true
diff --git a/Demos/Javalin/build.gradle.kts b/Demos/Javalin/build.gradle.kts
@@ -12,6 +12,7 @@ group = "com.groupdocs.ui"
 version = "22.11"
 
 repositories {
+    mavenLocal()
     mavenCentral()
     maven("https://repository.groupdocs.com/repo/")
 }
diff --git a/Demos/Javalin/src/main/kotlin/com/groupdocs/ui/Application.kt b/Demos/Javalin/src/main/kotlin/com/groupdocs/ui/Application.kt
@@ -3,6 +3,7 @@ package com.groupdocs.ui
 import com.groupdocs.comparison.license.License
 import com.groupdocs.ui.config.ApplicationConfig
 import com.groupdocs.ui.di.ModulesInjection
+import com.groupdocs.ui.model.ErrorResponse
 import com.groupdocs.ui.modules.compare.compareModule
 import com.groupdocs.ui.modules.config.configModule
 import com.groupdocs.ui.modules.description.descriptionModule
@@ -65,6 +66,19 @@ fun main(args: Array<String>) {
         downloadModule()
         uploadModule()
     }
+    app.exception(Exception::class.java) { e, ctx ->
+        e.printStackTrace()
+        ctx.json(
+            ErrorResponse(
+                message = if (e.message?.equals("File's types are different or are not supported") == true) {
+                    "Document types are not supported in sample app, anyway, it is still supported by GroupDocs.Comparison itself. Other probable reason of the error - documents types are different."
+
+                } else {
+                    e.message ?: "Internal server error"
+                }
+            )
+        ).status(500)
+    }
 }
 
 fun setGroupdocsLicense(licensePath: String) {
diff --git a/Demos/Javalin/src/main/kotlin/com/groupdocs/ui/model/ErrorResponse.kt b/Demos/Javalin/src/main/kotlin/com/groupdocs/ui/model/ErrorResponse.kt
@@ -0,0 +1,6 @@
+package com.groupdocs.ui.model
+
+data class ErrorResponse(
+    val message: String,
+    val exception: Exception? = null
+)
diff --git a/Demos/Javalin/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareController.kt b/Demos/Javalin/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareController.kt
@@ -92,21 +92,21 @@ class CompareControllerImpl(
                 comparisonAction = changeInfo.comparisonAction,
                 sourceText = changeInfo.sourceText,
                 targetText = changeInfo.targetText,
-                text = changeInfo.text,
+                text = changeInfo.text ?: "",
                 componentType = changeInfo.componentType,
                 box = ChangeBox(
                     x = changeInfo.box.x,
                     y = changeInfo.box.y,
                     width = changeInfo.box.width,
                     height = changeInfo.box.height
                 ),
-                authors = changeInfo.authors,
+                authors = changeInfo.authors ?: emptyList(),
                 pageInfo = PageInfo(
                     pageNumber = changeInfo.pageInfo.pageNumber,
                     width = changeInfo.pageInfo.width,
                     height = changeInfo.pageInfo.height
                 ),
-                styleChanges = changeInfo.styleChanges.map { styleChangeInfo ->
+                styleChanges = (changeInfo.styleChanges  ?: emptyList()).map { styleChangeInfo ->
                     StyleChange(
                         propertyName = styleChangeInfo.propertyName,
                         oldValue = styleChangeInfo.oldValue,
diff --git a/Demos/Ktor/build.gradle.kts b/Demos/Ktor/build.gradle.kts
@@ -13,6 +13,7 @@ group = "com.groupdocs.ui"
 version = "22.11"
 
 repositories {
+    mavenLocal()
     mavenCentral()
     maven("https://repository.groupdocs.com/repo/")
 }
diff --git a/Demos/Ktor/src/main/kotlin/com/groupdocs/ui/model/ErrorResponse.kt b/Demos/Ktor/src/main/kotlin/com/groupdocs/ui/model/ErrorResponse.kt
@@ -0,0 +1,6 @@
+package com.groupdocs.ui.model
+
+data class ErrorResponse(
+    val message: String,
+    val exception: Exception? = null
+)
diff --git a/Demos/Ktor/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareModule.kt b/Demos/Ktor/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareModule.kt
@@ -1,6 +1,8 @@
 package com.groupdocs.ui.modules.compare
 
 import com.groupdocs.ui.model.CompareRequest
+import com.groupdocs.ui.model.ErrorResponse
+import com.groupdocs.ui.status.InternalServerException
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.request.*
@@ -13,8 +15,21 @@ fun Route.compareModule() {
     val compareController by inject<CompareController>()
 
     post("/compare") {
-        val request = call.receive<CompareRequest>()
-        val response = compareController.compare(request)
-        call.respond(HttpStatusCode.OK, response)
+        try {
+            val request = call.receive<CompareRequest>()
+            val response = compareController.compare(request)
+            call.respond(HttpStatusCode.OK, response)
+        } catch (e: InternalServerException) {
+            call.respond(
+                status = HttpStatusCode.InternalServerError,
+                message = ErrorResponse(
+                    message = if (e.message == "File's types are different or are not supported") {
+                        "Document types are not supported in sample app, anyway, it is still supported by GroupDocs.Comparison itself. Other probable reason of the error - documents types are different."
+                    } else {
+                        e.message
+                    }
+                )
+            )
+        }
     }
 }
diff --git a/Demos/Micronaut/DocumentSamples/.gitkeep b/Demos/Micronaut/DocumentSamples/.gitkeep
diff --git a/Demos/Micronaut/build.gradle.kts b/Demos/Micronaut/build.gradle.kts
@@ -11,6 +11,7 @@ version = "22.11"
 
 val kotlinVersion = project.properties["kotlinVersion"]
 repositories {
+    mavenLocal()
     mavenCentral()
     maven("https://repository.groupdocs.com/repo/")
 }
@@ -59,6 +60,10 @@ tasks {
             jvmTarget = "11"
         }
     }
+
+    shadowJar {
+        isZip64 = true
+    }
 }
 graalvmNative.toolchainDetection.set(false)
 micronaut {
diff --git a/Demos/Micronaut/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareBean.kt b/Demos/Micronaut/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareBean.kt
@@ -45,7 +45,7 @@ class CompareBeanImpl(
         val targetFilePath = pathManager.assertPathIsInsideFilesDirectory(targetFile)
 
         if (!checkAreFilesSupported(sourceFilePath.fileName.toString(), targetFilePath.fileName.toString())) {
-            throw InternalServerException("File's types are different or are not supported") // TODO: Need another exception type
+            throw InternalServerException("Document types are not supported in sample app, anyway, it is still supported by GroupDocs.Comparison itself. Other probable reason of the error - documents types are different.") // TODO: Need another exception type
         }
 
         val sourcePassword = sourceDocument.password
diff --git a/Demos/Micronaut/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareController.kt b/Demos/Micronaut/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareController.kt
@@ -17,11 +17,11 @@ import kotlinx.coroutines.runBlocking
 class CompareController(
     @Inject private val compareBean: CompareBean
 ) {
-@Post("/compare")
-@Produces(MediaType.APPLICATION_JSON)
-fun comparer(request: CompareRequest): HttpResponse<CompareResponse> {
-    val response = runBlocking { compareBean.compare(request) }
+    @Post("/compare")
+    @Produces(MediaType.APPLICATION_JSON)
+    fun comparer(request: CompareRequest): HttpResponse<CompareResponse> {
+        val response = runBlocking { compareBean.compare(request) }
 
-    return HttpResponse.ok<ConfigResponse>().body(response)
-}
+        return HttpResponse.ok<ConfigResponse>().body(response)
+    }
 }
diff --git a/Demos/Micronaut/src/main/kotlin/com/groupdocs/ui/util/Tool.kt b/Demos/Micronaut/src/main/kotlin/com/groupdocs/ui/util/Tool.kt
@@ -9,6 +9,7 @@ import java.nio.file.Path
 import java.nio.file.Paths
 
 open class InternalServerException(override val message: String = "Internal server error", throwable: Throwable? = null) : Exception(message, throwable)
+open class FileFormatNotSupportedException(override val message: String, throwable: Throwable? = null) : Exception(message, throwable)
 
 fun setGroupdocsLicense(licensePath: String) {
     try {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ group = "com.groupdocs.ui"`
`12`	`12`	`version = "22.11"`
`13`	`13`
`14`	`14`	`repositories {`
	`15`	`+ mavenLocal()`
`15`	`16`	`mavenCentral()`
`16`	`17`	`maven("https://repository.groupdocs.com/repo/")`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ group = "com.groupdocs.ui"`
`13`	`13`	`version = "22.11"`
`14`	`14`
`15`	`15`	`repositories {`
	`16`	`+ mavenLocal()`
`16`	`17`	`mavenCentral()`
`17`	`18`	`maven("https://repository.groupdocs.com/repo/")`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ version = "22.11"`
`11`	`11`
`12`	`12`	`val kotlinVersion = project.properties["kotlinVersion"]`
`13`	`13`	`repositories {`
	`14`	`+ mavenLocal()`
`14`	`15`	`mavenCentral()`
`15`	`16`	`maven("https://repository.groupdocs.com/repo/")`
`16`	`17`	`}`
`@@ -59,6 +60,10 @@ tasks {`
`59`	`60`	`jvmTarget = "11"`
`60`	`61`	`}`
`61`	`62`	`}`
	`63`	`+`
	`64`	`+ shadowJar {`
	`65`	`+ isZip64 = true`
	`66`	`+ }`
`62`	`67`	`}`
`63`	`68`	`graalvmNative.toolchainDetection.set(false)`
`64`	`69`	`micronaut {`