Merge remote-tracking branch...

Merge remote-tracking branch 'origin/OZG-5413-Senden-OD-Mantelantrag-an-AFM-Eingangsstelle-via-NB' into OZG-5413-Senden-OD-Mantelantrag-an-AFM-Eingangsstelle-via-NB

enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryController.java

@@ -3,36 +3,31 @@ package de.ozgcloud.eingang.enterprise.entry;
 import java.io.IOException;
 import java.time.ZonedDateTime;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
 
 import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.vorgang.VorgangNummerSupplier;
 import de.ozgcloud.eingang.enterprise.entry.EntryResponse.ResponseVorgang;
 import de.ozgcloud.eingang.semantik.SemantikAdapter;
 
-@Controller
-@ResponseBody
+@RestController
 @RequestMapping("antrag")
+@RequiredArgsConstructor
 public class EntryController {
 
 	private static final String STARTING_STATUS = "NEU";
 
-	@Autowired
-	private EntryDataMapper mapper;
-
-	@Autowired
-	private SemantikAdapter semantikAdapter;
-	@Autowired
-	private VorgangNummerSupplier vorgangNummerSupplier;
+	private final EntryDataMapper mapper;
+	private final SemantikAdapter semantikAdapter;
+	private final VorgangNummerSupplier vorgangNummerSupplier;
 
 	@ResponseStatus(HttpStatus.ACCEPTED)
 	@PostMapping(consumes = "multipart/form-data", produces = MediaType.APPLICATION_JSON_VALUE)

enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryDataMapper.java

@@ -3,7 +3,7 @@ package de.ozgcloud.eingang.enterprise.entry;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -11,12 +11,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import de.ozgcloud.eingang.common.formdata.FormData;
 
 @Component
+@RequiredArgsConstructor
 class EntryDataMapper {
 
-	@Autowired
-	private ObjectMapper objectMapper;
-	@Autowired
-	private FormDataMapper formDataMapper;
+	private final ObjectMapper objectMapper;
+	private final FormDataMapper formDataMapper;
 
 	public FormData mapEntryData(InputStream request) {
 		return formDataMapper.mapEntryData(readRequest(request));

formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java

@@ -32,11 +32,10 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import de.ozgcloud.common.binaryfile.TempFileUtils;
@@ -53,8 +52,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
-@Controller
-@ResponseBody
+@RestController
 @RequestMapping("formData")
 @RequiredArgsConstructor
 class FormDataController {

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

@@ -23,21 +23,21 @@
  */
 package de.ozgcloud.eingang.semantik.enginebased.afm;
 
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Map;
-import java.util.Optional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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.common.formdata.ServiceKonto;
 import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+import java.util.Optional;
 
 @Component
+@RequiredArgsConstructor
 class AfmHeaderMapper implements AfmEngineBasedMapper {
 
 	static final String AFM_FORMENGINE_NAME = "AFM";
@@ -52,8 +52,7 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
 	static final String FORM = "t:form";
 	static final String SENDER = "t:sender";
 
-	@Autowired
-	private ServiceKontoBuildHelper serviceKontoBuildHelper;
+	private final ServiceKontoBuildHelper serviceKontoBuildHelper;
 
 	@Override
 	public FormData parseFormData(FormData formData) {
@@ -85,7 +84,7 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
 
 	Optional<ServiceKonto> createBayernIdServiceKonto(FormData formData) {
 		var postfachId1 = getPostfachId(formData);
-		return postfachId1.map(postfachId -> serviceKontoBuildHelper.buildBayernIdServiceKonto(postfachId));
+		return postfachId1.map(serviceKontoBuildHelper::buildBayernIdServiceKonto);
 	}
 
 	Optional<String> getPostfachId(FormData formData) {

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

@@ -29,13 +29,13 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 class AfmZustaendigeStelleMapper implements AfmEngineBasedMapper {
 
 	public static final String ZUSTAENDIGESTELLE = "zustaendigestelle";
@@ -44,8 +44,7 @@ class AfmZustaendigeStelleMapper implements AfmEngineBasedMapper {
 	public static final String ORGANISATIONSEINHEITEN_ID = "OrganisationseinheitenID";
 	public static final String TAG_BEZEICHNUNG = "OrganisationseinheitenBEZEICHNUNG";
 
-	@Autowired
-	private ZustaendigeStelleMetadataMapper zustaendigeStelleMetadataMapper;
+	private final ZustaendigeStelleMetadataMapper zustaendigeStelleMetadataMapper;
 
 	@Override
 	public FormData parseFormData(FormData formData) {

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

@@ -3,23 +3,21 @@ package de.ozgcloud.eingang.semantik.enginebased.afm.intelliform;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import de.ozgcloud.common.errorhandling.TechnicalException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 class JsonService {
 
 	static final TypeReference<List<Map<String, Object>>> VALUE_TYPE_REF = new TypeReference<List<Map<String, Object>>>() {
 	};
 
-	@Autowired
-	private ObjectMapper objectMapper;
+	private final ObjectMapper objectMapper;
 
 	public List<Map<String, Object>> readAsListMap(String json) {
 		return readValueSafety(json, VALUE_TYPE_REF);

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

@@ -11,7 +11,6 @@ import java.util.function.Predicate;
 
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;