Skip to content

Commit 79816b6

Browse files
goekaygoekay
committed
refactor: make Ocpp15Controller extend Ocpp12Controller
1 parent b5ad540 commit 79816b6

4 files changed

Lines changed: 68 additions & 239 deletions

File tree

‎src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
@RequestMapping(value = "/manager/operations/v1.2")
3434
public class Ocpp12Controller {
3535

36-
@Autowired private ChargePointHelperService chargePointHelperService;
37-
@Autowired private OcppTagRepository ocppTagRepository;
36+
@Autowired protected ChargePointHelperService chargePointHelperService;
37+
@Autowired protected OcppTagRepository ocppTagRepository;
3838

3939
@Autowired
4040
@Qualifier("ChargePointService12_Client")
41-
private ChargePointService12_Client client;
41+
private ChargePointService12_Client client12;
4242

43-
private static final String PARAMS = "params";
43+
protected static final String PARAMS = "params";
4444

4545
// -------------------------------------------------------------------------
4646
// Paths
@@ -56,24 +56,20 @@ public class Ocpp12Controller {
5656
private static final String UNLOCK_CON_PATH = "/UnlockConnector";
5757
private static final String UPDATE_FIRM_PATH = "/UpdateFirmware";
5858

59-
private static final String REDIRECT_TASKS_PATH = "redirect:/manager/operations/tasks/";
59+
protected static final String REDIRECT_TASKS_PATH = "redirect:/manager/operations/tasks/";
6060

6161
// -------------------------------------------------------------------------
6262
// Helpers
6363
// -------------------------------------------------------------------------
6464

65-
protected ChargePointService12_Client getClient() {
66-
return client;
65+
protected ChargePointService12_Client getClient12() {
66+
return client12;
6767
}
6868

6969
protected void setChargePointList(Model model) {
7070
model.addAttribute("cpList", chargePointHelperService.getChargePointsV12());
7171
}
7272

73-
protected void setActiveUserIdTagList(Model model) {
74-
model.addAttribute("idTagList", ocppTagRepository.getActiveIdTags());
75-
}
76-
7773
protected Map<String, String> getConfigurationKeys() {
7874
return ConfigurationKeyEnum.OCPP_12_MAP;
7975
}
@@ -86,6 +82,10 @@ protected String getPrefix() {
8682
return "op12";
8783
}
8884

85+
protected void setActiveUserIdTagList(Model model) {
86+
model.addAttribute("idTagList", ocppTagRepository.getActiveIdTags());
87+
}
88+
8989
// -------------------------------------------------------------------------
9090
// Http methods (GET)
9191
// -------------------------------------------------------------------------
@@ -171,7 +171,7 @@ public String postChangeAvail(@Valid @ModelAttribute(PARAMS) ChangeAvailabilityP
171171
setChargePointList(model);
172172
return getPrefix() + CHANGE_AVAIL_PATH;
173173
}
174-
return REDIRECT_TASKS_PATH + client.changeAvailability(params);
174+
return REDIRECT_TASKS_PATH + getClient12().changeAvailability(params);
175175
}
176176

177177
@RequestMapping(value = CHANGE_CONF_PATH, method = RequestMethod.POST)
@@ -181,7 +181,7 @@ public String postChangeConf(@Valid @ModelAttribute(PARAMS) ChangeConfigurationP
181181
setChargePointList(model);
182182
return getPrefix() + CHANGE_CONF_PATH;
183183
}
184-
return REDIRECT_TASKS_PATH + getClient().changeConfiguration(params);
184+
return REDIRECT_TASKS_PATH + getClient12().changeConfiguration(params);
185185
}
186186

187187
@RequestMapping(value = CLEAR_CACHE_PATH, method = RequestMethod.POST)
@@ -191,7 +191,7 @@ public String postClearCache(@Valid @ModelAttribute(PARAMS) MultipleChargePointS
191191
setChargePointList(model);
192192
return getPrefix() + CLEAR_CACHE_PATH;
193193
}
194-
return REDIRECT_TASKS_PATH + getClient().clearCache(params);
194+
return REDIRECT_TASKS_PATH + getClient12().clearCache(params);
195195
}
196196

197197
@RequestMapping(value = GET_DIAG_PATH, method = RequestMethod.POST)
@@ -201,7 +201,7 @@ public String postGetDiag(@Valid @ModelAttribute(PARAMS) GetDiagnosticsParams pa
201201
setChargePointList(model);
202202
return getPrefix() + GET_DIAG_PATH;
203203
}
204-
return REDIRECT_TASKS_PATH + getClient().getDiagnostics(params);
204+
return REDIRECT_TASKS_PATH + getClient12().getDiagnostics(params);
205205
}
206206

207207
@RequestMapping(value = REMOTE_START_TX_PATH, method = RequestMethod.POST)
@@ -212,7 +212,7 @@ public String postRemoteStartTx(@Valid @ModelAttribute(PARAMS) RemoteStartTransa
212212
setActiveUserIdTagList(model);
213213
return getPrefix() + REMOTE_START_TX_PATH;
214214
}
215-
return REDIRECT_TASKS_PATH + getClient().remoteStartTransaction(params);
215+
return REDIRECT_TASKS_PATH + getClient12().remoteStartTransaction(params);
216216
}
217217

218218
@RequestMapping(value = REMOTE_STOP_TX_PATH, method = RequestMethod.POST)
@@ -222,7 +222,7 @@ public String postRemoteStopTx(@Valid @ModelAttribute(PARAMS) RemoteStopTransact
222222
setChargePointList(model);
223223
return getPrefix() + REMOTE_STOP_TX_PATH;
224224
}
225-
return REDIRECT_TASKS_PATH + getClient().remoteStopTransaction(params);
225+
return REDIRECT_TASKS_PATH + getClient12().remoteStopTransaction(params);
226226
}
227227

228228
@RequestMapping(value = RESET_PATH, method = RequestMethod.POST)
@@ -232,7 +232,7 @@ public String postReset(@Valid @ModelAttribute(PARAMS) ResetParams params,
232232
setChargePointList(model);
233233
return getPrefix() + RESET_PATH;
234234
}
235-
return REDIRECT_TASKS_PATH + getClient().reset(params);
235+
return REDIRECT_TASKS_PATH + getClient12().reset(params);
236236
}
237237

238238
@RequestMapping(value = UNLOCK_CON_PATH, method = RequestMethod.POST)
@@ -242,7 +242,7 @@ public String postUnlockCon(@Valid @ModelAttribute(PARAMS) UnlockConnectorParams
242242
setChargePointList(model);
243243
return getPrefix() + UNLOCK_CON_PATH;
244244
}
245-
return REDIRECT_TASKS_PATH + getClient().unlockConnector(params);
245+
return REDIRECT_TASKS_PATH + getClient12().unlockConnector(params);
246246
}
247247

248248
@RequestMapping(value = UPDATE_FIRM_PATH, method = RequestMethod.POST)
@@ -252,6 +252,6 @@ public String postUpdateFirm(@Valid @ModelAttribute(PARAMS) UpdateFirmwareParams
252252
setChargePointList(model);
253253
return getPrefix() + UPDATE_FIRM_PATH;
254254
}
255-
return REDIRECT_TASKS_PATH + getClient().updateFirmware(params);
255+
return REDIRECT_TASKS_PATH + getClient12().updateFirmware(params);
256256
}
257257
}

0 commit comments

Comments
 (0)