From b7780bc88182fdbc4a68f228bb8ebea2a786443a Mon Sep 17 00:00:00 2001
From: Lukas Malte Monnerjahn <lukasmalte.monnerjahn@dataport.de>
Date: Mon, 6 May 2024 17:27:43 +0200
Subject: [PATCH] Revert "OZG-5413 sonar"
This reverts commit 123468bd65d4b843dd5a9d7b86933f80c48c7af9.
Except for the unused import in DFoerdermittelEngineBasedSemantikAdapter
---
.../enterprise/entry/EntryController.java | 19 ++++++++++-------
.../enterprise/entry/EntryDataMapper.java | 9 ++++----
.../eingang/formcycle/FormDataController.java | 6 ++++--
.../enginebased/afm/AfmHeaderMapper.java | 21 ++++++++++---------
.../afm/AfmZustaendigeStelleMapper.java | 9 ++++----
.../afm/intelliform/JsonService.java | 10 +++++----
6 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryController.java b/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryController.java
index f6467d0f7..20b6563bd 100644
--- a/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryController.java
+++ b/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryController.java
@@ -3,31 +3,36 @@ package de.ozgcloud.eingang.enterprise.entry;
import java.io.IOException;
import java.time.ZonedDateTime;
-import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
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;
-@RestController
+@Controller
+@ResponseBody
@RequestMapping("antrag")
-@RequiredArgsConstructor
public class EntryController {
private static final String STARTING_STATUS = "NEU";
- private final EntryDataMapper mapper;
- private final SemantikAdapter semantikAdapter;
- private final VorgangNummerSupplier vorgangNummerSupplier;
+ @Autowired
+ private EntryDataMapper mapper;
+
+ @Autowired
+ private SemantikAdapter semantikAdapter;
+ @Autowired
+ private VorgangNummerSupplier vorgangNummerSupplier;
@ResponseStatus(HttpStatus.ACCEPTED)
@PostMapping(consumes = "multipart/form-data", produces = MediaType.APPLICATION_JSON_VALUE)
diff --git a/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryDataMapper.java b/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryDataMapper.java
index ddbcefa40..1c2c53404 100644
--- a/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryDataMapper.java
+++ b/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 lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -11,11 +11,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import de.ozgcloud.eingang.common.formdata.FormData;
@Component
-@RequiredArgsConstructor
class EntryDataMapper {
- private final ObjectMapper objectMapper;
- private final FormDataMapper formDataMapper;
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private FormDataMapper formDataMapper;
public FormData mapEntryData(InputStream request) {
return formDataMapper.mapEntryData(readRequest(request));
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
index bc14537b1..1147f2eac 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
@@ -32,10 +32,11 @@ 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.RestController;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import de.ozgcloud.common.binaryfile.TempFileUtils;
@@ -52,7 +53,8 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
@Log4j2
-@RestController
+@Controller
+@ResponseBody
@RequestMapping("formData")
@RequiredArgsConstructor
class FormDataController {
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java
index 8e55983c1..2984f9a6d 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java
+++ b/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,7 +52,8 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
static final String FORM = "t:form";
static final String SENDER = "t:sender";
- private final ServiceKontoBuildHelper serviceKontoBuildHelper;
+ @Autowired
+ private ServiceKontoBuildHelper serviceKontoBuildHelper;
@Override
public FormData parseFormData(FormData formData) {
@@ -84,7 +85,7 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
Optional<ServiceKonto> createBayernIdServiceKonto(FormData formData) {
var postfachId1 = getPostfachId(formData);
- return postfachId1.map(serviceKontoBuildHelper::buildBayernIdServiceKonto);
+ return postfachId1.map(postfachId -> serviceKontoBuildHelper.buildBayernIdServiceKonto(postfachId));
}
Optional<String> getPostfachId(FormData formData) {
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
index 9cbca92ba..1e057c6e8 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
+++ b/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,7 +44,8 @@ class AfmZustaendigeStelleMapper implements AfmEngineBasedMapper {
public static final String ORGANISATIONSEINHEITEN_ID = "OrganisationseinheitenID";
public static final String TAG_BEZEICHNUNG = "OrganisationseinheitenBEZEICHNUNG";
- private final ZustaendigeStelleMetadataMapper zustaendigeStelleMetadataMapper;
+ @Autowired
+ private ZustaendigeStelleMetadataMapper zustaendigeStelleMetadataMapper;
@Override
public FormData parseFormData(FormData formData) {
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/intelliform/JsonService.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/intelliform/JsonService.java
index 28f4773dc..04d21f1a2 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/intelliform/JsonService.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/intelliform/JsonService.java
@@ -3,21 +3,23 @@ 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>>>() {
};
- private final ObjectMapper objectMapper;
+ @Autowired
+ private ObjectMapper objectMapper;
public List<Map<String, Object>> readAsListMap(String json) {
return readValueSafety(json, VALUE_TYPE_REF);
--
GitLab