Merge pull request #99 from xeus2001/Naksha_maintenance

Revert "Merge branch 'test-unit' into Naksha_maintenance"

.github/workflows/test.yaml

@@ -1,4 +1,4 @@
-name: test-workflow
+name: Run Naksha tests
 
 on:
   pull_request:
@@ -7,9 +7,6 @@ on:
       - synchronize  # run whenever PR is updated
       - reopened     # run whenever PR is reopoened
   workflow_dispatch: # manual run
-  push:
-    branches:
-      - test-unit
 
 
 permissions:
@@ -44,7 +41,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-          cache: 'gradle'
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:

.gitignore

@@ -1,7 +1,7 @@
-#gradlew
+gradlew
 gradlew.bat
-#gradle
-#gradle/
+gradle
+gradle/
 .gradle
 *.iml
 *.iws

build.gradle.kts

@@ -85,7 +85,7 @@ val slf4j_console = "org.slf4j:slf4j-simple:2.0.6";
 val log4j_core = "org.apache.logging.log4j:log4j-core:2.20.0"
 val log4j_api = "org.apache.logging.log4j:log4j-api:2.20.0"
 val log4j_jcl = "org.apache.logging.log4j:log4j-jcl:2.20.0"
-val log4j_slf4j = "org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0"
+val log4j_slf4j = "org.apache.logging.log4j:log4j-slf4j-impl:2.20.0"
 
 val postgres = "org.postgresql:postgresql:42.5.4"
 val zaxxer_hikari = "com.zaxxer:HikariCP:5.1.0"
@@ -238,11 +238,11 @@ subprojects {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    /*testing {
+    testing {
         dependencies {
-            //implementation(slf4j_console)
+            implementation(slf4j_console)
         } 
-    }*/
+    }
 
     // Fix transitive dependencies.
 
@@ -412,10 +412,6 @@ project(":here-naksha-handler-psql") {
     }
 }
 
-configurations.implementation {
-    exclude(module = "commons-logging")
-}
-
 project(":here-naksha-lib-handlers") {
     description = "Naksha Handlers library"
     dependencies {
@@ -455,12 +451,9 @@ project(":here-naksha-lib-handlers") {
             implementation(project(":here-naksha-lib-core"))
             implementation(project(":here-naksha-lib-psql"))
             //implementation(project(":here-naksha-lib-extension"))
-            //implementation(project(":here-naksha-handler-psql"))
+            implementation(project(":here-naksha-handler-psql"))
             implementation(project(":here-naksha-lib-hub"))
 
-            implementation(log4j_slf4j)
-            implementation(log4j_api)
-            implementation(log4j_core)
             implementation(commons_lang3)
             implementation(vividsolutions_jts_core)
             implementation(postgres)

here-naksha-app-service/src/main/java/com/here/naksha/app/service/http/NakshaHttpVerticle.java

@@ -609,7 +609,6 @@ public XyzResponse sendXyzResponse(
       @NotNull RoutingContext routingContext,
       @Nullable HttpResponseType responseType,
       @NotNull XyzResponse response) {
-    log.info("SendXyzResponse start on path {}", routingContext.request().path()); // TODO(Kuba): remove this line
     try {
       final String etag = response.getEtag();
       if (etag != null) {
@@ -702,11 +701,7 @@ public void sendRawResponse(
     final HttpServerResponse httpResponse = routingContext.response();
     httpResponse.setStatusCode(status.code()).setStatusMessage(status.reasonPhrase());
     httpResponse.putHeader(STREAM_ID, streamId(routingContext));
-    log.info("Sending raw response on path {}", routingContext.request().path()); // TODO(Kuba): remove this line
     if (content == null || content.length() == 0) {
-      log.info(
-          "Empty content served from path {}",
-          routingContext.request().path()); // TODO(Kuba): remove this line
       httpResponse.end();
     } else {
       if (contentType != null) {
@@ -726,16 +721,4 @@ public void sendRawResponse(
     // ctx.setAuthor();
     return ctx;
   }
-
-  @Override
-  public void stop() throws Exception {
-    log.info("Stop (no params) called on {}", this.getClass().getSimpleName()); // TODO(Kuba): remove this line
-    super.stop();
-  }
-
-  @Override
-  public void stop(Promise<Void> stopPromise) throws Exception {
-    log.info("Stop (with promise) called on {}", this.getClass().getSimpleName()); // TODO(Kuba): remove this line
-    super.stop(stopPromise);
-  }
 }