diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssembler.java
index 46c008ecb1d6ea122f163eb50dce6d7cd5efa26e..c475c5c3262880ad20da74131e8940592c4a5ede 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssembler.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileModelAssembler.java
@@ -25,7 +25,6 @@ package de.ozgcloud.alfa.common.binaryfile;
import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.*;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.springframework.hateoas.CollectionModel;
@@ -51,7 +50,6 @@ public class BinaryFileModelAssembler implements RepresentationModelAssembler<Oz
}
public CollectionModel<EntityModel<OzgFile>> toCollectionModel(Stream<OzgFile> entities) {
- return CollectionModel.of(entities.map(this::toModel).collect(Collectors.toList()),
- linkTo(BinaryFileController.class).withSelfRel());
+ return CollectionModel.of(entities.map(this::toModel).toList(), linkTo(BinaryFileController.class).withSelfRel());
}
}
\ No newline at end of file
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandHelper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandHelper.java
index 142c457fc85fa9686b15ccdbec16b14c11d9a268..deb37af64aa82dab029a84cfce1e2e864b80d756 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandHelper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandHelper.java
@@ -11,15 +11,12 @@ public class CommandHelper {
static final Predicate<Command> IS_DONE = command -> command.getStatus() == CommandStatus.FINISHED
|| command.getStatus() == CommandStatus.REVOKED || command.getStatus() == CommandStatus.ERROR;
- static final Predicate<Command> IS_PENDING = command -> {
- return command.getStatus() == CommandStatus.PENDING
- || command.getStatus() == CommandStatus.REVOKE_PENDING;
- };
+ static final Predicate<Command> IS_PENDING = command -> command.getStatus() == CommandStatus.PENDING
+ || command.getStatus() == CommandStatus.REVOKE_PENDING;
public static final Predicate<Command> IS_REVOKEABLE = command -> command.getOrder().isRevokeable()
&& command.getStatus() == CommandStatus.FINISHED;
public static final Predicate<Command> IS_LOESCHANFORDERUNG = command -> command.getOrder() == CommandOrder.VORGANG_ZUM_LOESCHEN_MARKIEREN
|| command.getOrder() == CommandOrder.LOESCH_ANFORDERUNG_ZURUECKNEHMEN;
-
}
\ No newline at end of file
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingController.java
index 3bdb5f803bd644ba90d4680c2bfc97e4e6650d52..6748c2b4b8a62eaf4b145fae0c37082a05ca7e07 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingController.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingController.java
@@ -24,7 +24,7 @@
package de.ozgcloud.alfa.vorgang.forwarding;
import java.util.List;
-import java.util.stream.Collectors;
+import java.util.function.Predicate;
import java.util.stream.Stream;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +45,9 @@ public class ForwardingController {
static final String PARAM_VORGANG_ID = "vorgangId";
+ static final Predicate<Forwarding> IS_FAILED_FORWARDING = forwarding -> forwarding.getStatus() == Status.FAILED
+ || forwarding.getStatus() == Status.SEND_ERROR;
+
@Autowired
private ForwardingService service;
@Autowired
@@ -56,9 +59,7 @@ public class ForwardingController {
}
public List<Forwarding> findFailedForwardings(String vorgangId) {
- return findByVorgang(vorgangId)
- .filter(forwarding -> forwarding.getStatus() == Status.FAILED || forwarding.getStatus() == Status.SEND_ERROR)
- .collect(Collectors.toList());
+ return findByVorgang(vorgangId).filter(IS_FAILED_FORWARDING).toList();
}
public Stream<Forwarding> findByVorgang(String vorgangId) {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssembler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssembler.java
index f4efb25b9dbd5a7e197af6ac832fa7f7ef1700d7..95690e00bc8ec35baea0aff9f99f85540de0d322 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssembler.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingModelAssembler.java
@@ -25,7 +25,7 @@ package de.ozgcloud.alfa.vorgang.forwarding;
import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.*;
-import java.util.stream.Collectors;
+import java.util.function.Predicate;
import java.util.stream.Stream;
import org.springframework.hateoas.CollectionModel;
@@ -50,28 +50,34 @@ class ForwardingModelAssembler implements RepresentationModelAssembler<Forwardin
static final LinkRelation REL_ERROR = LinkRelation.of("error");
+ static final Predicate<Forwarding> IS_SENT = forwarding -> forwarding.getStatus() == Status.SENT;
+ static final Predicate<Forwarding> IS_SUCCESSFULL = forwarding -> forwarding.getStatus() == Status.SUCCESSFULL;
+ static final Predicate<Forwarding> IS_SENT_OR_SUCCESSFULL = forwarding -> forwarding.getStatus() == Status.SENT
+ || forwarding.getStatus() == Status.SUCCESSFULL;
+ static final Predicate<Forwarding> IS_FAILED = forwarding -> forwarding.getStatus() == Status.FAILED;
+ static final Predicate<Forwarding> IS_SEND_ERROR = forwarding -> forwarding.getStatus() == Status.SEND_ERROR;
+
@Override
public EntityModel<Forwarding> toModel(Forwarding entity) {
var selfLink = linkTo(ForwardingController.class).slash(entity.getId());
return ModelBuilder.fromEntity(entity)
.addLink(linkTo(ForwardingController.class).slash(entity.getId()).withSelfRel())
- .ifMatch(forwarding -> forwarding.getStatus() == Status.SENT)
+ .ifMatch(IS_SENT)
.addLinks(buildMarkAsSuccessLink(entity))
- .ifMatch(forwarding -> forwarding.getStatus() == Status.SENT || forwarding.getStatus() == Status.SUCCESSFULL)
+ .ifMatch(IS_SENT_OR_SUCCESSFULL)
.addLinks(buildMarkAsFailLink(entity))
- .ifMatch(forwarding -> forwarding.getStatus() == Status.FAILED)
+ .ifMatch(IS_FAILED)
.addLink(selfLink.withRel(REL_FAILED))
- .ifMatch(forwarding -> forwarding.getStatus() == Status.SUCCESSFULL)
+ .ifMatch(IS_SUCCESSFULL)
.addLink(selfLink.withRel(REL_SUCCESSFULL))
- .ifMatch(forwarding -> forwarding.getStatus() == Status.SEND_ERROR)
+ .ifMatch(IS_SEND_ERROR)
.addLink(selfLink.withRel(REL_ERROR))
.buildModel();
}
public CollectionModel<EntityModel<Forwarding>> toCollectionModel(Stream<Forwarding> entities) {
- return CollectionModel.of(entities.map(this::toModel).collect(Collectors.toList()),
- linkTo(ForwardingController.class).withSelfRel());
+ return CollectionModel.of(entities.map(this::toModel).toList(), linkTo(ForwardingController.class).withSelfRel());
}
public Link buildMarkAsSuccessLink(Forwarding forwarding) {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/attachment/AttachmentMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/attachment/AttachmentMapperTest.java
index edbb0974441a4e7cd7e7cb6195e99ba967be05a6..52a761ef966ccc1fd29f2340975353fb0bc063f6 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/attachment/AttachmentMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/attachment/AttachmentMapperTest.java
@@ -1,26 +1,33 @@
package de.ozgcloud.alfa.attachment;
-import org.assertj.core.api.Assertions;
+import static org.assertj.core.api.Assertions.*;
+
import org.junit.jupiter.api.Test;
import com.google.common.collect.Lists;
import de.ozgcloud.alfa.common.binaryfile.FileId;
-public class AttachmentMapperTest {
+class AttachmentMapperTest {
@Test
void shouldMapAttachmentsToEmptyList() {
- Assertions.assertThat(AttachmentMapper.mapAttachments(null)).isEmpty();
+ var attachments = AttachmentMapper.mapAttachments(null);
+
+ assertThat(attachments).isEmpty();
}
@Test
void shouldMapAttachmentsToList() {
- Assertions.assertThat(AttachmentMapper.mapAttachments(Lists.newArrayList("a1", "a2"))).containsExactly(FileId.from("a1"), FileId.from("a2"));
+ var attachments = AttachmentMapper.mapAttachments(Lists.newArrayList("a1", "a2"));
+
+ assertThat(attachments).containsExactly(FileId.from("a1"), FileId.from("a2"));
}
@Test
void shouldMapOneElementToList() {
- Assertions.assertThat(AttachmentMapper.mapAttachments("a1")).containsExactly(FileId.from("a1"));
+ var attachments = AttachmentMapper.mapAttachments("a1");
+
+ assertThat(attachments).containsExactly(FileId.from("a1"));
}
}