add locks in ChargePointRepositoryImpl.isRegistered(..)

Author: goekay

src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java

@@ -1,5 +1,6 @@
 package de.rwth.idsg.steve.repository.impl;
 
+import com.google.common.util.concurrent.Striped;
 import de.rwth.idsg.steve.SteveException;
 import de.rwth.idsg.steve.ocpp.OcppProtocol;
 import de.rwth.idsg.steve.ocpp.OcppTransport;
@@ -31,6 +32,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.locks.Lock;
 import java.util.stream.Collectors;
 
 import static de.rwth.idsg.steve.SteveConfiguration.CONFIG;
@@ -49,6 +51,8 @@
 public class ChargePointRepositoryImpl implements ChargePointRepository {
 
     private final boolean autoRegisterUnknownStations = CONFIG.getOcpp().isAutoRegisterUnknownStations();
+    private final Striped<Lock> isRegisteredLocks = Striped.lock(16);
+
     private final DSLContext ctx;
     private final AddressRepository addressRepository;
 
@@ -60,24 +64,30 @@ public ChargePointRepositoryImpl(DSLContext ctx, AddressRepository addressReposi
 
     @Override
     public boolean isRegistered(String chargeBoxId) {
-        // 1. exit if already registered
-        if (isRegisteredInternal(chargeBoxId)) {
-            return true;
-        }
+        Lock l = isRegisteredLocks.get(chargeBoxId);
+        l.lock();
+        try {
+            // 1. exit if already registered
+            if (isRegisteredInternal(chargeBoxId)) {
+                return true;
+            }
 
-        // 2. ok, this chargeBoxId is unknown. exit if auto-register is disabled
-        if (!autoRegisterUnknownStations) {
-            return false;
-        }
+            // 2. ok, this chargeBoxId is unknown. exit if auto-register is disabled
+            if (!autoRegisterUnknownStations) {
+                return false;
+            }
 
-        // 3. chargeBoxId is unknown and auto-register is enabled. insert chargeBoxId
-        try {
-            addChargePoint(Collections.singletonList(chargeBoxId));
-            log.warn("Auto-registered unknown chargebox '{}'", chargeBoxId);
-            return true;
-        } catch (Exception e) {
-            log.error("Failed to auto-register unknown chargebox '" + chargeBoxId + "'", e);
-            return false;
+            // 3. chargeBoxId is unknown and auto-register is enabled. insert chargeBoxId
+            try {
+                addChargePoint(Collections.singletonList(chargeBoxId));
+                log.warn("Auto-registered unknown chargebox '{}'", chargeBoxId);
+                return true;
+            } catch (Exception e) {
+                log.error("Failed to auto-register unknown chargebox '" + chargeBoxId + "'", e);
+                return false;
+            }
+        } finally {
+            l.unlock();
         }
     }