Review comments and minimized complexity

Author: jboon

osgp/platform/osgp-throttling-service/src/main/java/org/opensmartgridplatform/throttling/model/PermitRequest.java

@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: Copyright Contributors to the GXF project
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package org.opensmartgridplatform.throttling.model;
 
 import java.util.UUID;

osgp/platform/osgp-throttling-service/src/main/java/org/opensmartgridplatform/throttling/services/RedisPermitService.java

@@ -62,42 +62,10 @@ public boolean createPermit(
 
     try {
       if (lock.tryLock(this.tryLockTimeMs, TimeUnit.MILLISECONDS)) {
-
         try {
-          final RScoredSortedSet<Permit> permits =
-              this.redisson.getScoredSortedSet(permitKey.key());
-          final int numberOfRegisteredPermits = permits.size();
-
-          log.debug(
-              "Trying to register a permit for request[{}] with permit key {}. (max-concurrent-requests: {}, number-of-registered-permits: {})",
-              permitRequest.getRequestId(),
-              permitKey.key(),
-              maxConcurrentRequests,
-              numberOfRegisteredPermits);
-
-          // get waiting room for key
-          final RScoredSortedSet<PermitRequest> lobby =
-              this.redisson.getScoredSortedSet(permitKey.lobby());
-
-          // if prio = default and waiting room size > 0 => EXIT (granted = false)
-          if (highPrio || lobby.isEmpty()) {
-
-            if (maxConcurrentRequests < 0 || numberOfRegisteredPermits < maxConcurrentRequests) {
-              granted =
-                  permits.add(
-                      Instant.now().toEpochMilli(), new Permit(networkSegment, permitRequest));
-            }
-
-            if (highPrio) {
-              if (granted) {
-                // if granted = true and prio = high and in waiting room => remove from waiting room
-                lobby.remove(permitRequest);
-              } else {
-                // if granted = false and prio = high and not in waiting room => add to waiting room
-                lobby.addIfAbsent(Instant.now().toEpochMilli(), permitRequest);
-              }
-            }
-          }
+          granted =
+              this.tryRegisterPermit(
+                  networkSegment, permitRequest, maxConcurrentRequests, highPrio, permitKey);
         } finally {
           lock.unlock();
         }
@@ -110,6 +78,56 @@ public boolean createPermit(
     return granted;
   }
 
+  private boolean tryRegisterPermit(
+      final NetworkSegment networkSegment,
+      final PermitRequest permitRequest,
+      final int maxConcurrentRequests,
+      final boolean highPrio,
+      final PermitKey permitKey) {
+    boolean granted = false;
+
+    final RScoredSortedSet<PermitRequest> lobby =
+        this.redisson.getScoredSortedSet(permitKey.lobby());
+
+    if (highPrio || lobby.isEmpty()) {
+      final RScoredSortedSet<Permit> permits = this.redisson.getScoredSortedSet(permitKey.key());
+      final int numberOfRegisteredPermits = permits.size();
+
+      log.debug(
+          "Trying to register a permit for request[{}] (max-concurrent-requests: {}, number-of-registered-permits: {})",
+          permitRequest.getRequestId(),
+          maxConcurrentRequests,
+          numberOfRegisteredPermits);
+
+      if (this.permitsAvailable(maxConcurrentRequests, numberOfRegisteredPermits)) {
+        granted =
+            permits.add(Instant.now().toEpochMilli(), new Permit(networkSegment, permitRequest));
+      }
+
+      if (highPrio) {
+        this.updateLobby(permitRequest, granted, lobby);
+      }
+    }
+
+    return granted;
+  }
+
+  private boolean permitsAvailable(
+      final int maxConcurrentRequests, final int numberOfRegisteredPermits) {
+    return maxConcurrentRequests < 0 || numberOfRegisteredPermits < maxConcurrentRequests;
+  }
+
+  private void updateLobby(
+      final PermitRequest permitRequest,
+      final boolean granted,
+      final RScoredSortedSet<PermitRequest> lobby) {
+    if (granted) {
+      lobby.remove(permitRequest);
+    } else {
+      lobby.addIfAbsent(Instant.now().toEpochMilli(), permitRequest);
+    }
+  }
+
   @Override
   public boolean removePermit(
       final NetworkSegment networkSegment, final PermitRequest permitRequest) {

osgp/platform/osgp-throttling-service/src/test/java/org/opensmartgridplatform/throttling/services/RedisPermitServiceTest.java

@@ -109,7 +109,7 @@ void testCreatePermitWhileHighPrioIsInLobby() {
 
     final PermitKey permitKey = this.createPermitKey();
     this.prepareLock(permitKey);
-    this.preparePermitsSet(permitKey, 0, false);
+    this.preparePermitsSet(permitKey, -1, false);
     this.prepareLobby(permitKey, true);
 
     final boolean created =
@@ -226,7 +226,10 @@ private void prepareLock(final PermitKey permitKey) {
   private void preparePermitsSet(final PermitKey permitKey, final int size, final boolean stubAdd) {
     when(this.redissonClient.getScoredSortedSet(permitKey.key()))
         .thenAnswer(invocation -> this.permits);
-    when(this.permits.size()).thenReturn(size);
+
+    if (size >= 0) {
+      when(this.permits.size()).thenReturn(size);
+    }
 
     if (stubAdd) {
       when(this.permits.add(anyDouble(), any(Permit.class))).thenReturn(true);