V3 fix storage-http compiler errors #379

gunplar · 2024-11-11T15:25:44Z

No description provided.

# Conflicts: # here-naksha-lib-model/src/commonMain/kotlin/naksha/model/IStorage.kt

# Conflicts: # here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/View.java # here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/ViewReadSession.java # here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/ViewWriteSession.java # here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/concurrent/LayerReadRequest.java # here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/concurrent/LayerRequest.java # here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/concurrent/ParallelQueryExecutor.java

# Conflicts: # here-naksha-lib-model/src/commonMain/kotlin/naksha/model/request/SuccessResponse.kt # here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/LayerWriteFeatureRequest.java # here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/ViewReadSession.java # here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/ViewWriteSession.java # here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/concurrent/ParallelQueryExecutor.java # here-naksha-lib-view/src/main/java/com/here/naksha/lib/view/missing/ObligatoryLayersResolver.java # here-naksha-lib-view/src/test/java/com/here/naksha/lib/view/MockReadSession.java # here-naksha-lib-view/src/test/java/com/here/naksha/lib/view/PsqlTests.java # here-naksha-lib-view/src/test/java/com/here/naksha/lib/view/PsqlViewTests.java # here-naksha-lib-view/src/test/java/com/here/naksha/lib/view/Sample.java # here-naksha-lib-view/src/test/java/com/here/naksha/lib/view/ViewTest.java # here-naksha-lib-view/src/test/java/com/here/naksha/lib/view/ViewWriteSessionTests.java # here-naksha-lib-view/src/test/java/com/here/naksha/lib/view/merge/MergeByStoragePriorityTest.java # here-naksha-lib-view/src/test/java/com/here/naksha/lib/view/missing/ObligatoryLayersResolverTest.java

# Conflicts: # here-naksha-storage-http/src/main/java/com/here/naksha/storage/http/HttpStorage.java # here-naksha-storage-http/src/main/java/com/here/naksha/storage/http/HttpStorageProperties.java # here-naksha-storage-http/src/main/java/com/here/naksha/storage/http/HttpStorageReadExecute.java # here-naksha-storage-http/src/main/java/com/here/naksha/storage/http/HttpStorageReadSession.java # here-naksha-storage-http/src/main/java/com/here/naksha/storage/http/PrepareResult.java

github-actions · 2024-11-11T15:42:15Z

Code Coverage

Overall Project	31.1% `-0.05%`	🍏
Files changed	0%	🍏

Module	Coverage
here-naksha-lib-view	83.39% `-2.51%`	🍏

Files

Module	File	Coverage
here-naksha-lib-view	ViewReadSession.java	75.69% `-7.29%`	🍏

github-actions · 2024-11-12T13:24:42Z

Code Coverage

Overall Project	31.1% `-0.05%`	🍏
Files changed	0%	🍏

Module	Coverage
here-naksha-lib-view	83.39% `-2.51%`	🍏

Files

Module	File	Coverage
here-naksha-lib-view	ViewReadSession.java	75.69% `-7.29%`	🍏

github-actions · 2024-11-12T13:33:32Z

Code Coverage

Overall Project	30.77% `-0.67%`	🍏
Files changed	20.4%	🍏

Module	Coverage
here-naksha-lib-view	83.39% `-2.51%`	🍏
here-naksha-storage-http	18.06% `-25.12%`	🍏

Files

Module	File	Coverage
here-naksha-lib-view	ViewReadSession.java	75.69% `-7.29%`	🍏
here-naksha-storage-http	HttpStorageProperties.java	100%	🍏
	RequestSenderCache.java	75.81%	🍏
	RequestSender.java	34% `-3.2%`	🍏
	HttpStorageReadExecute.java	0% `-15.89%`	🍏
	HttpStorageReadSession.java	0% `-71.83%`	🍏
	HttpStorage.java	0% `-69.4%`	🍏
	PrepareResult.java	0% `-37.84%`	🍏

github-actions · 2024-11-12T14:09:48Z

Code Coverage

Overall Project	30.7% `-0.87%`	🍏
Files changed	16.12%	🍏

Module	Coverage
here-naksha-lib-view	83.39% `-2.51%`	🍏
here-naksha-storage-http	16.44% `-30.7%`	🍏

Files

Module	File	Coverage
here-naksha-lib-view	ViewReadSession.java	75.69% `-7.29%`	🍏
here-naksha-storage-http	HttpStorageProperties.java	100%	🍏
	RequestSenderCache.java	75.81%	🍏
	RequestSender.java	33.47% `-3.19%`	🍏
	HttpStorageReadExecute.java	0% `-15.89%`	🍏
	HttpStorageReadSession.java	0% `-80.91%`	🍏
	HttpStorage.java	0% `-76.97%`	🍏
	PrepareResult.java	0% `-37.84%`	🍏

…rom another branch Signed-off-by: phmai <[email protected]>

github-actions · 2024-11-12T15:43:45Z

Code Coverage

Overall Project	30.71% `-0.87%`	🍏
Files changed	16.12%	🍏

Module	Coverage
here-naksha-lib-view	83.39% `-2.51%`	🍏
here-naksha-storage-http	16.44% `-30.7%`	🍏

Files

Module	File	Coverage
here-naksha-lib-view	ViewReadSession.java	75.69% `-7.29%`	🍏
here-naksha-storage-http	HttpStorageProperties.java	100%	🍏
	RequestSenderCache.java	75.81%	🍏
	RequestSender.java	33.47% `-3.19%`	🍏
	HttpStorageReadExecute.java	0% `-15.89%`	🍏
	HttpStorageReadSession.java	0% `-80.91%`	🍏
	HttpStorage.java	0% `-76.97%`	🍏
	PrepareResult.java	0% `-37.84%`	🍏

adamczyk-HERE · 2024-11-14T15:56:31Z

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

@@ -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);


Since this method is no longer used in Handlers or Tasks it can be removed completely

adamczyk-HERE · 2024-11-14T16:01:03Z

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

  @Override
-  public void initStorage() {
+  public IWriteSession newWriteSession(@Nullable SessionOptions options) {
+    // TODO


Write session is not supported in HttpStorage, so there is no need for //TODO
It will be supported when the DataHub Connector HttpStorage is implemented, but it is not ready and I guess migrating it to v3 will be whole another task.

adamczyk-HERE · 2024-11-14T16:05:01Z

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

+
+  @Override
+  public void close() {
+    // TODO


I don't see anything that should be closed or finalized inside HttpStorage.
So if there is no additional requirement from Naksha design to handle closure in some particular way, I think //TODO here is not needed

adamczyk-HERE · 2024-11-14T16:39:32Z

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

  @Override
-  public boolean isMasterConnect() {


If isMasterConnect is deleted there is no longer any usage of the useMaster field.
So the field and all the parameters used only to set this field may be removed.

adamczyk-HERE · 2024-11-14T18:17:36Z

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

-    POp pOp = readRequest.getQueryParameter(PROPERTY_SEARCH_OP);
-    return pOp == null ? "" : "&" + POpToQueryConverter.p0pToQuery(pOp);
+    final IPropertyQuery propertyQuery = readRequest.getQuery().getProperties();
+    return propertyQuery == null ? "" : "&" + propertyQuery;


It would be nice to test it with
ReadFeaturesByBBoxHttpStorageTest.tc800_testPropertySearch()
If the test passes that means that whole POp conversion and its test can be removed from HttpStorage

However I was not able to run the test due to compilation errors in AbstractEventHandler and other classes

adamczyk-HERE · 2024-11-14T18:31:06Z

...ha-storage-http/src/test/java/com/here/naksha/storage/http/cache/RequestSenderCacheTest.java

@@ -95,7 +95,6 @@ void testOneId() {
            TimeUnit.HOURS
    );

-    assertEquals(PROP_ID_1, PROP_ID_1_COPY);


I don't understand why this and the 127 line was deleted

adamczyk-HERE · 2024-11-14T18:36:32Z

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

-      @NotNull Map<String, String> defaultHeaders,
-      long connectionTimeoutSec,
-      long socketTimeoutSec) {}
+  public static class KeyProperties {


Why convert this record to a class?
If it is about being compared based on the contents, java records already override equals method
https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Record.html#equals(java.lang.Object)

gunplar added 30 commits July 26, 2024 13:49

partial migration

8bf26d2

partial migration

c1116ad

partial migration

588c2c8

Merge branch 'refs/heads/v3' into v3_fix_lib_view

c41a426

partial fix

eb95f29

partial fix

4c73962

partial fix

b47e1a7

partial fix

7a0060a

partial fix

98c8010

partial fix

0b8570f

partial work

cafdf59

Merge branch 'refs/heads/v3' into v3_fix_lib_view

f1c3095

# Conflicts: # here-naksha-lib-model/src/commonMain/kotlin/naksha/model/IStorage.kt

partial fix

a418ab2

partial fix

3af5570

partial fix

92670ae

partial fix

b11d854

partial fix

63c9c09

partial fix

ad35da6

partial fix

9520817

Merge branch 'refs/heads/v3' into v3_fix_lib_view

30a487e

partial fix

99158e5

partial fix

68929c6

partial fix

ec8baa6

partial fix

0fc0549

partial fix

4d6384a

partial fix

dd4c36a

partial fix

6336942

bug fix

3ac90be

Merge branch 'refs/heads/v3' into v3_fix_lib_view

412ea12

partial fix

cb0b089

gunplar added 13 commits September 2, 2024 09:20

partial fix

11ed287

Merge branch 'refs/heads/v3' into v3_fix_storage_http

135bd51

partial fix

7b3ab7a

Merge branch 'refs/heads/v3' into v3_fix_storage_http

c23b933

Merge branch 'refs/heads/v3' into v3_fix_storage_http

25739d8

partial fix

49018b8

Merge branch 'refs/heads/v3' into v3_fix_storage_http

a62f935

WIP

250e78d

WIP

1244ce5

Merge branch 'refs/heads/v3' into v3_fix_storage_http

e538d28

WIP

ce1c66d

enable tests on cicd for storage-http

c1a2406

WIP

43c8079

gunplar requested review from adamczyk-HERE, hirenkp2000 and Amaneusz and removed request for adamczyk-HERE November 12, 2024 14:15

trigger cicd to make sure it is not affected by pipeline definition f…

8b0b55c

…rom another branch Signed-off-by: phmai <[email protected]>

gunplar requested a review from xeus2001 November 12, 2024 15:41

adamczyk-HERE reviewed Nov 14, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

V3 fix storage-http compiler errors #379

V3 fix storage-http compiler errors #379

gunplar commented Nov 11, 2024

github-actions bot commented Nov 11, 2024

github-actions bot commented Nov 12, 2024

github-actions bot commented Nov 12, 2024

github-actions bot commented Nov 12, 2024

github-actions bot commented Nov 12, 2024

adamczyk-HERE Nov 14, 2024

adamczyk-HERE Nov 14, 2024

adamczyk-HERE Nov 14, 2024

adamczyk-HERE Nov 14, 2024

adamczyk-HERE Nov 14, 2024

adamczyk-HERE Nov 14, 2024

adamczyk-HERE Nov 14, 2024

V3 fix storage-http compiler errors #379

Are you sure you want to change the base?

V3 fix storage-http compiler errors #379

Conversation

gunplar commented Nov 11, 2024

github-actions bot commented Nov 11, 2024

Code Coverage

github-actions bot commented Nov 12, 2024

Code Coverage

github-actions bot commented Nov 12, 2024

Code Coverage

github-actions bot commented Nov 12, 2024

Code Coverage

github-actions bot commented Nov 12, 2024

Code Coverage

adamczyk-HERE Nov 14, 2024

Choose a reason for hiding this comment

adamczyk-HERE Nov 14, 2024

Choose a reason for hiding this comment

adamczyk-HERE Nov 14, 2024

Choose a reason for hiding this comment

adamczyk-HERE Nov 14, 2024

Choose a reason for hiding this comment

adamczyk-HERE Nov 14, 2024

Choose a reason for hiding this comment

adamczyk-HERE Nov 14, 2024

Choose a reason for hiding this comment

adamczyk-HERE Nov 14, 2024

Choose a reason for hiding this comment