V3 casl 1164 changed build gradle to correctly run for v3 (#481)

* V3 casl 1164 changed build gradle to correctly run for v3

Signed-off-by: Marcin-Here <[email protected]>

* V3 casl 1164 added new docker images and jar run commands to README

Signed-off-by: Marcin-Here <[email protected]>

* V3 casl 1164 changed readConfigFile to proxy model

Signed-off-by: Marcin-Here <[email protected]>

---------

Signed-off-by: Marcin-Here <[email protected]>

Author: Marcin-Here

README.md

@@ -60,23 +60,25 @@ Apart from bare Postgres, Naksha needs [PostGIS]() extension which is mandatory.
 You can use standalone instance installed directly on your host machine but there's also a docker image that hosts Postgres 16 with all the extensions mentioned above already installed. You can find its definition in [this Dockerfile](here-naksha-app-service/src/jvmTest/psql_container/Dockerfile).
 
 To use the containerized Postgres with your locally runnning Naksha:
-1) Navigate to [Dockerfile directory](here-naksha-app-service/src/jvmTest/psql_container):
-   ```
-   cd here-naksha-app-service/src/jvmTest/psql_container
-   ```
-2) Build the image:
-   ```
-   docker build --no-cache -t <IMAGE_ID> . 
-   ```
-3) Run the container (supplied options omit all auth - use it only locally, tweak if needed):
-   ```
-   docker run -p 5432:5432 -e POSTGRES_PASSWORD=postgres -e POSTGRES_INITDB_ARGS="--auth-host=trust --auth-local=trust" -e POSTGRES_HOST_AUTH_METHOD=trust <IMAGE_ID>
-   ```
+1) Pull docker image:
+    ```bash
+    docker pull ghcr.io/naksha-oss/naksha-postgres:v16.2-r5
+    ```
+2) Run docker image with password set to default:
+    ```bash
+    docker run -p 5432:5432 -e PGPASSWORD=password ghcr.io/naksha-oss/naksha-postgres:v16.2-r5
+    ```
+
+3) When the docker container is started for the first time, it will generate a random password so to simplify local development we can change it to default.
+Also if you want locally persist your db changes refer to detailed containerized Postgres build.
+For more detailed containerized Postgres build refer to [this README](deployment/docker/README.md).
+
+
 4) Now your database should be available on `localhost` with port `5432` - you can start Naksha the same way as described in [Run App](#run-app) section.
 
 5) \[optional extension run\] Now you can run naksha jar and include [example config with additional extensions enabled](here-naksha-app-service/src/main/resources/test-config-with-extensions.json) like so:
 ```
-java -jar build/libs/naksha-2.0.6-all.jar test-config-with-extensions 'jdbc:postgresql://localhost:5432/postgres?user=postgres&password=pswd&schema=naksha&app=naksha_local&id=naksha_admin_db'
+java -jar here-naksha-app-service/build/libs/naksha-app-service-3.0.0-beta.24.jar test-config-with-extensions 'jdbc:postgresql://localhost:5432/postgres?user=postgres&password=pswd&schema=naksha&app=naksha_local&id=naksha_admin_db'
 ```
 
 ### Run App
@@ -102,11 +104,11 @@ To ramp up Naksha with the jar, run:
 java -jar <jar-file> <config-id> <database-url>
 
 # Example 1 : Start service with test config against default Database URL (useful for local env)
-java -jar build/libs/naksha-2.0.6-all.jar test-config
+java -jar here-naksha-app-service/build/libs/naksha-app-service-3.0.0-beta.24.jar test-config
 # Example 2 : Start service with given custom config and custom database URL (useful for cloud env)
-java -jar build/libs/naksha-2.0.6-all.jar cloud-config 'jdbc:postgresql://localhost:5432/postgres?user=postgres&password=pswd&schema=naksha&app=naksha_local&id=naksha_admin_db'
+java -jar here-naksha-app-service/build/libs/naksha-app-service-3.0.0-beta.24.jar cloud-config 'jdbc:postgresql://localhost:5432/postgres?user=postgres&password=pswd&schema=naksha&app=naksha_local&id=naksha_admin_db'
 # Example 3 : Start service with given custom config and default (local) database URL
-java -jar build/libs/naksha-2.0.6-all.jar custom-config
+java -jar here-naksha-app-service/build/libs/naksha-app-service-3.0.0-beta.24.jar custom-config
 
 ```
 

build.gradle.kts

@@ -290,3 +290,7 @@ fun Task.publishToCentral() {
     }
 }
 tasks.register("publishToCentral") { publishToCentral() }
+
+tasks.register("shadowJar") {
+    dependsOn(":here-naksha-app-service:shadowJar")
+}

here-naksha-app-service/build.gradle.kts

@@ -1,10 +1,20 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.shadow)
 }
 
 description = gatherDescription()
+val mainApiClass = "com.here.naksha.app.service.NakshaApp"
+val fatJarBaseName = "naksha-app-service"
 
 kotlin {
+    jvm {
+        mainRun {
+            this.mainClass.set(mainApiClass)
+        }
+    }
     sourceSets {
         jvmMain {
             jvmToolchain(23)
@@ -38,8 +48,6 @@ kotlin {
             }
         }
     }
-
-    jvm {}
 }
 
 tasks {
@@ -49,6 +57,23 @@ tasks {
         useJUnitPlatform()
         maxHeapSize = "6g"
     }
+    val shadowJar by registering(ShadowJar::class) {
+        archiveBaseName.set(fatJarBaseName)
+        archiveClassifier.set("")
+        archiveVersion.set(project.version.toString())
+
+//        mustRunAfter("testCodeCoverageReport")
+//
+//        mergeServiceFiles()
+//        isZip64 = true
+
+        manifest {
+            attributes["Main-Class"] = mainApiClass
+        }
+
+        from(kotlin.jvm().compilations.getByName("main").output)
+        configurations = listOf(project.configurations.getByName("jvmRuntimeClasspath"))
+    }
 }
 setOverallCoverage(0.0) // only increasing allowed!
 

here-naksha-app-service/src/jvmMain/java/com/here/naksha/app/service/NakshaApp.java

@@ -39,6 +39,8 @@
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.ext.web.client.WebClientOptions;
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -49,6 +51,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
+
+import naksha.model.NakshaContext;
 import naksha.model.NakshaVersion;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -67,7 +71,7 @@ public final class NakshaApp extends Thread {
 
   private static final String DEFAULT_MAP_ID = "naksha";
 
-  private static final String DEFAULT_URL = "jdbc:postgresql://localhost:5432/postgres?user=postgres&password=pswd"
+  private static final String DEFAULT_URL = "jdbc:postgresql://localhost:5432/postgres?user=postgres&password=password"
                                             + "&schema=" + DEFAULT_MAP_ID
                                             + "&app=" + NakshaHubConfig.defaultAppName();
                                             //+ "&id=" + PgStorage.ADMIN_STORAGE_ID;
@@ -202,6 +206,7 @@ public NakshaApp(
     }
     // Instantiate NakshaHub instance
     // TODO: what about appName?
+    NakshaContext.newInstance(appName).attachToCurrentThread();
     this.hub = NakshaHubFactory.getInstance(storageUrl, nakshaHubConfig, configId);
     nakshaHubConfig = hub.getConfig(); // use the config finally set by NakshaHub instance
     log.info("Using server config : {}", nakshaHubConfig);

here-naksha-common-http/build.gradle.kts

@@ -5,15 +5,16 @@ plugins {
 description = gatherDescription()
 
 kotlin {
+
+    jvm {}
+
     sourceSets {
         jvmMain {
             jvmToolchain(23)
             dependencies {
             }
         }
     }
-
-    jvm {}
 }
 
 tasks {

here-naksha-handler-activitylog/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
 description = gatherDescription()
 
 kotlin {
+    jvm {}
     sourceSets {
         jvmMain {
             jvmToolchain(23)
@@ -25,8 +26,6 @@ kotlin {
             }
         }
     }
-
-    jvm {}
 }
 
 tasks {

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

@@ -10,6 +10,7 @@ plugins {
 description = gatherDescription()
 
 kotlin {
+    jvm {}
     sourceSets {
         commonMain {
             dependencies {
@@ -50,7 +51,6 @@ kotlin {
         }
     }
 
-    jvm {}
     js(IR) {
         outputModuleName = "naksha_base"
         useEsModules()

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

@@ -5,6 +5,7 @@ plugins {
 description = gatherDescription()
 
 kotlin {
+    jvm {}
     sourceSets {
         jvmMain {
             jvmToolchain(23)
@@ -32,8 +33,6 @@ kotlin {
             }
         }
     }
-
-    jvm {}
 }
 
 tasks {

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

@@ -5,6 +5,7 @@ plugins {
 description = gatherDescription()
 
 kotlin {
+    jvm {}
     sourceSets {
         jvmMain {
             jvmToolchain(23)
@@ -23,8 +24,6 @@ kotlin {
             }
         }
     }
-
-    jvm {}
 }
 
 tasks {

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

@@ -10,6 +10,7 @@ plugins {
 description = gatherDescription()
 
 kotlin {
+    jvm {}
     sourceSets {
         commonMain {
             dependencies {
@@ -54,7 +55,6 @@ kotlin {
         }
     }
 
-    jvm {}
     js(IR) {
         outputModuleName = "naksha_geo"
         useEsModules()