V3 fix storage-http compiler errors

.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 )
+          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 )
           for item in ${array[@]}; do
             gradle -x jsNodeTest :$item:build :$item:jacocoTestReport :$item:jacocoTestCoverageVerification
           done

here-naksha-lib-base/src/jvmMain/kotlin/naksha/base/JvmProxy.kt

@@ -0,0 +1,9 @@
+package naksha.base
+
+class JvmProxyUtil {
+    companion object {
+        @JvmStatic
+        fun <T: Proxy> box(raw: Any?, _clazz: Class<T>): T? =
+            Proxy.box(raw, _clazz.kotlin)
+    }
+}

here-naksha-lib-model/src/commonMain/kotlin/naksha/model/request/SuccessResponse.kt

@@ -4,6 +4,7 @@ package naksha.model.request
 
 import naksha.base.NotNullProperty
 import naksha.base.NullableProperty
+import naksha.model.objects.NakshaFeature
 import naksha.model.objects.NakshaFeatureList
 import kotlin.js.JsExport
 import kotlin.js.JsName
@@ -30,6 +31,11 @@ open class SuccessResponse @Deprecated("Use secondary", ReplaceWith("SuccessResp
         this.features.addAll(tuples.map { it.feature })
     }
 
+    @JsName("ofFeatures")
+    constructor(features: NakshaFeatureList) : this() {
+        this.features.addAll(features)
+    }
+
     companion object SuccessResponse_C {
         private val RESULT_SET_NULL = NullableProperty<SuccessResponse, IResultSet>(IResultSet::class)
         private val TUPLES = NotNullProperty<SuccessResponse, ResultTupleList>(ResultTupleList::class) { self, _ ->

here-naksha-lib-model/src/commonMain/kotlin/naksha/model/request/query/PAnd.kt

@@ -20,4 +20,8 @@ class PAnd() : ListProxy<IPropertyQuery>(IPropertyQuery::class), IPropertyQuery
     constructor(vararg queries: IPropertyQuery) : this() {
         addAll(queries)
     }
+
+    override fun toString(): String {
+        return joinToString("&")
+    }
 }

here-naksha-lib-model/src/commonMain/kotlin/naksha/model/request/query/POr.kt

@@ -13,11 +13,16 @@ import kotlin.js.JsName
 class POr() : ListProxy<IPropertyQuery>(IPropertyQuery::class), IPropertyQuery {
 
     /**
-     * Create a logical AND combination of the given queries.
+     * Create a logical OR combination of the given queries.
      * @param queries the queries to combine.
      */
     @JsName("of")
     constructor(vararg queries: IPropertyQuery) : this() {
         addAll(queries)
     }
+
+    override fun toString(): String {
+        //TODO will not work like expected key=val1,val2, rather currently it is key1=val1,key2=val2
+        return joinToString(",")
+    }
 }

here-naksha-lib-model/src/commonMain/kotlin/naksha/model/request/query/PQuery.kt

@@ -46,4 +46,8 @@ open class PQuery() : AnyObject(), IPropertyQuery {
      * The parameter value of the operation; if any.
      */
     var value by ANY
+//   TODO
+//    override fun toString(): String {
+//
+//    }
 }

here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/ViewReadSession.java

@@ -206,62 +206,75 @@ private boolean isRequestOnlyById(ReadRequest request) {
 
   @Override
   public int getSocketTimeout() {
+    //TODO
     return 0;
   }
 
   @Override
-  public void setSocketTimeout(int i) {}
+  public void setSocketTimeout(int i) {
+    //TODO
+  }
 
   @Override
   public int getStmtTimeout() {
-    return 0;
+    return 0;     //TODO
   }
 
   @Override
-  public void setStmtTimeout(int i) {}
+  public void setStmtTimeout(int i) {    //TODO
+  }
 
   @Override
   public int getLockTimeout() {
-    return 0;
+    return 0;    //TODO
+
   }
 
   @Override
-  public void setLockTimeout(int i) {}
+  public void setLockTimeout(int i) {    //TODO
+  }
 
   @Override
   public boolean isClosed() {
-    return false;
+    return false;    //TODO
+
   }
 
   @NotNull
   @Override
   public String getMap() {
-    return "";
+    return "";    //TODO
+
   }
 
   @Override
-  public void setMap(@NotNull String s) {}
+  public void setMap(@NotNull String s) {    //TODO
+  }
 
   @Override
   public boolean validateHandle(@NotNull String handle, @Nullable Integer ttl) {
-    return false;
+    return false;    //TODO
+
   }
 
   @NotNull
   @Override
   public Response executeParallel(@NotNull Request request) {
-    return execute(request);
+    return execute(request);    //TODO
+
   }
 
   @NotNull
   @Override
   public List<Tuple> getTuples(@NotNull TupleNumber[] tupleNumbers, boolean fetchFromHistory, int mode) {
-    return List.of();
+    return List.of();    //TODO
+
   }
 
   @Override
   public void fetchTuples(
-      @NotNull List<? extends ResultTuple> resultTuples, int from, int to, boolean fetchFromHistory, int mode) {}
+      @NotNull List<? extends ResultTuple> resultTuples, int from, int to, boolean fetchFromHistory, int mode) {    //TODO
+  }
 
   @Override
   public @NotNull Transaction transaction() {

here-naksha-storage-http/src/main/java/com/here/naksha/storage/http/HttpStorage.java

@@ -18,17 +18,16 @@
  */
 package com.here.naksha.storage.http;
 
-import static com.here.naksha.storage.http.RequestSender.KeyProperties;
-
-import com.here.naksha.lib.core.lambdas.Fe1;
 import com.here.naksha.lib.core.models.naksha.Storage;
-import com.here.naksha.lib.core.util.json.JsonSerializable;
+import com.here.naksha.storage.http.RequestSender.KeyProperties;
 import com.here.naksha.storage.http.cache.RequestSenderCache;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import naksha.model.IReadSession;
-import naksha.model.IStorage;
-import naksha.model.NakshaContext;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import naksha.base.Int64;
+import naksha.base.JvmProxyUtil;
+import naksha.model.*;
+import naksha.model.objects.NakshaFeature;
+import org.apache.commons.lang3.NotImplementedException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -40,8 +39,17 @@ public class HttpStorage implements IStorage {
 
   private final RequestSender requestSender;
 
+  private final AtomicBoolean initialized = new AtomicBoolean(false);
+
   public HttpStorage(@NotNull Storage storage) {
     HttpStorageProperties properties = HttpStorage.getProperties(storage);
+    if (properties == null) {
+      if (!storage.getProperties().hasRaw(HttpStorageProperties.URL)) {
+        throw new IllegalArgumentException("A HTTP storage must have properties containing a 'url'");
+      }
+      properties = new HttpStorageProperties(
+          storage.getProperties().get(HttpStorageProperties.URL).toString(), null, null, null);
+    }
     requestSender = RequestSenderCache.getInstance()
         .getSenderWith(new KeyProperties(
             storage.getId(),
@@ -51,31 +59,117 @@ public HttpStorage(@NotNull Storage storage) {
             properties.getSocketTimeout()));
   }
 
-  @Override
   public @NotNull IReadSession newReadSession(@Nullable NakshaContext context, boolean useMaster) {
     return new HttpStorageReadSession(context, useMaster, requestSender);
   }
 
+  private static @Nullable HttpStorageProperties getProperties(@NotNull Storage storage) {
+    return JvmProxyUtil.box(storage.getProperties(), HttpStorageProperties.class);
+  }
+
+  @Override
+  public void close() {
+    // TODO
+  }
+
+  @NotNull
+  @Override
+  public IReadSession newReadSession(@Nullable SessionOptions options) {
+    boolean useMaster = false;
+    if (options != null) {
+      requestSender.keyProps.connectionTimeoutSec = options.connectTimeout;
+      requestSender.keyProps.socketTimeoutSec = options.socketTimeout;
+      useMaster = options.useMaster;
+    }
+    return new HttpStorageReadSession(NakshaContext.currentContext(), useMaster, requestSender);
+  }
+
+  @NotNull
   @Override
-  public void initStorage() {
+  public IWriteSession newWriteSession(@Nullable SessionOptions options) {
+    // TODO
+    throw new NotImplementedException("Not yet supported");
+  }
+
+  @Nullable
+  @Override
+  public String getMapId(int mapNumber) {
+    throw new NotImplementedException("Not supported for HTTP storage");
+  }
+
+  @Override
+  public boolean contains(@NotNull String mapId) {
+    throw new NotImplementedException("Not supported for HTTP storage");
+  }
+
+  @NotNull
+  @Override
+  public IMap get(@NotNull String mapId) {
+    throw new NotImplementedException("Not supported for HTTP storage");
+  }
+
+  @NotNull
+  @Override
+  public IMap getDefaultMap() {
+    throw new NotImplementedException("Not supported for HTTP storage");
+  }
+
+  @Override
+  public void initStorage(@Nullable Map<String, ?> params) {
     log.debug("HttpStorage.initStorage called");
+    initialized.set(true);
+    // TODO processing params when needed
   }
 
   @Override
-  public void startMaintainer() {}
+  public boolean isInitialized() {
+    return initialized.get();
+  }
 
+  @NotNull
   @Override
-  public void maintainNow() {}
+  public SessionOptions getAdminOptions() {
+    throw new NotImplementedException("Not supported for HTTP storage");
+  }
 
+  @NotNull
   @Override
-  public void stopMaintainer() {}
+  public String getId() {
+    return requestSender.keyProps.getName();
+  }
 
+  @NotNull
   @Override
-  public @NotNull <T> Future<T> shutdown(@Nullable Fe1<T, IStorage> onShutdown) {
-    return new FutureTask<>(() -> onShutdown != null ? onShutdown.call(this) : null);
+  public NakshaFeature tupleToFeature(@NotNull Tuple tuple) {
+    throw new NotImplementedException("Not supported for HTTP storage");
   }
 
-  private static @NotNull HttpStorageProperties getProperties(@NotNull Storage storage) {
-    return JsonSerializable.convert(storage.getProperties(), HttpStorageProperties.class);
+  @NotNull
+  @Override
+  public Tuple featureToTuple(@NotNull NakshaFeature feature) {
+    throw new NotImplementedException("Not supported for HTTP storage");
+  }
+
+  @NotNull
+  @Override
+  public ILock enterLock(@NotNull String id, @NotNull Int64 waitMillis) {
+    throw new NotImplementedException("Enter lock not supported");
   }
+
+  @Override
+  public int getHardCap() {
+    throw new NotImplementedException("Not supported for HTTP storage");
+  }
+
+  @Override
+  public void setHardCap(int i) {
+    throw new NotImplementedException("Not supported for HTTP storage");
+  }
+
+  @Nullable
+  @Override
+  public IMap get(int mapNumber) {
+    throw new NotImplementedException("Not supported for HTTP storage");
+  }
+
 }