didinst/ocpp16-csms-stub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Stop transaction logging

Browse Source
This commit is contained in:
didinst
2023-12-23 17:18:34 +03:00
parent 9e2cc2f657
commit 103d5bb8a4
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yablochkov/ocppstub/EventHandler.java
+5 -2
View File
@@ -76,12 +76,15 @@ public class EventHandler implements ServerCoreEventHandler, ServerEvents {
@Override @Override
public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionIndex, StopTransactionRequest request) { public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionIndex, StopTransactionRequest request) {
log.info("Stop transaction request {}", request); log.info("Stop transaction request {}", request);
transactionService.stopByRequest(sessionIndex, request.getTransactionId()); var transactionId = request.getTransactionId();
transactionService.stopByRequest(sessionIndex, transactionId);
log.info("Prepare stop confirmation");
var confirmation = new StopTransactionConfirmation(); var confirmation = new StopTransactionConfirmation();
Optional.ofNullable(request.getIdTag()) Optional.ofNullable(request.getIdTag())
.ifPresent((idTag) -> confirmation.setIdTagInfo(new IdTagInfo(AuthorizationStatus.Expired))); .ifPresent((idTag) -> confirmation.setIdTagInfo(new IdTagInfo(AuthorizationStatus.Expired)));
log.info("Stop transaction {}, with idTag {} for session {}", request.getTransactionId(), request.getIdTag(), sessionIndex);
log.info("Stop transaction {}, with idTag {} for session {}", transactionId, request.getIdTag(), sessionIndex);
return confirmation; return confirmation;
} }
src/main/java/com/yablochkov/ocppstub/TransactionService.java
+7 -3
View File
@@ -15,6 +15,7 @@ import eu.chargetime.ocpp.model.core.StartTransactionConfirmation;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -55,9 +56,12 @@ public class TransactionService {
var identity = sessionService.getIdentityBySessionId(sessionIndex); var identity = sessionService.getIdentityBySessionId(sessionIndex);
log.info("Try to stop transaction for {}, with id {}", identity, transactionId); log.info("Try to stop transaction for {}, with id {}", identity, transactionId);
if (Objects.nonNull(identity)) { Optional.ofNullable(identity)
transactionMap.remove(identity); .map(transactionMap::remove)
} .filter(Objects::nonNull)
.ifPresentOrElse(
(id) -> log.info("Transaction id {} removed ({} requested)", id, transactionId),
() -> log.info("Nothing to remove for {}", transactionId));
} }
public RemoteStartTransactionConfirmation remoteStart(String id, Integer connectorId) { public RemoteStartTransactionConfirmation remoteStart(String id, Integer connectorId) {