lib-ext-manager migration (#405)

* enable github cicd test

Signed-off-by: phmai <phuc.mai@here.com>

* kotlin class for Extension to support Platform json parsing

Signed-off-by: phmai <phuc.mai@here.com>

* kotlin class for ExtensionConfig to support Platform json parsing

Signed-off-by: phmai <phuc.mai@here.com>

* change casting

Signed-off-by: phmai <phuc.mai@here.com>

---------

Signed-off-by: phmai <phuc.mai@here.com>

Author: gunplar

.github/workflows/reusable-build-and-publish-v3s.yml

@@ -55,7 +55,7 @@ jobs:
 #        run: gradle shadowJar jacocoTestReport jacocoTestCoverageVerification
         shell: bash
         run: |
-          array=( here-naksha-lib-model here-naksha-lib-base here-naksha-lib-core here-naksha-lib-psql here-naksha-lib-view here-naksha-storage-http here-naksha-lib-diff here-naksha-lib-handlers here-naksha-lib-hub here-naksha-handler-activitylog)
+          array=( here-naksha-lib-model here-naksha-lib-base here-naksha-lib-core here-naksha-lib-psql here-naksha-lib-view here-naksha-storage-http here-naksha-lib-diff here-naksha-lib-handlers here-naksha-lib-hub here-naksha-handler-activitylog here-naksha-lib-ext-manager )
           for item in ${array[@]}; do
             gradle -x jsNodeTest :$item:build :$item:jacocoTestReport :$item:jacocoTestCoverageVerification
           done

here-naksha-lib-core/build.gradle.kts

@@ -3,6 +3,7 @@ description = "Naksha Core Library"
 plugins {
     id("naksha.java")
     id("naksha.publish")
+    kotlin("jvm")
 }
 
 java {
@@ -25,4 +26,7 @@ dependencies {
     testImplementation(Lib.mockito)
     testImplementation(Lib.json_assert)
 }
-setOverallCoverage(0.0) // only increasing allowed!
+setOverallCoverage(0.0) // only increasing allowed!
+kotlin {
+    jvmToolchain(11)
+}

here-naksha-lib-core/src/main/java/com/here/naksha/lib/core/models/ExtensionConfig.java

@@ -0,0 +1,31 @@
+package com.here.naksha.lib.core.models
+
+import com.here.naksha.lib.core.models.features.Extension
+import naksha.base.AnyObject
+import naksha.base.NotNullProperty
+import naksha.base.NullableProperty
+import naksha.base.StringList
+
+class ExtensionConfig() : AnyObject() {
+    companion object {
+        private val EXTENSIONS_NULL = NullableProperty<ExtensionConfig, ExtensionList>(ExtensionList::class)
+        private val WHITELIST_DELEGATE_CLASSES_NULL = NullableProperty<ExtensionConfig, StringList>(StringList::class)
+        private val LONG = NotNullProperty<ExtensionConfig, Long>(Long::class)
+        private val STRING = NotNullProperty<ExtensionConfig, String>(String::class)
+    }
+
+    var expiry by LONG
+    var extensions by EXTENSIONS_NULL
+    var whitelistDelegateClasses by WHITELIST_DELEGATE_CLASSES_NULL
+    var env by STRING
+
+    constructor(expiry: Long,
+        extensions: List<Extension>,
+                whitelistDelegateClasses: List<String>,
+        env: String) : this() {
+        this.expiry = expiry
+        this.extensions = ExtensionList.fromList(extensions)
+        this.whitelistDelegateClasses = StringList.fromList(whitelistDelegateClasses)
+        this.env = env
+    }
+}

here-naksha-lib-core/src/main/java/com/here/naksha/lib/core/models/features/Extension.java

@@ -0,0 +1,12 @@
+package com.here.naksha.lib.core.models
+
+import com.here.naksha.lib.core.models.features.Extension
+import naksha.base.ListProxy
+
+class ExtensionList: ListProxy<Extension>(Extension::class) {
+    companion object ExtensionList_C {
+        @JvmStatic
+        fun fromList(extensions: List<Extension>): ExtensionList =
+            ExtensionList().apply { addAll(extensions) }
+    }
+}

here-naksha-lib-core/src/main/kotlin/com/here/naksha/lib/core/models/ExtensionConfig.kt

@@ -0,0 +1,30 @@
+package com.here.naksha.lib.core.models.features
+
+import naksha.base.NotNullProperty
+import naksha.base.NullableProperty
+import naksha.model.objects.NakshaFeature
+
+class Extension() : NakshaFeature() {
+    companion object {
+        private val STRING_NULL = NullableProperty<Extension, String>(String::class)
+        private val STRING = NotNullProperty<Extension, String>(String::class)
+    }
+
+    var url by STRING
+
+    var version by STRING
+
+    var initClassName by STRING_NULL
+
+    constructor(
+        id: String,
+        url: String,
+        version: String,
+        initClassName: String?
+    ) : this() {
+        this.id = id
+        this.url = url
+        this.version = version
+        this.initClassName = initClassName
+    }
+}

here-naksha-lib-core/src/main/kotlin/com/here/naksha/lib/core/models/ExtensionList.kt

@@ -10,5 +10,6 @@ dependencies {
     implementation(Lib.jcl_slf4j)
     implementation(Lib.cytodynamics)
     testImplementation(Lib.mockito)
+    testImplementation(project(":here-naksha-lib-core"))
 }
 setOverallCoverage(0.0) // only increasing allowed!

here-naksha-lib-core/src/main/kotlin/com/here/naksha/lib/core/models/features/Extension.kt

@@ -103,7 +103,7 @@ private void publishIntoCache(KVPair<Extension, File> result, ExtensionConfig ex
       final File jarFile = result.getValue();
       ClassLoader loader;
       try {
-        loader = ClassLoaderHelper.getClassLoader(jarFile, extensionConfig.getWhilelistDelegateClass());
+        loader = ClassLoaderHelper.getClassLoader(jarFile, extensionConfig.getWhitelistDelegateClasses());
       } catch (Exception e) {
         logger.error("Failed to load extension jar " + extension.getId(), e);
         return;

here-naksha-lib-ext-manager/build.gradle.kts

@@ -1,9 +1,13 @@
 package com.here.naksha.lib.extmanager;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.here.naksha.lib.core.models.ExtensionConfig;
+import com.here.naksha.lib.core.models.ExtensionList;
 import com.here.naksha.lib.core.models.features.Extension;
+import naksha.base.FromJsonOptions;
+import naksha.base.JvmBoxingUtil;
+import naksha.base.JvmListProxy;
+import naksha.base.Platform;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -20,8 +24,7 @@ public ExtensionConfig getExtensionConfig() {
     List<Extension> list;
     try {
       String data = Files.readAllLines(file).stream().collect(Collectors.joining());
-      list = new ObjectMapper().readValue(data, new TypeReference<>() {
-      });
+      list = JvmBoxingUtil.box(Platform.fromJSON(data, FromJsonOptions.DEFAULT), ExtensionList.class);
     } catch (IOException e) {
       throw new RuntimeException(e);
     }