fix code smells

DP-3T · Sep 14, 2020 · 3dd66bd · 3dd66bd
1 parent ce3d8e9
commit 3dd66bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 23 deletions.
diff --git a/...ppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/controller/DebugController.java b/...ppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/controller/DebugController.java
@@ -22,8 +22,6 @@
 import org.dpppt.backend.sdk.ws.security.ValidateRequest.WrongScopeException;
 import org.dpppt.backend.sdk.ws.security.signature.ProtoSignature;
 import org.dpppt.backend.sdk.ws.util.ValidationUtils.BadBatchReleaseTimeException;
-import org.dpppt.backend.sdk.ws.util.ValidationUtils.DelayedKeyDateClaimIsMissing;
-import org.dpppt.backend.sdk.ws.util.ValidationUtils.DelayedKeyDateIsInvalid;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -71,8 +69,7 @@ public DebugController(
       @RequestHeader(value = "User-Agent", required = true) String userAgent,
       @RequestHeader(value = "X-Device-Name", required = true) String deviceName,
       @AuthenticationPrincipal Object principal)
-      throws InvalidDateException, ClaimIsBeforeOnsetException, WrongScopeException,
-          InsertException {
+      throws WrongScopeException, InsertException {
     var now = UTCInstant.now();
     this.validateRequest.isValid(principal);
 
@@ -141,19 +138,6 @@ private void normalizeRequestTime(long now) {
     }
   }
 
-  @ExceptionHandler({DelayedKeyDateClaimIsMissing.class})
-  @ResponseStatus(HttpStatus.BAD_REQUEST)
-  public ResponseEntity<String> delayedClaimIsWrong() {
-    return ResponseEntity.badRequest().body("DelayedKeyDateClaim is wrong");
-  }
-
-  @ExceptionHandler({DelayedKeyDateIsInvalid.class})
-  @ResponseStatus(HttpStatus.BAD_REQUEST)
-  public ResponseEntity<String> delayedKeyDateIsInvalid() {
-    return ResponseEntity.badRequest()
-        .body("DelayedKeyDate must be between yesterday and tomorrow");
-  }
-
   @ExceptionHandler({
     IllegalArgumentException.class,
     InvalidDateException.class,

diff --git a/...pt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/insertmanager/InsertManager.java b/...pt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/insertmanager/InsertManager.java
@@ -78,9 +78,7 @@ public void insertIntoDatabase(
     var internalKeys = filterAndModify(keys, header, principal, now);
     // if no keys remain or this is a fake request, just return. Else, insert the
     // remaining keys.
-    if (internalKeys.isEmpty() || validationUtils.jwtIsFake(principal)) {
-      return;
-    } else {
+    if (!internalKeys.isEmpty() && !validationUtils.jwtIsFake(principal)) {
       dataService.upsertExposees(internalKeys, now);
     }
   }
@@ -94,9 +92,7 @@ public void insertIntoDatabaseDEBUG(
     var internalKeys = filterAndModify(keys, header, principal, now);
     // if no keys remain or this is a fake request, just return. Else, insert the
     // remaining keys.
-    if (internalKeys.isEmpty() || validationUtils.jwtIsFake(principal)) {
-      return;
-    } else {
+    if (!internalKeys.isEmpty() && !validationUtils.jwtIsFake(principal)) {
       debugDataService.upsertExposees(deviceName, internalKeys);
     }
   }