Skip to content

Commit 20dc979

Browse files
goekaygoekay
committed
refactor
delete leftovers from old code structure (i.e. things related to "RequestTask" because we migrated to using "CommunicationTask") and move other task related classes from web/dto/task to /ocpp
1 parent 10d0794 commit 20dc979

13 files changed

Lines changed: 36 additions & 190 deletions

‎src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import de.rwth.idsg.steve.repository.dto.ChargePointSelect;
55
import de.rwth.idsg.steve.utils.StringUtils;
66
import de.rwth.idsg.steve.web.dto.ocpp.ChargePointSelection;
7-
import de.rwth.idsg.steve.web.dto.task.RequestResult;
8-
import de.rwth.idsg.steve.web.dto.task.RequestTaskOrigin;
97
import lombok.AccessLevel;
108
import lombok.Getter;
119
import org.joda.time.DateTime;
@@ -32,7 +30,7 @@ public abstract class CommunicationTask<S extends ChargePointSelection, RESPONSE
3230

3331
private final OcppVersion ocppVersion;
3432
private final String operationName;
35-
private final RequestTaskOrigin origin;
33+
private final TaskOrigin origin;
3634
private final String caller;
3735
protected final S params;
3836

@@ -52,13 +50,13 @@ public abstract class CommunicationTask<S extends ChargePointSelection, RESPONSE
5250
private ArrayList<OcppCallback<RESPONSE>> callbackList = new ArrayList<>(2);
5351

5452
public CommunicationTask(OcppVersion ocppVersion, S params) {
55-
this(ocppVersion, params, RequestTaskOrigin.INTERNAL, "SteVe");
53+
this(ocppVersion, params, TaskOrigin.INTERNAL, "SteVe");
5654
}
5755

5856
/**
5957
* Do not expose the constructor, make it package-private
6058
*/
61-
CommunicationTask(OcppVersion ocppVersion, S params, RequestTaskOrigin origin, String caller) {
59+
CommunicationTask(OcppVersion ocppVersion, S params, TaskOrigin origin, String caller) {
6260
List<ChargePointSelect> cpsList = params.getChargePointSelectList();
6361

6462
this.ocppVersion = ocppVersion;

‎src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public interface OcppCallback<T> {
1515

1616
/**
1717
* Relevant to WebSocket/JSON transport: Even though we have an error, this object is still a valid response from
18-
* charge point and RequestTask should treat it as such. {@link CommunicationTask#addNewError(String, String)}
18+
* charge point and the implementation should treat it as such. {@link CommunicationTask#addNewError(String, String)}
1919
* should be used when the request could not be delivered and there is a Java exception.
2020
*/
2121
void success(String chargeBoxId, OcppJsonError error);

src/main/java/de/rwth/idsg/steve/web/dto/task/RequestResult.java renamed to src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.rwth.idsg.steve.web.dto.task;
1+
package de.rwth.idsg.steve.ocpp;
22

33
import lombok.Getter;
44
import lombok.Setter;

src/main/java/de/rwth/idsg/steve/web/dto/task/RequestTaskOrigin.java renamed to src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.rwth.idsg.steve.web.dto.task;
1+
package de.rwth.idsg.steve.ocpp;
22

33
import lombok.RequiredArgsConstructor;
44

@@ -7,7 +7,7 @@
77
* @since 23.11.2015
88
*/
99
@RequiredArgsConstructor
10-
public enum RequestTaskOrigin {
10+
public enum TaskOrigin {
1111

1212
// When the action was triggered by SteVe internally (e.g. by the admin/user)
1313
INTERNAL,

src/main/java/de/rwth/idsg/steve/repository/RequestTaskStore.java renamed to src/main/java/de/rwth/idsg/steve/repository/TaskStore.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
import de.rwth.idsg.steve.ocpp.CommunicationTask;
44
import de.rwth.idsg.steve.repository.dto.TaskOverview;
5-
import de.rwth.idsg.steve.web.dto.task.RequestTask;
65

76
import java.util.List;
87

98
/**
109
* @author Sevket Goekay <goekay@dbis.rwth-aachen.de>
1110
* @since 29.12.2014
1211
*/
13-
public interface RequestTaskStore {
12+
public interface TaskStore {
1413
List<TaskOverview> getOverview();
1514
CommunicationTask get(Integer taskId);
1615
Integer add(CommunicationTask task);

‎src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.rwth.idsg.steve.repository.dto;
22

3-
import de.rwth.idsg.steve.web.dto.task.RequestTaskOrigin;
3+
import de.rwth.idsg.steve.ocpp.TaskOrigin;
44
import lombok.Builder;
55
import lombok.EqualsAndHashCode;
66
import lombok.Getter;
@@ -16,7 +16,7 @@
1616
public final class TaskOverview implements Comparable<TaskOverview> {
1717
private final int taskId, responseCount, requestCount;
1818
private final DateTime start, end;
19-
private final RequestTaskOrigin origin;
19+
private final TaskOrigin origin;
2020

2121
/**
2222
* We want the tasks to be printed in descending order.

src/main/java/de/rwth/idsg/steve/repository/impl/RequestTaskStoreImpl.java renamed to src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import de.rwth.idsg.steve.SteveException;
44
import de.rwth.idsg.steve.ocpp.CommunicationTask;
5-
import de.rwth.idsg.steve.repository.RequestTaskStore;
5+
import de.rwth.idsg.steve.repository.TaskStore;
66
import de.rwth.idsg.steve.repository.dto.TaskOverview;
77
import lombok.extern.slf4j.Slf4j;
88
import org.springframework.stereotype.Repository;
@@ -18,7 +18,7 @@
1818
*/
1919
@Slf4j
2020
@Repository
21-
public class RequestTaskStoreImpl implements RequestTaskStore {
21+
public class TaskStoreImpl implements TaskStore {
2222

2323
private final AtomicInteger atomicInteger = new AtomicInteger(0);
2424
private final ConcurrentHashMap<Integer, CommunicationTask> lookupTable = new ConcurrentHashMap<>();

‎src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import de.rwth.idsg.steve.ocpp.task.ResetTask;
1313
import de.rwth.idsg.steve.ocpp.task.UnlockConnectorTask;
1414
import de.rwth.idsg.steve.ocpp.task.UpdateFirmwareTask;
15-
import de.rwth.idsg.steve.repository.RequestTaskStore;
15+
import de.rwth.idsg.steve.repository.TaskStore;
1616
import de.rwth.idsg.steve.web.dto.ocpp.ChangeAvailabilityParams;
1717
import de.rwth.idsg.steve.web.dto.ocpp.ChangeConfigurationParams;
1818
import de.rwth.idsg.steve.web.dto.ocpp.GetDiagnosticsParams;
@@ -38,7 +38,7 @@
3838
public class ChargePointService12_Client {
3939

4040
@Autowired protected ScheduledExecutorService executorService;
41-
@Autowired protected RequestTaskStore requestTaskStore;
41+
@Autowired protected TaskStore taskStore;
4242

4343
@Autowired private ChargePointService12_InvokerImpl invoker12;
4444

@@ -61,7 +61,7 @@ public int changeAvailability(ChangeAvailabilityParams params) {
6161
.forEach(task.getParams().getChargePointSelectList())
6262
.execute(c -> getOcpp12Invoker().changeAvailability(c, task));
6363

64-
return requestTaskStore.add(task);
64+
return taskStore.add(task);
6565
}
6666

6767
public int changeConfiguration(ChangeConfigurationParams params) {
@@ -71,7 +71,7 @@ public int changeConfiguration(ChangeConfigurationParams params) {
7171
.forEach(task.getParams().getChargePointSelectList())
7272
.execute(c -> getOcpp12Invoker().changeConfiguration(c, task));
7373

74-
return requestTaskStore.add(task);
74+
return taskStore.add(task);
7575
}
7676

7777
public int clearCache(MultipleChargePointSelect params) {
@@ -81,7 +81,7 @@ public int clearCache(MultipleChargePointSelect params) {
8181
.forEach(task.getParams().getChargePointSelectList())
8282
.execute(c -> getOcpp12Invoker().clearCache(c, task));
8383

84-
return requestTaskStore.add(task);
84+
return taskStore.add(task);
8585
}
8686

8787
public int getDiagnostics(GetDiagnosticsParams params) {
@@ -91,7 +91,7 @@ public int getDiagnostics(GetDiagnosticsParams params) {
9191
.forEach(task.getParams().getChargePointSelectList())
9292
.execute(c -> getOcpp12Invoker().getDiagnostics(c, task));
9393

94-
return requestTaskStore.add(task);
94+
return taskStore.add(task);
9595
}
9696

9797
public int reset(ResetParams params) {
@@ -101,7 +101,7 @@ public int reset(ResetParams params) {
101101
.forEach(task.getParams().getChargePointSelectList())
102102
.execute(c -> getOcpp12Invoker().reset(c, task));
103103

104-
return requestTaskStore.add(task);
104+
return taskStore.add(task);
105105
}
106106

107107
public int updateFirmware(UpdateFirmwareParams params) {
@@ -111,7 +111,7 @@ public int updateFirmware(UpdateFirmwareParams params) {
111111
.forEach(task.getParams().getChargePointSelectList())
112112
.execute(c -> getOcpp12Invoker().updateFirmware(c, task));
113113

114-
return requestTaskStore.add(task);
114+
return taskStore.add(task);
115115
}
116116

117117
// -------------------------------------------------------------------------
@@ -125,7 +125,7 @@ public int remoteStartTransaction(RemoteStartTransactionParams params) {
125125
.forFirst(task.getParams().getChargePointSelectList())
126126
.execute(c -> getOcpp12Invoker().remoteStartTransaction(c, task));
127127

128-
return requestTaskStore.add(task);
128+
return taskStore.add(task);
129129
}
130130

131131
public int remoteStopTransaction(RemoteStopTransactionParams params) {
@@ -135,7 +135,7 @@ public int remoteStopTransaction(RemoteStopTransactionParams params) {
135135
.forFirst(task.getParams().getChargePointSelectList())
136136
.execute(c -> getOcpp12Invoker().remoteStopTransaction(c, task));
137137

138-
return requestTaskStore.add(task);
138+
return taskStore.add(task);
139139
}
140140

141141
public int unlockConnector(UnlockConnectorParams params) {
@@ -145,7 +145,7 @@ public int unlockConnector(UnlockConnectorParams params) {
145145
.forFirst(task.getParams().getChargePointSelectList())
146146
.execute(c -> getOcpp12Invoker().unlockConnector(c, task));
147147

148-
return requestTaskStore.add(task);
148+
return taskStore.add(task);
149149
}
150150

151151
}

‎src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public int dataTransfer(DataTransferParams params) {
6868
.forEach(task.getParams().getChargePointSelectList())
6969
.execute(c -> getOcpp15Invoker().dataTransfer(c, task));
7070

71-
return requestTaskStore.add(task);
71+
return taskStore.add(task);
7272
}
7373

7474
public int getConfiguration(GetConfigurationParams params) {
@@ -78,7 +78,7 @@ public int getConfiguration(GetConfigurationParams params) {
7878
.forEach(task.getParams().getChargePointSelectList())
7979
.execute(c -> getOcpp15Invoker().getConfiguration(c, task));
8080

81-
return requestTaskStore.add(task);
81+
return taskStore.add(task);
8282
}
8383

8484
public int getLocalListVersion(MultipleChargePointSelect params) {
@@ -88,7 +88,7 @@ public int getLocalListVersion(MultipleChargePointSelect params) {
8888
.forEach(task.getParams().getChargePointSelectList())
8989
.execute(c -> getOcpp15Invoker().getLocalListVersion(c, task));
9090

91-
return requestTaskStore.add(task);
91+
return taskStore.add(task);
9292
}
9393

9494
public int sendLocalList(SendLocalListParams params) {
@@ -98,7 +98,7 @@ public int sendLocalList(SendLocalListParams params) {
9898
.forEach(task.getParams().getChargePointSelectList())
9999
.execute(c -> getOcpp15Invoker().sendLocalList(c, task));
100100

101-
return requestTaskStore.add(task);
101+
return taskStore.add(task);
102102
}
103103

104104

@@ -126,7 +126,7 @@ public int reserveNow(ReserveNowParams params) {
126126
.forFirst(task.getParams().getChargePointSelectList())
127127
.execute(c -> getOcpp15Invoker().reserveNow(c, task));
128128

129-
return requestTaskStore.add(task);
129+
return taskStore.add(task);
130130
}
131131

132132
public int cancelReservation(CancelReservationParams params) {
@@ -136,7 +136,7 @@ public int cancelReservation(CancelReservationParams params) {
136136
.forFirst(task.getParams().getChargePointSelectList())
137137
.execute(c -> getOcpp15Invoker().cancelReservation(c, task));
138138

139-
return requestTaskStore.add(task);
139+
return taskStore.add(task);
140140
}
141141

142142

‎src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ public int triggerMessage(TriggerMessageParams params) {
4949
.forEach(task.getParams().getChargePointSelectList())
5050
.execute(c -> getOcpp16Invoker().triggerMessage(c, task));
5151

52-
return requestTaskStore.add(task);
52+
return taskStore.add(task);
5353
}
5454
}

0 commit comments

Comments
 (0)