Skip to content

Commit 71180a9

Browse files
fix constructor
1 parent 508c5ac commit 71180a9

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitRunContext.java

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,22 @@
66
*/
77
package org.gridsuite.voltageinit.server.service;
88

9-
import lombok.Getter;
9+
import lombok.AllArgsConstructor;
10+
import lombok.Data;
11+
import lombok.NonNull;
1012

13+
import java.util.HashMap;
1114
import java.util.Map;
12-
import java.util.Objects;
1315
import java.util.UUID;
1416

1517
/**
1618
* @author Etienne Homer <etienne.homer at rte-france.com>
1719
*/
18-
@Getter
20+
@Data
21+
@AllArgsConstructor
1922
public class VoltageInitRunContext {
2023

24+
@NonNull
2125
private final UUID networkUuid;
2226

2327
private final String variantId;
@@ -36,15 +40,7 @@ public class VoltageInitRunContext {
3640

3741
private final Map<String, Double> voltageLevelsIdsRestricted;
3842

39-
public VoltageInitRunContext(UUID networkUuid, String variantId, String receiver, UUID reportUuid, String reporterId, String reportType, String userId, UUID parametersUuid, Map<String, Double> voltageLevelsIdsRestricted) {
40-
this.networkUuid = Objects.requireNonNull(networkUuid);
41-
this.variantId = variantId;
42-
this.receiver = receiver;
43-
this.reportUuid = reportUuid;
44-
this.reporterId = reporterId;
45-
this.reportType = reportType;
46-
this.userId = userId;
47-
this.parametersUuid = parametersUuid;
48-
this.voltageLevelsIdsRestricted = voltageLevelsIdsRestricted;
43+
public VoltageInitRunContext(@NonNull UUID networkUuid, String variantId, String receiver, UUID reportUuid, String reporterId, String reportType, String userId, UUID parametersUuid) {
44+
this(networkUuid, variantId, receiver, reportUuid, reporterId, reportType, userId, parametersUuid, new HashMap<>());
4945
}
5046
}

src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ public VoltageInitService(NotificationService notificationService,
4545
}
4646

4747
public UUID runAndSaveResult(UUID networkUuid, String variantId, String receiver, UUID reportUuid, String reporterId, String userId, String reportType, UUID parametersUuid) {
48-
VoltageInitRunContext runContext = new VoltageInitRunContext(networkUuid, variantId, receiver, reportUuid, reporterId, reportType, userId, parametersUuid, new HashMap<>());
49-
Objects.requireNonNull(runContext);
50-
var resultUuid = uuidGeneratorService.generate();
48+
final VoltageInitRunContext runContext = new VoltageInitRunContext(networkUuid, variantId, receiver, reportUuid, reporterId, reportType, userId, parametersUuid);
49+
final UUID resultUuid = uuidGeneratorService.generate();
5150

5251
// update status to running status
5352
setStatus(List.of(resultUuid), VoltageInitStatus.RUNNING.name());

0 commit comments

Comments
 (0)