From a2fc3d050b0004fb5d74f96c6d111796862765e7 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 4 Jul 2022 07:59:36 +0200
Subject: [PATCH] OZG-2566 OZG-2684 tiny cleanup
---
.../common/command/CommandController.java | 4 +---
.../goofy/common/command/CommandService.java | 10 +---------
.../common/command/CommandControllerTest.java | 4 ++--
.../common/command/CommandServiceTest.java | 19 -------------------
4 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java
index 2a0ef1d712..ad32f9c479 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java
@@ -87,7 +87,7 @@ public class CommandController {
command = prepareCommandForPostfachNachricht(command, vorgangId);
}
- var created = service.createCommandWithValidation(command, relationVersion);
+ var created = service.createCommand(command, relationVersion);
return ResponseEntity.created(linkTo(CommandController.class).slash(created.getId()).toUri()).build();
}
@@ -118,12 +118,10 @@ public class CommandController {
return vorgangController.getVorgang(vorgangId);
}
- // Anlegen eines Commands fuer eine neue PostfachNachricht(resend)
public Command createCommandWithoutRelation(CreateCommand command) {
return service.createCommandWithoutRelation(command);
}
- // Anlegen eines Commands fuer das erledigen/wiedereroeffnen einer Wiedervorlage
public Command createCommandWithoutValidation(CreateCommand command, String itemName, long relationVersion) {
return service.createCommandWithoutValidation(command, itemName, relationVersion);
}
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandService.java b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandService.java
index d03745acf9..a707721017 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandService.java
@@ -26,26 +26,18 @@ public class CommandService {
return remoteService.createCommand(command);
}
- public Command createCommand(CreateCommand command, long relationVersion) {
+ public Command createCommand(@Valid CreateCommand command, long relationVersion) {
command = command.toBuilder().relationVersion(relationVersion).build();
return remoteService.createCommand(command);
}
- public Command createCommandWithValidation(@Valid CreateCommand command, long relationVersion) {
- command = command.toBuilder().relationVersion(relationVersion).build();
-
- return remoteService.createCommand(command);
- }
-
- // Anlegen eines Commands fuer eine neue PostfachNachricht(resend)
public Command createCommandWithoutRelation(CreateCommand command) {
command = command.toBuilder().relationVersion(NO_RELATION_VERSION).build();
return remoteService.createCommand(command);
}
- // Anlegen eines Commands fuer das erledigen/wiedereroeffnen einer Wiedervorlage
public Command createCommandWithoutValidation(CreateCommand command, String itemName, long relationVersion) {
command = command.toBuilder().relationVersion(relationVersion).build();
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandControllerTest.java b/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandControllerTest.java
index 8d5174380b..a920b70120 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandControllerTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandControllerTest.java
@@ -146,7 +146,7 @@ class CommandControllerTest {
@BeforeEach
void initTest() {
- when(service.createCommandWithValidation(any(CreateCommand.class), anyLong())).thenReturn(CommandTestFactory.create());
+ when(service.createCommand(any(CreateCommand.class), anyLong())).thenReturn(CommandTestFactory.create());
}
@DisplayName("should return CREATED")
@@ -160,7 +160,7 @@ class CommandControllerTest {
void callService() throws Exception {
doRequest();
- verify(service).createCommandWithValidation(createCommandCaptor.capture(), eq(CommandTestFactory.RELATION_VERSION));
+ verify(service).createCommand(createCommandCaptor.capture(), eq(CommandTestFactory.RELATION_VERSION));
assertThat(createCommandCaptor.getValue().getOrder()).isEqualTo(CommandTestFactory.ORDER);
assertThat(createCommandCaptor.getValue().getVorgangId()).isEqualTo(CommandTestFactory.VORGANG_ID);
assertThat(createCommandCaptor.getValue().getRelationId()).isEqualTo(CommandTestFactory.RELATION_ID);
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandServiceTest.java
index b29a56f6e7..4c49293df7 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandServiceTest.java
@@ -67,25 +67,6 @@ class CommandServiceTest {
}
}
- @Nested
- class TestWithValidation {
-
- @Test
- void shouldCallRemoteService() {
- service.createCommandWithValidation(command, CommandTestFactory.RELATION_VERSION);
-
- verify(remoteService).createCommand(any(CreateCommand.class));
- }
-
- @Test
- void shouldHaveSetRelationVersion() {
- service.createCommandWithValidation(command, CommandTestFactory.RELATION_VERSION);
-
- verify(remoteService).createCommand(createCommandCaptor.capture());
- assertThat(createCommandCaptor.getValue().getRelationVersion()).isEqualTo(CommandTestFactory.RELATION_VERSION);
- }
- }
-
@Nested
class TestWithoutRelationVersion {
--
GitLab