diff --git a/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapter.java b/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapter.java
index c75a80a59494418beebe1fdd0ee6afa101458df7..986a61ae1ea287f8f77e8b2307b8d829580051d4 100644
--- a/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapter.java
+++ b/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapter.java
@@ -25,12 +25,12 @@ package de.ozgcloud.eingang.semantik.enginebased.formsolutions;
 
 import java.util.List;
 
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.FormDataUtils;
 import de.ozgcloud.eingang.semantik.enginebased.EngineBasedSemantikAdapter;
+import lombok.RequiredArgsConstructor;
 
 @Component
 @RequiredArgsConstructor
diff --git a/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java b/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
index 622bdbf3dcb4af4d5e7f252eb4e4f3292e44925a..7c632f369989f4d140e97020d3d7ef23c9c44a58 100644
--- a/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
+++ b/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
@@ -23,19 +23,18 @@
  */
 package de.ozgcloud.eingang.semantik.enginebased.formsolutions;
 
-import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.ASSISTANT;
-import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.IDENTIFIER_KEY;
+import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.*;
 
 import java.util.Map;
 import java.util.Optional;
 
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.FormDataUtils;
 import de.ozgcloud.eingang.common.formdata.FormHeader;
 import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
+import lombok.RequiredArgsConstructor;
 
 @Component
 @RequiredArgsConstructor
diff --git a/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsPanelMapper.java b/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsPanelMapper.java
index f8cd7b94f17a278d9cb18aef98941710ef4d9809..a1ee53f91845c62b50570a50d7724eb070bd7408 100644
--- a/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsPanelMapper.java
+++ b/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsPanelMapper.java
@@ -67,9 +67,9 @@ class FormSolutionsPanelMapper implements FormSolutionsEngineBasedMapper {
 	}
 
 	private Optional<Object> getValue(Map<String, Object> panel) {
-		 return mapPanels(getComponentList(panel))
-				 .map(Object.class::cast)
-				 .or(() -> Optional.ofNullable(panel.get(STRING_VALUE)));
+		return mapPanels(getComponentList(panel))
+				.map(Object.class::cast)
+				.or(() -> Optional.ofNullable(panel.get(STRING_VALUE)));
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/IdentifierValueParser.java b/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/IdentifierValueParser.java
index f6eb5a4c3dae73e3431a30335d635b3b3d99dda2..8b72e412a962f8ff61f547166791c91c748696e2 100644
--- a/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/IdentifierValueParser.java
+++ b/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/IdentifierValueParser.java
@@ -57,7 +57,7 @@ class IdentifierValueParser {
 			var identifier = (String) panel.get(FormSolutionsEngineBasedAdapter.IDENTIFIER_KEY);
 			var value = (String) panel.get(FormSolutionsPanelMapper.STRING_VALUE);
 			if (nonNull(identifier) && nonNull(value)) {
-				 resultMap.put(identifier, value);
+				resultMap.put(identifier, value);
 			}
 		}
 	}
diff --git a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapperTest.java b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapperTest.java
index ce9ccb167d448cf1569d89fd56aba8f00643471d..68e1dd9ed39c596040e088e7f661ae667f0f1e26 100644
--- a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapperTest.java
+++ b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapperTest.java
@@ -24,15 +24,13 @@
 package de.ozgcloud.eingang.semantik.enginebased.formsolutions;
 
 import static de.ozgcloud.eingang.common.formdata.AntragstellerTestFactory.*;
-import static de.ozgcloud.eingang.common.formdata.FormDataTestFactory.SIMPLE_VALUE;
-import static de.ozgcloud.eingang.common.formdata.FormDataTestFactory.SIMPLE_VALUE_KEY;
+import static de.ozgcloud.eingang.common.formdata.FormDataTestFactory.*;
 import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsAntragstellerMapper.*;
-import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.ASSISTANT;
-import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.IDENTIFIER_KEY;
+import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.*;
 import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsPanelMapper.*;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mockStatic;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
index b3807cdc92ff1a5297b47d43651a9d55247b8ca1..f5e714e4ff8326f832c3390bc401108312886fea 100644
--- a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
+++ b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
@@ -23,8 +23,8 @@
  */
 package de.ozgcloud.eingang.semantik.enginebased.formsolutions;
 
-import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.ASSISTANT;
-import static org.assertj.core.api.Assertions.assertThat;
+import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.*;
+import static org.assertj.core.api.Assertions.*;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -32,10 +32,6 @@ import java.nio.file.Path;
 import java.util.Map;
 import java.util.Optional;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.SneakyThrows;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -43,6 +39,10 @@ import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import de.ozgcloud.common.binaryfile.TempFileUtils;
 import de.ozgcloud.common.test.TestUtils;
 import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
@@ -52,6 +52,7 @@ import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
 import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
 import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
 import de.ozgcloud.eingang.semantik.SemantikAdapter;
+import lombok.SneakyThrows;
 
 @SpringBootTest
 @ActiveProfiles({ "local", "itcase" })
diff --git a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterTest.java b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterTest.java
index d6dbd047d8352249320cb27500dba2ab157436a1..1ac8efa1f2053ccc991fc8a16136298035606f5e 100644
--- a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterTest.java
+++ b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterTest.java
@@ -24,10 +24,9 @@
 package de.ozgcloud.eingang.semantik.enginebased.formsolutions;
 
 import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.*;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderTestFactory.java b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderTestFactory.java
index 26289225155c277f42c62e196b1da62745f4f603..36954a39d45602b0b98a900532e4e4e6acd6c60f 100644
--- a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderTestFactory.java
+++ b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderTestFactory.java
@@ -23,9 +23,8 @@
  */
 package de.ozgcloud.eingang.semantik.enginebased.formsolutions;
 
-import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.ASSISTANT;
-import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.IDENTIFIER_KEY;
-import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsHeaderMapper.TRANSACTION_ID;
+import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.*;
+import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsHeaderMapper.*;
 
 import java.util.Map;
 import java.util.UUID;
diff --git a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsPanelMapperTest.java b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsPanelMapperTest.java
index f5f140a136275562d3506753da60c36d2d0d6b7b..b66cc350f6a44c5725ba3db730cc82b35562c201 100644
--- a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsPanelMapperTest.java
+++ b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsPanelMapperTest.java
@@ -23,9 +23,9 @@
  */
 package de.ozgcloud.eingang.semantik.enginebased.formsolutions;
 
-import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.ASSISTANT;
+import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.*;
 import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsPanelTestFactory.*;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
 
 import java.util.Map;
 
@@ -160,7 +160,7 @@ class FormSolutionsPanelMapperTest {
 	}
 
 	@Nested
-	class TestGetComponents{
+	class TestGetComponents {
 
 		@Test
 		void shouldReturnComponentList() {
diff --git a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/IdentifierValueParserTest.java b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/IdentifierValueParserTest.java
index 101b106916fb1f8bf572560262a3771d1418ccf4..ffe7e754081607d977b57da6c01dff8cc5818d08 100644
--- a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/IdentifierValueParserTest.java
+++ b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/IdentifierValueParserTest.java
@@ -24,13 +24,11 @@
 package de.ozgcloud.eingang.semantik.enginebased.formsolutions;
 
 import static de.ozgcloud.eingang.common.formdata.AntragstellerTestFactory.*;
-import static de.ozgcloud.eingang.common.formdata.FormDataTestFactory.SIMPLE_VALUE;
-import static de.ozgcloud.eingang.common.formdata.FormDataTestFactory.SIMPLE_VALUE_KEY;
+import static de.ozgcloud.eingang.common.formdata.FormDataTestFactory.*;
 import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsAntragstellerMapper.*;
-import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.ASSISTANT;
-import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.IDENTIFIER_KEY;
+import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.*;
 import static de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsPanelMapper.*;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
 
 import java.util.List;
 import java.util.Map;