OZG-3956 fix tests

formcycle-adapter/formcycle-adapter-impl/pom.xml

@@ -30,6 +30,7 @@
 		<groupId>de.itvsh.kop.eingangsadapter</groupId>
 		<artifactId>formcycle-adapter</artifactId>
 		<version>1.10.1-SNAPSHOT</version>
+		<relativePath>../</relativePath>
 	</parent>
 
 	<artifactId>formcycle-adapter-impl</artifactId>

formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/VorgangNummerSupplier.java

@@ -15,7 +15,7 @@ class VorgangNummerSupplier {
 		var resultBuilder = initWithPrefix();
 		long currentTimeSeconds = Instant.now().toEpochMilli();
 		for (int i = 0; i < SUFFIX_LENGTH; i++) {
-			resultBuilder.append(BASE30_ALPHABET.charAt((int) currentTimeSeconds % 30));
+			resultBuilder.append(BASE30_ALPHABET.charAt((int) (currentTimeSeconds % 30)));
 			currentTimeSeconds /= 30;
 		}
 		return resultBuilder.toString();

formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerTest.java

@@ -101,7 +101,6 @@ class FormDataControllerTest {
 			doPostRequest().andExpect(status().is2xxSuccessful());
 		}
 
-
 		@Test
 		void shouldCallVorgangNummerSupplier() {
 			doPostRequest();
@@ -139,7 +138,8 @@ class FormDataControllerTest {
 			doPostRequest();
 
 			verify(semantikAdapter).processFormData(formDataCaptor.capture());
-			assertThat(formDataCaptor.getValue()).usingRecursiveComparison().ignoringFields("representations", "attachments", "numberOfAttachments", "header.requestId")
+			assertThat(formDataCaptor.getValue()).usingRecursiveComparison()
+					.ignoringFields("representations", "attachments", "numberOfAttachments", "header.requestId")
 					.isEqualTo(mappedFormData);
 		}
 
@@ -176,7 +176,7 @@ class FormDataControllerTest {
 
 				verify(semantikAdapter).processFormData(formDataCaptor.capture());
 				assertThat(formDataCaptor.getValue().getRepresentations()).first().usingRecursiveComparison()
-						.ignoringFields("id", "vendorId", "contentStream")
+						.ignoringFields("id", "vendorId", "file")
 						.isEqualTo(IncomingFileTestFactory.create());
 			}
 
@@ -260,7 +260,8 @@ class FormDataControllerTest {
 				var group = groupsBuilder.buildGroup(FormCycleAttachmentGroupTestFactory.create());
 
 				assertThat(group.getFiles()).hasSize(1).first()
-						.usingRecursiveComparison().ignoringFields("id", "vendorId", "contentStream").isEqualTo(IncomingFileTestFactory.create());
+						.usingRecursiveComparison().ignoringFields("id", "vendorId", "file")
+						.isEqualTo(IncomingFileTestFactory.create());
 			}
 
 			@Test

formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/VorgangNummerSupplierTest.java

@@ -8,12 +8,14 @@ import java.time.LocalDate;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
 import org.mockito.Spy;
 
 class VorgangNummerSupplierTest {
 
 	@Spy
-	private VorgangNummerSupplier vorgangNummerSupplier = new VorgangNummerSupplier();
+	@InjectMocks
+	private VorgangNummerSupplier vorgangNummerSupplier;
 
 	@Nested
 	@DisplayName("Get Vorgang Nummer")
@@ -46,6 +48,7 @@ class VorgangNummerSupplierTest {
 
 			assertThat(resultBuilder).hasSize(6);
 		}
+
 		@Test
 		void shouldAddLastYearNumberFirst() {
 			var lastYearNumber = "" + LocalDate.now().getYear() % 10;

formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsAttachmentsMapper.java

@@ -44,9 +44,7 @@ class FormSolutionsAttachmentsMapper {
 	public static final String FILE_GROUP_ZIP_NAME = "gezippte Anhänge";
 
 	List<IncomingFileGroup> mapAttachments(Map<String, Object> data) {
-		var result = mapZipRepresentation(Optional.ofNullable((String) data.get(ZIP)));
-		data.remove(ZIP);
-		return result;
+		return mapZipRepresentation(Optional.ofNullable((String) data.get(ZIP)));
 	}
 
 	List<IncomingFileGroup> mapZipRepresentation(Optional<String> encodedZip) {