Cosmetic changes DefaultStorageHandler.

Author: rlakde

CHANGELOG.md

@@ -1,3 +1,6 @@
+## Naksha_2.2.14
+- Refactor the `DefaultStorageHandler.java` to make it extensible without modifying the core implementation.
+
 ## Naksha_2.2.13
 - Local testing support for extensions.
 

gradle.properties

@@ -11,5 +11,5 @@ mavenPassword=YourPassword
 # - here-naksha-lib-core/src/main/com/here/naksha/lib/core/NakshaVersion (static property: latest)
 # - here-naksha-app-service/src/main/resources/swagger/openapi.yaml (info.version property)
 # - CHANGELOG.md
-version=2.2.13
+version=2.2.14
 

here-naksha-app-service/src/main/resources/swagger/openapi.yaml

@@ -12,7 +12,7 @@ servers:
 info:
   title: "Naksha Hub-API"
   description: "Naksha Hub-API is a REST API to provide simple access to geo data."
-  version: "2.2.13"
+  version: "2.2.14"
 
 security:
   - AccessToken: [ ]

here-naksha-lib-core/src/main/java/com/here/naksha/lib/core/NakshaVersion.java

@@ -71,12 +71,13 @@ public class NakshaVersion implements Comparable<NakshaVersion> {
   public static final String v2_2_11 = "2.2.11";
   public static final String v2_2_12 = "2.2.12";
   public static final String v2_2_13 = "2.2.13";
+  public static final String v2_2_14 = "2.2.14";
 
   /**
    * The latest version of the naksha-extension stored in the resources.
    */
   @AvailableSince(v2_0_5)
-  public static final NakshaVersion latest = of(v2_2_13);
+  public static final NakshaVersion latest = of(v2_2_14);
 
   private final int major;
   private final int minor;

here-naksha-lib-handlers/src/main/java/com/here/naksha/lib/handlers/DefaultStorageHandler.java

@@ -46,7 +46,6 @@
 import com.here.naksha.lib.core.storage.IWriteSession;
 import com.here.naksha.lib.core.util.StreamInfo;
 import com.here.naksha.lib.core.util.json.JsonSerializable;
-import com.here.naksha.lib.core.util.storage.RequestHelper;
 import com.here.naksha.lib.handlers.exceptions.MissingCollectionsException;
 import java.sql.SQLException;
 import java.util.List;
@@ -271,9 +270,10 @@ private boolean isUpdateCollectionRequest(@NotNull WriteCollections<?, ?, ?> wc)
       @NotNull F1<Result, RuntimeException> reattempt,
       @NotNull StopWatch storageTimer) {
     try {
-      if (wr instanceof WriteXyzCollections){
-          return measuredStorageSupplier(() -> performAtomicWriteCollection(ctx, storageImpl, (WriteXyzCollections) wr), storageTimer);
-      } else{
+      if (wr instanceof WriteXyzCollections) {
+        return measuredStorageSupplier(
+            () -> performAtomicWriteCollection(ctx, storageImpl, (WriteXyzCollections) wr), storageTimer);
+      } else {
         return measuredStorageSupplier(() -> performAtomicWriteFeatures(ctx, storageImpl, wr), storageTimer);
       }
     } catch (RuntimeException re) {
@@ -282,17 +282,13 @@ private boolean isUpdateCollectionRequest(@NotNull WriteCollections<?, ?, ?> wc)
   }
 
   private @NotNull Result performAtomicWriteCollection(
-          @NotNull NakshaContext ctx,
-          @NotNull IStorage storageImpl,
-          @NotNull WriteXyzCollections writeCollections) {
-      return singleWrite(ctx, storageImpl, writeCollections);
+      @NotNull NakshaContext ctx, @NotNull IStorage storageImpl, @NotNull WriteXyzCollections writeCollections) {
+    return singleWrite(ctx, storageImpl, writeCollections);
   }
 
   protected @NotNull Result performAtomicWriteFeatures(
-          @NotNull NakshaContext ctx,
-          @NotNull IStorage storageImpl,
-          @NotNull WriteRequest<?, ?, ?> wr) {
-      return singleWrite(ctx, storageImpl, wr);
+      @NotNull NakshaContext ctx, @NotNull IStorage storageImpl, @NotNull WriteRequest<?, ?, ?> wr) {
+    return singleWrite(ctx, storageImpl, wr);
   }
 
   private @NotNull Result singleWrite(