Skip to content

Commit fa6f565

Browse files
goekaygoekay
committed
improve TriggerMessage impl
1 parent fec64b8 commit fa6f565

7 files changed

Lines changed: 48 additions & 44 deletions

File tree

‎src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
package de.rwth.idsg.steve.ocpp.task;
22

3-
import de.rwth.idsg.steve.ocpp.*;
3+
import de.rwth.idsg.steve.ocpp.CommunicationTask;
4+
import de.rwth.idsg.steve.ocpp.OcppCallback;
5+
import de.rwth.idsg.steve.ocpp.OcppVersion;
6+
import de.rwth.idsg.steve.ocpp.RequestType;
7+
import de.rwth.idsg.steve.ocpp.ResponseType;
48
import de.rwth.idsg.steve.web.dto.ocpp.TriggerMessageParams;
9+
import ocpp.cp._2015._10.MessageTrigger;
510

611
import javax.xml.ws.AsyncHandler;
712

@@ -36,7 +41,7 @@ public <T extends RequestType> T getOcpp15Request() {
3641
public ocpp.cp._2015._10.TriggerMessageRequest getOcpp16Request() {
3742
return new ocpp.cp._2015._10.TriggerMessageRequest()
3843
.withConnectorId(params.getConnectorId())
39-
.withRequestedMessage(params.getTriggerMessage());
44+
.withRequestedMessage(MessageTrigger.fromValue(params.getTriggerMessage().value()));
4045
}
4146

4247
@Deprecated
@@ -55,7 +60,7 @@ public <T extends ResponseType> AsyncHandler<T> getOcpp15Handler(String chargeBo
5560
public AsyncHandler<ocpp.cp._2015._10.TriggerMessageResponse> getOcpp16Handler(String chargeBoxId) {
5661
return res -> {
5762
try {
58-
success(chargeBoxId, String.valueOf(res.get().getStatus().value()));
63+
success(chargeBoxId, res.get().getStatus().value());
5964
} catch (Exception e) {
6065
failed(chargeBoxId, e);
6166
}

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
import de.rwth.idsg.steve.service.ChargePointService12_Client;
44
import de.rwth.idsg.steve.service.ChargePointService15_Client;
55
import de.rwth.idsg.steve.service.ChargePointService16_Client;
6-
import de.rwth.idsg.steve.web.dto.ocpp.*;
6+
import de.rwth.idsg.steve.web.dto.ocpp.ChangeConfigurationParams;
7+
import de.rwth.idsg.steve.web.dto.ocpp.ConfigurationKeyEnum;
8+
import de.rwth.idsg.steve.web.dto.ocpp.GetConfigurationParams;
9+
import de.rwth.idsg.steve.web.dto.ocpp.TriggerMessageParams;
710
import org.springframework.beans.factory.annotation.Autowired;
811
import org.springframework.beans.factory.annotation.Qualifier;
912
import org.springframework.stereotype.Controller;
@@ -83,10 +86,6 @@ protected String getPrefix() {
8386
return "op16";
8487
}
8588

86-
private void setTriggerMessages(Model model) {
87-
model.addAttribute("triggerMessage", TriggerMessageEnum.values());
88-
}
89-
9089
// -------------------------------------------------------------------------
9190
// Old Http methods with changed logic
9291
// -------------------------------------------------------------------------
@@ -143,7 +142,6 @@ public String getSetChargingProfile(Model model) {
143142
@RequestMapping(value = TRIGGER_MESSAGE_PATH, method = RequestMethod.GET)
144143
public String getTriggerMessage(Model model) {
145144
setCommonAttributes(model);
146-
setTriggerMessages(model);
147145
model.addAttribute(PARAMS, new TriggerMessageParams());
148146
return getPrefix() + TRIGGER_MESSAGE_PATH;
149147
}
@@ -157,7 +155,6 @@ public String postTriggerMessage(@Valid @ModelAttribute(PARAMS) TriggerMessagePa
157155
BindingResult result, Model model) {
158156
if (result.hasErrors()) {
159157
setCommonAttributes(model);
160-
setTriggerMessages(model);
161158
return getPrefix() + TRIGGER_MESSAGE_PATH;
162159
}
163160
return REDIRECT_TASKS_PATH + getClient16().triggerMessage(params);

‎src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
package de.rwth.idsg.steve.web.dto.ocpp;
22

3-
import lombok.Getter;
4-
53
/**
4+
* @author Sevket Goekay <goekay@dbis.rwth-aachen.de>
65
* @author David Rerimassie <david@rerimassie.nl>
76
* @since 20.03.2018
87
*/
98
public enum TriggerMessageEnum {
10-
BOOT_NOTIFICATION("BootNotification"),
11-
DIAGNOSTICS_STATUS_NOTIFICATION("DiagnosticsStatusNotification"),
12-
FIRMWARE_STATUS_NOTIFICATION("FirmwareStatusNotification"),
13-
HEARTBEAT("Heartbeat"),
14-
METER_VALUES("MeterValues"),
15-
STATUS_NOTIFICATION("StatusNotification");
9+
10+
BootNotification("BootNotification"),
11+
DiagnosticsStatusNotification("DiagnosticsStatusNotification"),
12+
FirmwareStatusNotification("FirmwareStatusNotification"),
13+
Heartbeat("Heartbeat"),
14+
MeterValues("MeterValues"),
15+
StatusNotification("StatusNotification");
1616

1717
private final String value;
18-
@Getter private final String text;
1918

2019
TriggerMessageEnum(String value) {
2120
this.value = value;
22-
this.text = String.format("%s", value);
2321
}
2422

2523
public String value() {
2624
return value;
2725
}
2826

2927
public static TriggerMessageEnum fromValue(String v) {
30-
for (TriggerMessageEnum c: TriggerMessageEnum.values()) {
28+
for (TriggerMessageEnum c : TriggerMessageEnum.values()) {
3129
if (c.value.equals(v)) {
3230
return c;
3331
}

‎src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java‎

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

33
import lombok.Getter;
44
import lombok.Setter;
5-
import ocpp.cp._2015._10.MessageTrigger;
65

6+
import javax.validation.constraints.Min;
77
import javax.validation.constraints.NotNull;
88

99
/**
@@ -13,8 +13,10 @@
1313
@Setter
1414
@Getter
1515
public class TriggerMessageParams extends MultipleChargePointSelect {
16+
1617
@NotNull(message = "Requested Message required")
17-
private MessageTrigger triggerMessage;
18+
private TriggerMessageEnum triggerMessage;
1819

20+
@Min(value = 1, message = "Connector ID must be at least {value}")
1921
private Integer connectorId;
2022
}

‎src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessage.jsp‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<form:form action="${ctxPath}/manager/operations/${opVersion}/TriggerMessage" modelAttribute="params">
2+
<section><span>Charge Points with OCPP ${opVersion}</span></section>
3+
<%@ include file="../00-cp-multiple.jsp" %>
4+
<section><span>Parameters</span></section>
5+
<table class="userInput">
6+
<tr>
7+
<td>Trigger Message:</td>
8+
<td>
9+
<form:select path="triggerMessage">
10+
<form:options items="${triggerMessage}"/>
11+
</form:select>
12+
</td>
13+
</tr>
14+
<tr>
15+
<td>Connector ID (integer):</td>
16+
<td><form:input path="connectorId" placeholder="if empty, charge point as a whole"/></td>
17+
</tr>
18+
<tr>
19+
<td></td><td><div class="submit-button"><input type="submit" value="Perform"></div></td>
20+
</tr>
21+
</table>
22+
</form:form>

‎src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
</ul>
2828
</div>
2929
<div class="op16-content">
30-
<%@ include file="../op-forms/TriggerMessage.jsp" %>
30+
<%@ include file="../op-forms/TriggerMessageForm.jsp" %>
3131
</div></div>
3232
<%@ include file="../00-footer.jsp" %>

0 commit comments

Comments
 (0)