Skip to content

Commit 9aefe9a

Browse files
author
Dennis Labordus
committed
Fixed test and renamed model and encoder/decoder.
Signed-off-by: Dennis Labordus <[email protected]>
1 parent c123d5c commit 9aefe9a

File tree

66 files changed

+298
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+298
-299
lines changed

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/CreateRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI;
1717

1818
@Schema(description = "Request to create a new entry in the database containing the SCL Element content.")
19-
@XmlRootElement(name = "CreateRequest", namespace = SCL_DATA_SERVICE_V1_NS_URI)
19+
@XmlRootElement(name = "CreateWsRequest", namespace = SCL_DATA_SERVICE_V1_NS_URI)
2020
@XmlAccessorType(XmlAccessType.FIELD)
2121
public class CreateRequest {
2222
@FilenameValid

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/CreateResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI;
1414

1515
@Schema(description = "Response from creating a new entry in the database containing the SCL Element content.")
16-
@XmlRootElement(name = "CreateResponse", namespace = SCL_DATA_SERVICE_V1_NS_URI)
16+
@XmlRootElement(name = "CreateWsResponse", namespace = SCL_DATA_SERVICE_V1_NS_URI)
1717
@XmlAccessorType(XmlAccessType.FIELD)
1818
public class CreateResponse {
1919
@Schema(description = "The XML Content of the updated SCL added to the database. The content contains a XML according to the IEC 61850 standard.",

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/GetResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI;
1515

1616
@Schema(description = "Response from retrieving a SCL from the database containing the SCL Content.")
17-
@XmlRootElement(name = "GetResponse", namespace = SCL_DATA_SERVICE_V1_NS_URI)
17+
@XmlRootElement(name = "GetWsResponse", namespace = SCL_DATA_SERVICE_V1_NS_URI)
1818
@XmlAccessorType(XmlAccessType.FIELD)
1919
public class GetResponse {
2020
@Schema(description = "The XML Content of the retrieved SCL from the database. The content contains a XML according to the IEC 61850 standard.",

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UpdateRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
@Schema(description = "Request to update an existing entry in the database containing the SCL Element content. " +
2020
"A new version is created and the old version is also kept.")
21-
@XmlRootElement(name = "UpdateRequest", namespace = SCL_DATA_SERVICE_V1_NS_URI)
21+
@XmlRootElement(name = "UpdateWsRequest", namespace = SCL_DATA_SERVICE_V1_NS_URI)
2222
@XmlAccessorType(XmlAccessType.FIELD)
2323
public class UpdateRequest {
2424
@NotNull(message = "{org.lfenergy.compas.changeset.notnull.message}")

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UpdateResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI;
1515

1616
@Schema(description = "Response from updating a new entry in the database containing the SCL Element content.")
17-
@XmlRootElement(name = "UpdateResponse", namespace = SCL_DATA_SERVICE_V1_NS_URI)
17+
@XmlRootElement(name = "UpdateWsResponse", namespace = SCL_DATA_SERVICE_V1_NS_URI)
1818
@XmlAccessorType(XmlAccessType.FIELD)
1919
public class UpdateResponse {
2020
@Schema(description = "The XML Content of the updated SCL added to the database. The content contains a XML according to the IEC 61850 standard.",

‎app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/CompasSclDataEventHandler.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import org.lfenergy.compas.scl.data.websocket.event.model.GetEventRequest;
1111
import org.lfenergy.compas.scl.data.websocket.event.model.GetVersionEventRequest;
1212
import org.lfenergy.compas.scl.data.websocket.event.model.UpdateEventRequest;
13-
import org.lfenergy.compas.scl.data.websocket.v1.model.CreateResponse;
14-
import org.lfenergy.compas.scl.data.websocket.v1.model.GetResponse;
15-
import org.lfenergy.compas.scl.data.websocket.v1.model.UpdateResponse;
13+
import org.lfenergy.compas.scl.data.websocket.v1.model.CreateWsResponse;
14+
import org.lfenergy.compas.scl.data.websocket.v1.model.GetWsResponse;
15+
import org.lfenergy.compas.scl.data.websocket.v1.model.UpdateWsResponse;
1616

1717
import javax.enterprise.context.ApplicationScoped;
1818
import javax.inject.Inject;
@@ -31,8 +31,8 @@ public CompasSclDataEventHandler(CompasSclDataService compasSclDataService) {
3131

3232
@ConsumeEvent(value = "create-ws", blocking = true)
3333
public void createWebsocketsEvent(CreateEventRequest request) {
34-
new WebsocketHandler<CreateResponse>().execute(request.getSession(), () -> {
35-
var response = new CreateResponse();
34+
new WebsocketHandler<CreateWsResponse>().execute(request.getSession(), () -> {
35+
var response = new CreateWsResponse();
3636
response.setSclData(compasSclDataService.create(request.getType(), request.getName(), request.getWho(),
3737
request.getComment(), request.getSclData()));
3838
return response;
@@ -41,26 +41,26 @@ public void createWebsocketsEvent(CreateEventRequest request) {
4141

4242
@ConsumeEvent(value = "get-ws")
4343
public void getWebsocketsEvent(GetEventRequest request) {
44-
new WebsocketHandler<GetResponse>().execute(request.getSession(), () -> {
45-
var response = new GetResponse();
44+
new WebsocketHandler<GetWsResponse>().execute(request.getSession(), () -> {
45+
var response = new GetWsResponse();
4646
response.setSclData(compasSclDataService.findByUUID(request.getType(), request.getId()));
4747
return response;
4848
});
4949
}
5050

5151
@ConsumeEvent(value = "get-version-ws")
5252
public void getVersionWebsocketsEvent(GetVersionEventRequest request) {
53-
new WebsocketHandler<GetResponse>().execute(request.getSession(), () -> {
54-
var response = new GetResponse();
53+
new WebsocketHandler<GetWsResponse>().execute(request.getSession(), () -> {
54+
var response = new GetWsResponse();
5555
response.setSclData(compasSclDataService.findByUUID(request.getType(), request.getId(), request.getVersion()));
5656
return response;
5757
});
5858
}
5959

6060
@ConsumeEvent(value = "update-ws", blocking = true)
6161
public void updateWebsocketsEvent(UpdateEventRequest request) {
62-
new WebsocketHandler<UpdateResponse>().execute(request.getSession(), () -> {
63-
var response = new UpdateResponse();
62+
new WebsocketHandler<UpdateWsResponse>().execute(request.getSession(), () -> {
63+
var response = new UpdateWsResponse();
6464
response.setSclData(compasSclDataService.update(request.getType(), request.getId(), request.getChangeSetType(),
6565
request.getWho(), request.getComment(), request.getSclData()));
6666
return response;

‎app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpoint.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import org.lfenergy.compas.core.websocket.ErrorResponseEncoder;
1010
import org.lfenergy.compas.scl.data.rest.UserInfoProperties;
1111
import org.lfenergy.compas.scl.data.websocket.event.model.CreateEventRequest;
12-
import org.lfenergy.compas.scl.data.websocket.v1.decoder.CreateRequestDecoder;
13-
import org.lfenergy.compas.scl.data.websocket.v1.encoder.CreateResponseEncoder;
14-
import org.lfenergy.compas.scl.data.websocket.v1.model.CreateRequest;
12+
import org.lfenergy.compas.scl.data.websocket.v1.decoder.CreateWsRequestDecoder;
13+
import org.lfenergy.compas.scl.data.websocket.v1.encoder.CreateWsResponseEncoder;
14+
import org.lfenergy.compas.scl.data.websocket.v1.model.CreateWsRequest;
1515
import org.lfenergy.compas.scl.extensions.model.SclFileType;
1616
import org.slf4j.Logger;
1717
import org.slf4j.LoggerFactory;
@@ -28,8 +28,8 @@
2828
@Authenticated
2929
@ApplicationScoped
3030
@ServerEndpoint(value = "/scl-ws/v1/{" + TYPE_PATH_PARAM + "}/create",
31-
decoders = {CreateRequestDecoder.class},
32-
encoders = {CreateResponseEncoder.class, ErrorResponseEncoder.class})
31+
decoders = {CreateWsRequestDecoder.class},
32+
encoders = {CreateWsResponseEncoder.class, ErrorResponseEncoder.class})
3333
public class CompasSclCreateServerEndpoint {
3434
private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclCreateServerEndpoint.class);
3535

@@ -52,7 +52,7 @@ public void onOpen(Session session, @PathParam(TYPE_PATH_PARAM) String type) {
5252
}
5353

5454
@OnMessage
55-
public void onCreateMessage(Session session, CreateRequest request, @PathParam(TYPE_PATH_PARAM) String type) {
55+
public void onCreateMessage(Session session, CreateWsRequest request, @PathParam(TYPE_PATH_PARAM) String type) {
5656
LOGGER.info("Message (create) from session {} for type {}.", session.getId(), type);
5757

5858
String who = jsonWebToken.getClaim(userInfoProperties.who());

‎app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpoint.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import io.vertx.mutiny.core.eventbus.EventBus;
88
import org.lfenergy.compas.core.websocket.ErrorResponseEncoder;
99
import org.lfenergy.compas.scl.data.websocket.event.model.GetEventRequest;
10-
import org.lfenergy.compas.scl.data.websocket.v1.decoder.GetRequestDecoder;
11-
import org.lfenergy.compas.scl.data.websocket.v1.encoder.GetResponseEncoder;
12-
import org.lfenergy.compas.scl.data.websocket.v1.model.GetRequest;
10+
import org.lfenergy.compas.scl.data.websocket.v1.decoder.GetWsRequestDecoder;
11+
import org.lfenergy.compas.scl.data.websocket.v1.encoder.GetWsResponseEncoder;
12+
import org.lfenergy.compas.scl.data.websocket.v1.model.GetWsRequest;
1313
import org.lfenergy.compas.scl.extensions.model.SclFileType;
1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
@@ -26,8 +26,8 @@
2626
@Authenticated
2727
@ApplicationScoped
2828
@ServerEndpoint(value = "/scl-ws/v1/{" + TYPE_PATH_PARAM + "}/get",
29-
decoders = {GetRequestDecoder.class},
30-
encoders = {GetResponseEncoder.class, ErrorResponseEncoder.class})
29+
decoders = {GetWsRequestDecoder.class},
30+
encoders = {GetWsResponseEncoder.class, ErrorResponseEncoder.class})
3131
public class CompasSclGetServerEndpoint {
3232
private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclGetServerEndpoint.class);
3333

@@ -45,7 +45,7 @@ public void onOpen(Session session, @PathParam(TYPE_PATH_PARAM) String type) {
4545

4646
@OnMessage
4747
public void onGetMessage(Session session,
48-
GetRequest request,
48+
GetWsRequest request,
4949
@PathParam(TYPE_PATH_PARAM) String type) {
5050
LOGGER.info("Message (get) from session {} for type {}.", session.getId(), type);
5151

‎app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpoint.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import org.lfenergy.compas.core.websocket.ErrorResponseEncoder;
99
import org.lfenergy.compas.scl.data.model.Version;
1010
import org.lfenergy.compas.scl.data.websocket.event.model.GetVersionEventRequest;
11-
import org.lfenergy.compas.scl.data.websocket.v1.decoder.GetVersionRequestDecoder;
12-
import org.lfenergy.compas.scl.data.websocket.v1.encoder.GetResponseEncoder;
13-
import org.lfenergy.compas.scl.data.websocket.v1.model.GetVersionRequest;
11+
import org.lfenergy.compas.scl.data.websocket.v1.decoder.GetVersionWsRequestDecoder;
12+
import org.lfenergy.compas.scl.data.websocket.v1.encoder.GetWsResponseEncoder;
13+
import org.lfenergy.compas.scl.data.websocket.v1.model.GetVersionWsRequest;
1414
import org.lfenergy.compas.scl.extensions.model.SclFileType;
1515
import org.slf4j.Logger;
1616
import org.slf4j.LoggerFactory;
@@ -27,8 +27,8 @@
2727
@Authenticated
2828
@ApplicationScoped
2929
@ServerEndpoint(value = "/scl-ws/v1/{" + TYPE_PATH_PARAM + "}/get-version",
30-
decoders = {GetVersionRequestDecoder.class},
31-
encoders = {GetResponseEncoder.class, ErrorResponseEncoder.class})
30+
decoders = {GetVersionWsRequestDecoder.class},
31+
encoders = {GetWsResponseEncoder.class, ErrorResponseEncoder.class})
3232
public class CompasSclGetVersionServerEndpoint {
3333
private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclGetVersionServerEndpoint.class);
3434

@@ -46,7 +46,7 @@ public void onOpen(Session session, @PathParam(TYPE_PATH_PARAM) String type) {
4646

4747
@OnMessage
4848
public void onGetVersionMessage(Session session,
49-
GetVersionRequest request,
49+
GetVersionWsRequest request,
5050
@PathParam(TYPE_PATH_PARAM) String type) {
5151
LOGGER.info("Message from session {} for type {}.", session.getId(), type);
5252

‎app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpoint.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import org.lfenergy.compas.core.websocket.ErrorResponseEncoder;
1010
import org.lfenergy.compas.scl.data.rest.UserInfoProperties;
1111
import org.lfenergy.compas.scl.data.websocket.event.model.UpdateEventRequest;
12-
import org.lfenergy.compas.scl.data.websocket.v1.decoder.UpdateRequestDecoder;
13-
import org.lfenergy.compas.scl.data.websocket.v1.encoder.UpdateResponseEncoder;
14-
import org.lfenergy.compas.scl.data.websocket.v1.model.UpdateRequest;
12+
import org.lfenergy.compas.scl.data.websocket.v1.decoder.UpdateWsRequestDecoder;
13+
import org.lfenergy.compas.scl.data.websocket.v1.encoder.UpdateWsResponseEncoder;
14+
import org.lfenergy.compas.scl.data.websocket.v1.model.UpdateWsRequest;
1515
import org.lfenergy.compas.scl.extensions.model.SclFileType;
1616
import org.slf4j.Logger;
1717
import org.slf4j.LoggerFactory;
@@ -28,8 +28,8 @@
2828
@Authenticated
2929
@ApplicationScoped
3030
@ServerEndpoint(value = "/scl-ws/v1/{" + TYPE_PATH_PARAM + "}/update",
31-
decoders = {UpdateRequestDecoder.class},
32-
encoders = {UpdateResponseEncoder.class, ErrorResponseEncoder.class})
31+
decoders = {UpdateWsRequestDecoder.class},
32+
encoders = {UpdateWsResponseEncoder.class, ErrorResponseEncoder.class})
3333
public class CompasSclUpdateServerEndpoint {
3434
private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclUpdateServerEndpoint.class);
3535

@@ -52,7 +52,7 @@ public void onOpen(Session session, @PathParam(TYPE_PATH_PARAM) String type) {
5252
}
5353

5454
@OnMessage
55-
public void onUpdateMessage(Session session, UpdateRequest request,
55+
public void onUpdateMessage(Session session, UpdateWsRequest request,
5656
@PathParam(TYPE_PATH_PARAM) String type) {
5757
LOGGER.info("Message (update) from session {} for type {}.", session.getId(), type);
5858

0 commit comments

Comments
 (0)