fix Unhandled npe, IllegalArgumentException

Signed-off-by: qGYdXbY2 <[email protected]>
qGYdXbY2 · Nov 15, 2024 · 19b5adc · 19b5adc
1 parent 37d59d8
commit 19b5adc
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/xyz-hub-service/src/main/java/com/here/xyz/hub/AbstractHttpServerVerticle.java b/xyz-hub-service/src/main/java/com/here/xyz/hub/AbstractHttpServerVerticle.java
@@ -83,7 +83,11 @@ protected Handler<RoutingContext> createMaxRequestSizeHandler() {
           }
         }
       }
-      context.next();
+      try{ context.next(); }
+      catch(IllegalArgumentException e)
+      { sendErrorResponse(context, new HttpException(BAD_REQUEST,"", e));
+        return;
+      }
     };
   }
 

diff --git a/xyz-hub-service/src/main/java/com/here/xyz/hub/config/dynamo/DynamoSpaceConfigClient.java b/xyz-hub-service/src/main/java/com/here/xyz/hub/config/dynamo/DynamoSpaceConfigClient.java
@@ -196,7 +196,16 @@ public Future<Space> deleteSpace(Marker marker, String spaceId) {
     logger.info(marker, "Deleting space ID: {}", spaceId);
     return get(marker, spaceId)
         .onFailure(t -> logger.error(marker, "Failure to get space ID: {} during space deletion", spaceId, t))
-        .onSuccess(space -> logger.info(marker, "Space ID: {} has been retrieved", space.getId()))
+        .compose(space -> {
+          if (space == null) {
+              String errMsg = String.format("Space ID: %s is null after retrieval during space deletion", spaceId);
+              logger.error(marker,errMsg);
+              return Future.failedFuture(errMsg);
+          } else {
+              logger.info(marker, "Space ID: {} has been retrieved", space.getId());
+              return Future.succeededFuture(space);
+          }
+        })
         .compose(space -> deleteSpaceFromPackages(marker, space).map(space))
         .compose(space -> {
           Promise<Space> p = Promise.promise();

diff --git a/xyz-hub-service/src/main/java/com/here/xyz/hub/task/SpaceTaskHandler.java b/xyz-hub-service/src/main/java/com/here/xyz/hub/task/SpaceTaskHandler.java
@@ -699,8 +699,11 @@ private static Future<Void> updateReadOnlyHeadVersion(Marker marker, Space space
     Space.resolveConnector(marker, space.getStorage().getId())
         .onSuccess(connector -> RpcClient.getInstanceFor(connector).execute(marker, event, ar -> {
           ChangesetsStatisticsResponse response = (ChangesetsStatisticsResponse) ar.result();
-          space.setReadOnlyHeadVersion(response.getMaxVersion());
-          p.complete();
+          if( response != null )
+          { space.setReadOnlyHeadVersion(response.getMaxVersion());
+            p.complete();
+          }
+          else p.fail("failed to get Changeset statistics");
         }))
         .onFailure(p::fail);
     return p.future();

diff --git a/xyz-jobs/xyz-job-steps/src/test/java/com/here/xyz/jobs/steps/impl/CopySpaceStepsTest.java b/xyz-jobs/xyz-job-steps/src/test/java/com/here/xyz/jobs/steps/impl/CopySpaceStepsTest.java
@@ -100,15 +100,15 @@ private static Stream<Arguments> provideParameters() {
         Arguments.of(false,null,false,null),
         Arguments.of(false,null,false,propertyFilter),
         Arguments.of(false, spatialSearchGeom,false,null),
-        Arguments.of(false, spatialSearchGeom,false,propertyFilter),
         Arguments.of(false, spatialSearchGeom,true,null),
+        Arguments.of(false, spatialSearchGeom,false,propertyFilter),
         Arguments.of(false, spatialSearchGeom,true,propertyFilter),
 
         Arguments.of(true,null,false,null),
         Arguments.of(true,null,false,propertyFilter),
         Arguments.of(true, spatialSearchGeom,false,null),
-        Arguments.of(true, spatialSearchGeom,false,propertyFilter),
         Arguments.of(true, spatialSearchGeom,true,null),
+        Arguments.of(true, spatialSearchGeom,false,propertyFilter),
         Arguments.of(true, spatialSearchGeom,true,propertyFilter)
     );
   }