Revert "OZG-4797 [refactor] rename method"

This reverts commit fc9fb5c8.

semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelper.java

@@ -25,11 +25,11 @@ public class ServiceKontoBuildHelper {
 	public static final String REST_RESPONSE_NAME_MEMBER_SCOPE = "memberscope";
 	public static final String REST_RESPONSE_NAME_MEMBER_SCOPE_MAILBOX_TYPE = "mailboxtype";
 
-	public ServiceKonto buildOsiServiceKonto(String postfachId) {
+	public ServiceKonto buildServiceKonto(String postfachId) {
 		return buildDefault(postfachId);
 	}
 
-	public ServiceKonto buildOsiServiceKonto(String postfachId, FormData formData) {
+	public ServiceKonto buildServiceKonto(String postfachId, FormData formData) {
 		return Optional.ofNullable(getRestResponseNames(formData))
 				.filter(names -> !names.isEmpty())
 				.map(restResponseNames -> buildWithRestResponseNames(postfachId, restResponseNames))

semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java

@@ -74,7 +74,7 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
 				.build();
 
 		Optional.ofNullable(getNameId(formData))
-				.map(nameId -> serviceKontoBuildHelper.buildOsiServiceKonto(nameId, formData))
+				.map(nameId -> serviceKontoBuildHelper.buildServiceKonto(nameId, formData))
 				.ifPresent(formHeaderBuilder::setServiceKonto);
 
 		return formHeaderBuilder;

semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java

@@ -66,7 +66,7 @@ class FormSolutionsHeaderMapper implements FormSolutionsEngineBasedMapper {
 				.requestId(getRequestId(formData))
 				.formEngineName(FORM_ENGINE_NAME);
 
-		Optional.ofNullable(getPostkorbhandle(formData)).map(serviceKontoBuildHelper::buildOsiServiceKonto).ifPresent(formHeaderBuilder::serviceKonto);
+		Optional.ofNullable(getPostkorbhandle(formData)).map(serviceKontoBuildHelper::buildServiceKonto).ifPresent(formHeaderBuilder::serviceKonto);
 
 		return formHeaderBuilder.build();
 	}

semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapper.java

@@ -87,7 +87,7 @@ public class DFoerdermittelFormBasedMapper implements FormBasedMapper {
 	}
 
 	private ServiceKonto createServiceKonto(String postfachId) {
-		return serviceKontoHelper.buildOsiServiceKonto(postfachId);
+		return serviceKontoHelper.buildServiceKonto(postfachId);
 	}
 
 	FormData parseFachnachricht(FormData formData, IncomingFile fachnachrichtFile) {

semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelperTest.java

@@ -18,6 +18,7 @@ import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory;
 import de.ozgcloud.eingang.common.formdata.ServiceKonto;
 import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
 import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
+import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
 import de.ozgcloud.eingang.semantik.enginebased.afm.AfmHeaderTestFactory;
 
 class ServiceKontoBuildHelperTest {
@@ -66,7 +67,7 @@ class ServiceKontoBuildHelperTest {
 		}
 
 		private ServiceKonto getServiceKonto(FormData formData) {
-			return helper.buildOsiServiceKonto(AfmHeaderTestFactory.POSTFACH_NAME_ID, formData);
+			return helper.buildServiceKonto(AfmHeaderTestFactory.POSTFACH_NAME_ID, formData);
 		}
 
 		@DisplayName("postfach addresses")
@@ -135,7 +136,7 @@ class ServiceKontoBuildHelperTest {
 			}
 
 			private ServiceKonto buildServiceKonto(FormData formData) {
-				return helper.buildOsiServiceKonto(AfmHeaderTestFactory.POSTFACH_NAME_ID, formData);
+				return helper.buildServiceKonto(AfmHeaderTestFactory.POSTFACH_NAME_ID, formData);
 			}
 		}
 	}

semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java

@@ -37,6 +37,7 @@ import org.mockito.Spy;
 import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.FormDataUtils;
 import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.semantik.enginebased.afm.AfmHeaderMapper;
 
 class AfmHeaderMapperTest {
 
@@ -110,14 +111,14 @@ class AfmHeaderMapperTest {
 					void shouldCallBuildServiceKontoIfPresent() {
 						parseFormData();
 
-						verify(serviceKontoBuildHelper).buildOsiServiceKonto(any(), eq(FORM_DATA));
+						verify(serviceKontoBuildHelper).buildServiceKonto(any(), eq(FORM_DATA));
 					}
 
 					@Test
 					void shouldNotCallBuildServiceKontoIfNotExists() {
 						mapper.parseFormData(FormDataUtils.from(FORM_DATA).remove(AfmHeaderMapper.POSTFACH_NAME_ID).build());
 
-						verify(serviceKontoBuildHelper, never()).buildOsiServiceKonto(any(), any());
+						verify(serviceKontoBuildHelper, never()).buildServiceKonto(any(), any());
 					}
 				}
 

semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java

@@ -39,6 +39,7 @@ 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.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsHeaderMapper;
 
 class FormSolutionsHeaderMapperTest {
 
@@ -119,7 +120,7 @@ class FormSolutionsHeaderMapperTest {
 				void shouldCallServiceKontoBuildHelper() {
 					buildFormHeader();
 
-					verify(serviceKontoBuildHelper).buildOsiServiceKonto(any());
+					verify(serviceKontoBuildHelper).buildServiceKonto(any());
 				}
 
 				@Test
@@ -128,7 +129,7 @@ class FormSolutionsHeaderMapperTest {
 
 					mapper.buildFormHeader(formDataWithoutPostkorbHandle);
 
-					verify(serviceKontoBuildHelper, never()).buildOsiServiceKonto(any());
+					verify(serviceKontoBuildHelper, never()).buildServiceKonto(any());
 				}
 
 			}

semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapperTest.java

@@ -166,7 +166,7 @@ class DFoerdermittelFormBasedMapperTest {
 
 		@BeforeEach
 		void init() {
-			when(serviceKontoHelper.buildOsiServiceKonto(any())).thenReturn(ServiceKontoTestFactory.create());
+			when(serviceKontoHelper.buildServiceKonto(any())).thenReturn(ServiceKontoTestFactory.create());
 		}
 
 		@Test
@@ -183,7 +183,7 @@ class DFoerdermittelFormBasedMapperTest {
 		void shouldRemovePrefix() {
 			mapper.addServiceKonto(DFoerdermittelFormDataTestFactory.create(), DFoerdermittelFormDataTestFactory.createFachnachrichtMap());
 
-			verify(serviceKontoHelper).buildOsiServiceKonto(DFoerdermittelFormDataTestFactory.POSTFACH_ID);
+			verify(serviceKontoHelper).buildServiceKonto(DFoerdermittelFormDataTestFactory.POSTFACH_ID);
 		}
 	}