From 40528ed4506c88fc48c8bcc753fc524f30911f0e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 29 May 2024 16:43:06 +0200
Subject: [PATCH] OZG-5665 Added EqualsAndHashCode to OzgFile
---
.../main/java/de/ozgcloud/alfa/common/file/OzgFile.java | 4 ++++
.../de/ozgcloud/alfa/postfach/PostfachMailServiceTest.java | 4 ++--
.../de/ozgcloud/alfa/bescheid/DokumentTypeBuilderTest.java | 6 +++---
.../ozgcloud/alfa/bescheid/ExportBescheidServiceTest.java | 7 +++----
.../alfa/common/PrimaerdokumentTypeBuilderTest.java | 4 ++--
.../java/de/ozgcloud/alfa/export/ExportServiceTest.java | 4 ++--
6 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFile.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFile.java
index 53a19e71a3..3b318c7c83 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFile.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFile.java
@@ -29,6 +29,7 @@ import de.ozgcloud.alfa.common.binaryfile.FileId;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -36,10 +37,13 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@AllArgsConstructor(access = AccessLevel.PACKAGE)
@Getter
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
public class OzgFile {
@JsonIgnore
+ @EqualsAndHashCode.Include
private FileId id;
+ @EqualsAndHashCode.Include
private String name;
private long size;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailServiceTest.java
index 29ca6ad24e..85c964af5f 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailServiceTest.java
@@ -259,12 +259,12 @@ class PostfachMailServiceTest {
class TestCall {
private final Stream<PostfachMail> postfachMail = Stream.of(postfachNachricht);
- private final Stream<OzgFile> ozgFile = Stream.of(OzgFileTestFactory.create());
+ private final Stream<OzgFile> ozgFiles = Stream.of(OzgFileTestFactory.create());
@BeforeEach
void mock() {
when(remoteService.findPostfachMails(anyString())).thenReturn(postfachMail);
- when(fileService.getFiles(anyList())).thenReturn(ozgFile);
+ when(fileService.getFiles(anyList())).thenReturn(ozgFiles);
}
@Test
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/DokumentTypeBuilderTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/DokumentTypeBuilderTest.java
index 9c4bfd7a12..55e271e005 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/DokumentTypeBuilderTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/DokumentTypeBuilderTest.java
@@ -34,7 +34,7 @@ import de.xoev.xdomea.IdentifikationObjektType;
class DokumentTypeBuilderTest {
private final String fullName = UserProfileTestFactory.FULLNAME;
private final Bescheid bescheid = BescheidTestFactory.create();
- private final OzgFile document = OzgFileTestFactory.create();
+ private final OzgFile document = OzgFileTestFactory.createWithUniqueId();
@Spy
private final DokumentTypeBuilder builder = DokumentTypeBuilder.builder()
@@ -149,7 +149,7 @@ class DokumentTypeBuilderTest {
@Nested
class TestWithOneAnlage {
private final AnlageDokumentType anlageDokumentAttachment = AnlageDokumentTypeTestFactory.create();
- private final OzgFile attachment = OzgFileTestFactory.create();
+ private final OzgFile attachment = OzgFileTestFactory.createWithUniqueId();
@Test
void shouldHaveOneAnlage() {
@@ -250,7 +250,7 @@ class DokumentTypeBuilderTest {
@Mock
private AnlageDokumentTypeBuilder anlageDokumentTypeBuilder;
private final AnlageDokumentType expectedAnlage = AnlageDokumentTypeTestFactory.create();
- private final OzgFile attachment = OzgFileTestFactory.create();
+ private final OzgFile attachment = OzgFileTestFactory.createWithUniqueId();
@BeforeEach
void setUp() {
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/ExportBescheidServiceTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/ExportBescheidServiceTest.java
index bd8d907e7c..b72ed1351f 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/ExportBescheidServiceTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/ExportBescheidServiceTest.java
@@ -154,8 +154,8 @@ class ExportBescheidServiceTest {
class TestCreateBescheidExportInput {
private final VorgangWithEingang vorgang = VorgangWithEingangTestFactory.create();
private final Bescheid bescheid = BescheidTestFactory.create();
- private final OzgFile document = OzgFileTestFactory.create();
- private final OzgFile attachment = OzgFileTestFactory.create();
+ private final OzgFile document = OzgFileTestFactory.createWithUniqueId();
+ private final OzgFile attachment = OzgFileTestFactory.createWithUniqueId();
@BeforeEach
void setUpMocks() {
@@ -243,7 +243,7 @@ class ExportBescheidServiceTest {
@Test
void shouldReturnGottenOzgFiles() {
- var expectedOzgFile = OzgFileTestFactory.create();
+ var expectedOzgFile = OzgFileTestFactory.createWithUniqueId();
when(binaryFileService.getFiles(fileIds)).thenReturn(Stream.of(expectedOzgFile));
var resultOzgFiles = service.getAttachments(bescheid);
@@ -255,7 +255,6 @@ class ExportBescheidServiceTest {
@Nested
class TestAddBescheidExportData {
private final List<OzgFile> files = BescheidExportInputTestFactory.FILES;
- private final OzgFile document = OzgFileTestFactory.create();
private final DokumentType dokumentType = DokumentTypeTestFactory.create();
private final BescheidExportInput exportInput = BescheidExportInputTestFactory.create();
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/common/PrimaerdokumentTypeBuilderTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/common/PrimaerdokumentTypeBuilderTest.java
index bc41f37e45..c269f1948b 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/common/PrimaerdokumentTypeBuilderTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/common/PrimaerdokumentTypeBuilderTest.java
@@ -16,7 +16,7 @@ import de.ozgcloud.alfa.common.file.OzgFileTestFactory;
class PrimaerdokumentTypeBuilderTest {
- private final PrimaerdokumentTypeBuilder builder = PrimaerdokumentTypeBuilder.builder().withOzgFile(OzgFileTestFactory.create());
+ private final PrimaerdokumentTypeBuilder builder = PrimaerdokumentTypeBuilder.builder().withOzgFile(OzgFileTestFactory.createWithUniqueId());
@Nested
class TestBuild {
@@ -26,7 +26,7 @@ class PrimaerdokumentTypeBuilderTest {
private static final String ERSTELLER = "Ersteller";
private static final String GENERATED_FILE_NAME = "file_name";
private static final ZonedDateTime CREATED_AT = ZonedDateTime.now();
- private final OzgFile ozgFile = OzgFileTestFactory.create();
+ private final OzgFile ozgFile = OzgFileTestFactory.createWithUniqueId();
@BeforeEach
void setUp() {
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceTest.java
index 6b7317d5dd..df101b3da9 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceTest.java
@@ -136,8 +136,8 @@ class ExportServiceTest {
private final NkAbgabeType kopfType = NkAbgabeTypeTestFactory.create();
private final AbgabeAbgabe0401 abgabe = AbgabeAbgabe0401TestFactory.create();
private final AkteType akteType = AkteTypeTestFactory.create();
- private final List<OzgFile> representations = List.of(OzgFileTestFactory.create());
- private final List<OzgFile> attachments = List.of(OzgFileTestFactory.create());
+ private final List<OzgFile> representations = List.of(OzgFileTestFactory.createWithUniqueId());
+ private final List<OzgFile> attachments = List.of(OzgFileTestFactory.createWithUniqueId());
private final List<DokumentType> representationsDokumentTypes = List.of(DokumentTypeTestFactory.create());
private final List<DokumentType> attachmentsDokumentTypes = List.of(DokumentTypeTestFactory.create());
private final List<HistorienProtokollInformationType> historienProtokollInformationTypes = List.of(
--
GitLab