OZG-7038 fix bean naming pattern and remove NOSONAR comments

archive-manager-server/src/main/java/de/ozgcloud/archive/ArchiveManagerConfiguration.java

@@ -54,41 +54,41 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
 @EnableScheduling
 public class ArchiveManagerConfiguration {
 
-	public static final String VORGANG_SERVICE_NAME = "archive_VorgangService";
-	public static final String VORGANG_REMOTE_MANAGER_SERVICE_NAME = "archive_VorgangRemoteService";
-	public static final String VORGANG_WITH_EINGANG_MAPPER_NAME = "archive_VorgangWithEingangMapper";
+	public static final String VORGANG_SERVICE_NAME = "archiveVorgangService";
+	public static final String VORGANG_REMOTE_MANAGER_SERVICE_NAME = "archiveVorgangRemoteService";
+	public static final String VORGANG_WITH_EINGANG_MAPPER_NAME = "archiveVorgangWithEingangMapper";
 
-	public static final String CURRENT_USER_SERVICE_NAME = "archive_CurrentUserService";
-	public static final String DOCUMENT_MAPPER_NAME = "archive_DocumentMapper";
-	public static final String DOCUMENT_REMOTE_SERVICE_NAME = "archive_DocumentRemoteService";
+	public static final String CURRENT_USER_SERVICE_NAME = "archiveCurrentUserService";
+	public static final String DOCUMENT_MAPPER_NAME = "archiveDocumentMapper";
+	public static final String DOCUMENT_REMOTE_SERVICE_NAME = "archiveDocumentRemoteService";
 
-	public static final String USER_SERVICE_NAME = "archive_UserService";
-	public static final String USER_PROFILE_MAPPER_NAME = "archive_UserProfileMapper";
-	public static final String OZGCLOUD_USER_PROFILE_SERVICE_NAME = "archive_OzgCloudUserProfileService";
+	public static final String USER_SERVICE_NAME = "archiveUserService";
+	public static final String USER_PROFILE_MAPPER_NAME = "archiveUserProfileMapper";
+	public static final String OZGCLOUD_USER_PROFILE_SERVICE_NAME = "archiveOzgCloudUserProfileService";
 
-	public static final String COMMAND_SERVICE_NAME = "archive_CommandService";
-	public static final String COMMAND_REMOTE_SERVICE_NAME = "archive_CommandRemoteService";
-	public static final String COMMAND_MAPPER_NAME = "archive_CommandMapper";
-	public static final String OZGCLOUD_COMMAND_SERVICE_NAME = "archive_OzgCloudCommandService";
+	public static final String COMMAND_SERVICE_NAME = "archiveCommandService";
+	public static final String COMMAND_REMOTE_SERVICE_NAME = "archiveCommandRemoteService";
+	public static final String COMMAND_MAPPER_NAME = "archiveCommandMapper";
+	public static final String OZGCLOUD_COMMAND_SERVICE_NAME = "archiveOzgCloudCommandService";
 
-	public static final String BINARY_FILE_SERVICE_NAME = "archive_BinaryFileService";
-	public static final String BINARY_FILE_REMOTE_SERVICE_NAME = "archive_BinaryFileRemoteService";
-	public static final String OZGCLOUD_FILE_SERVICE_NAME = "archive_OzgCloudFileService";
+	public static final String BINARY_FILE_SERVICE_NAME = "archiveBinaryFileService";
+	public static final String BINARY_FILE_REMOTE_SERVICE_NAME = "archiveBinaryFileRemoteService";
+	public static final String OZGCLOUD_FILE_SERVICE_NAME = "archiveOzgCloudFileService";
 
-	public static final String FILE_ID_MAPPER_NAME = "archive_FileIdMapper";
+	public static final String FILE_ID_MAPPER_NAME = "archiveFileIdMapper";
 
-	public static final String BESCHEID_REMOTE_SERVICE_NAME = "archive_BescheidRemoteService";
-	public static final String BESCHEID_MAPPER_NAME = "archive_BescheidMapper";
+	public static final String BESCHEID_REMOTE_SERVICE_NAME = "archiveBescheidRemoteService";
+	public static final String BESCHEID_MAPPER_NAME = "archiveBescheidMapper";
 
-	public static final String CALL_CONTEXT_PROVIDER_NAME = "archive_CallContextProvider";
-	public static final String CALL_CONTEXT_MAPPER_NAME = "archive_CallContextMapper";
+	public static final String CALL_CONTEXT_PROVIDER_NAME = "archiveCallContextProvider";
+	public static final String CALL_CONTEXT_MAPPER_NAME = "archiveCallContextMapper";
 
-	public static final String OZGCLOUD_CLIENT_ATTRIBUTE_SERVICE_NAME = "archive_OzgCloudClientAttributeService";
+	public static final String OZGCLOUD_CLIENT_ATTRIBUTE_SERVICE_NAME = "archiveOzgCloudClientAttributeService";
 
-	public static final String KOMMENTAR_SERVICE_NAME = "archive_KommentarService";
-	public static final String KOMMENTAR_REMOTE_SERVICE_NAME = "archive_KommentarRemoteService";
+	public static final String KOMMENTAR_SERVICE_NAME = "archiveKommentarService";
+	public static final String KOMMENTAR_REMOTE_SERVICE_NAME = "archiveKommentarRemoteService";
 
-	public static final String CALL_CONTEXT_SERVER_INTERCEPTOR_NAME = "archive_CallContextGrpcServerInterceptor";
+	public static final String CALL_CONTEXT_SERVER_INTERCEPTOR_NAME = "archiveCallContextGrpcServerInterceptor";
 
 	public static final String GRPC_VORGANG_MANAGER_CLIENT_NAME = "vorgang-manager";
 	public static final String GRPC_COMMAND_MANAGER_CLIENT_NAME = "command-manager";
@@ -110,25 +110,25 @@ public class ArchiveManagerConfiguration {
 	@GrpcClient(GRPC_FILE_MANAGER_CLIENT_NAME)
 	private final BinaryFileServiceStub binaryFileServiceStub;
 
-	@Bean(ArchiveManagerConfiguration.OZGCLOUD_FILE_SERVICE_NAME) // NOSONAR
+	@Bean(ArchiveManagerConfiguration.OZGCLOUD_FILE_SERVICE_NAME)
 	OzgCloudFileService ozgCloudFileService(OzgCloudFileMapper mapper,
 			@Qualifier(CALL_CONTEXT_PROVIDER_NAME) CallContextProvider callContextProvider) {
 		return new GrpcOzgCloudFileService(binaryFileServiceBlockingStub, binaryFileServiceStub, callContextProvider, mapper);
 	}
 
-	@Bean(ArchiveManagerConfiguration.OZGCLOUD_USER_PROFILE_SERVICE_NAME) // NOSONAR
+	@Bean(ArchiveManagerConfiguration.OZGCLOUD_USER_PROFILE_SERVICE_NAME)
 	OzgCloudUserProfileService grpcOzgCloudUserProfileService(UserProfileMapper userProfileMapper,
 			@Qualifier(CALL_CONTEXT_PROVIDER_NAME) CallContextProvider callContextProvider) {
 		return new GrpcOzgCloudUserProfileService(userProfileServiceBlockingStub, userProfileMapper, callContextProvider);
 	}
 
-	@Bean(OZGCLOUD_CLIENT_ATTRIBUTE_SERVICE_NAME) // NOSONAR
+	@Bean(OZGCLOUD_CLIENT_ATTRIBUTE_SERVICE_NAME)
 	OzgCloudClientAttributeService ozgCloudAttributesService(OzgCloudClientAttributeMapper mapper,
 			@Qualifier(CALL_CONTEXT_PROVIDER_NAME) CallContextProvider callContextProvider) {
 		return new OzgCloudClientAttributeGrpcService(clientAttributeServiceBlockingStub, mapper, callContextProvider);
 	}
 
-	@Bean(OZGCLOUD_COMMAND_SERVICE_NAME) // NOSONAR
+	@Bean(OZGCLOUD_COMMAND_SERVICE_NAME)
 	OzgCloudCommandService ozgCloudCommandService(CommandMapper commandMapper,
 			@Qualifier(CALL_CONTEXT_PROVIDER_NAME) CallContextProvider callContextProvider) {
 		return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, callContextProvider,

archive-manager-server/src/main/java/de/ozgcloud/archive/archivierung/ArchiveEventListener.java

@@ -65,15 +65,15 @@ public class ArchiveEventListener {
 	public static final Predicate<Command> IS_LOCK_BY_ARCHIVE_MANAGER_COMMAND = command -> CallContextUser.ARCHIVE_MANAGER_CLIENT_NAME
 			.equals(command.getCreatedByClientName());
 
-	@Qualifier(ArchiveManagerConfiguration.CURRENT_USER_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.CURRENT_USER_SERVICE_NAME)
 	private final CurrentUserService currentUserService;
 
-	@Qualifier(ArchiveManagerConfiguration.VORGANG_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.VORGANG_SERVICE_NAME)
 	private final VorgangService vorgangService;
 
 	private final ApplicationEventPublisher eventPublisher;
 
-	@Qualifier(ArchiveManagerConfiguration.COMMAND_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.COMMAND_SERVICE_NAME)
 	private final CommandService commandService;
 	private final ArchiveService archiveService;
 

archive-manager-server/src/main/java/de/ozgcloud/archive/archivierung/ArchiveService.java

@@ -53,7 +53,7 @@ class ArchiveService {
 	public static final String ATTRIBUTE_NAME_ANTRAG_ARCHIVING = "ARCHIVING";
 	private final XtaService xtaService;
 	private final ExportService exportService;
-	@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_CLIENT_ATTRIBUTE_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_CLIENT_ATTRIBUTE_SERVICE_NAME)
 	private final OzgCloudClientAttributeService ozgCloudAttributesService;
 	private final OzgCloudVorgangIdMapper vorgangIdMapper;
 

archive-manager-server/src/main/java/de/ozgcloud/archive/bescheid/BescheidRemoteService.java

@@ -36,15 +36,15 @@ import de.ozgcloud.document.bescheid.GrpcGetAllBescheidRequest;
 import lombok.RequiredArgsConstructor;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
-@Service(ArchiveManagerConfiguration.BESCHEID_REMOTE_SERVICE_NAME) // NOSONAR
+@Service(ArchiveManagerConfiguration.BESCHEID_REMOTE_SERVICE_NAME)
 @RequiredArgsConstructor
 class BescheidRemoteService {
 
 	@GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME)
 	private final BescheidServiceBlockingStub grpcService;
-	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME)
 	private final OzgCloudCallContextProvider contextProvider;
-	@Qualifier(ArchiveManagerConfiguration.BESCHEID_MAPPER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.BESCHEID_MAPPER_NAME)
 	private final BescheidMapper bescheidMapper;
 
 	public Stream<Bescheid> findByVorgangId(String vorgangId) {

archive-manager-server/src/main/java/de/ozgcloud/archive/bescheid/DocumentRemoteService.java

@@ -35,15 +35,15 @@ import de.ozgcloud.document.GrpcGetDocumentRequest;
 import lombok.RequiredArgsConstructor;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
-@Service(ArchiveManagerConfiguration.DOCUMENT_REMOTE_SERVICE_NAME) // NOSONAR
+@Service(ArchiveManagerConfiguration.DOCUMENT_REMOTE_SERVICE_NAME)
 @RequiredArgsConstructor
 class DocumentRemoteService {
 
-	@GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME) // NOSONAR
+	@GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME)
 	private final DocumentServiceBlockingStub grpcService;
-	@Qualifier(ArchiveManagerConfiguration.DOCUMENT_MAPPER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.DOCUMENT_MAPPER_NAME)
 	private final DocumentMapper documentMapper;
-	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME)
 	private final OzgCloudCallContextProvider contextProvider;
 
 	public FileId getDocument(String documentId) {

archive-manager-server/src/main/java/de/ozgcloud/archive/bescheid/ExportBescheidService.java

@@ -40,16 +40,16 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class ExportBescheidService {
 
-	@Qualifier(ArchiveManagerConfiguration.BESCHEID_REMOTE_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.BESCHEID_REMOTE_SERVICE_NAME)
 	private final BescheidRemoteService bescheidRemoteService;
 
-	@Qualifier(ArchiveManagerConfiguration.BINARY_FILE_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.BINARY_FILE_SERVICE_NAME)
 	private final BinaryFileService binaryFileService;
 
-	@Qualifier(ArchiveManagerConfiguration.DOCUMENT_REMOTE_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.DOCUMENT_REMOTE_SERVICE_NAME)
 	private final DocumentRemoteService documentRemoteService;
 
-	@Qualifier(ArchiveManagerConfiguration.USER_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.USER_SERVICE_NAME)
 	private final UserService userService;
 
 	public BescheidExportData createExportData(VorgangWithEingang vorgang) {

archive-manager-server/src/main/java/de/ozgcloud/archive/common/binaryfile/BinaryFileRemoteService.java

@@ -43,22 +43,22 @@ import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
 import lombok.RequiredArgsConstructor;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
-@Service(ArchiveManagerConfiguration.BINARY_FILE_REMOTE_SERVICE_NAME) // NOSONAR
+@Service(ArchiveManagerConfiguration.BINARY_FILE_REMOTE_SERVICE_NAME)
 @RequiredArgsConstructor
 class BinaryFileRemoteService {
 
-	@GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME) // NOSONAR
+	@GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME)
 	private final BinaryFileServiceBlockingStub grpcService;
 
-	@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_FILE_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_FILE_SERVICE_NAME)
 	private final OzgCloudFileService ozgCloudFileService;
 
 	private final OzgFileMapper ozgFileMapper;
 
-	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME)
 	private final OzgCloudCallContextProvider contextProvider;
 
-	@Qualifier(ArchiveManagerConfiguration.FILE_ID_MAPPER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.FILE_ID_MAPPER_NAME)
 	private final FileIdMapper fileIdMapper;
 
 	public Stream<OzgFile> getFiles(List<FileId> fileIds) {

archive-manager-server/src/main/java/de/ozgcloud/archive/common/binaryfile/BinaryFileService.java

@@ -35,11 +35,11 @@ import de.ozgcloud.archive.file.OzgFile;
 import de.ozgcloud.common.binaryfile.FileId;
 import lombok.RequiredArgsConstructor;
 
-@Service(ArchiveManagerConfiguration.BINARY_FILE_SERVICE_NAME) // NOSONAR
+@Service(ArchiveManagerConfiguration.BINARY_FILE_SERVICE_NAME)
 @RequiredArgsConstructor
 public class BinaryFileService {
 
-	@Qualifier(ArchiveManagerConfiguration.BINARY_FILE_REMOTE_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.BINARY_FILE_REMOTE_SERVICE_NAME)
 	private final BinaryFileRemoteService binaryFileRemoteService;
 
 	public Stream<OzgFile> getFiles(List<FileId> attachments) {

archive-manager-server/src/main/java/de/ozgcloud/archive/common/callcontext/CallContextGrpcServerInterceptor.java

@@ -40,13 +40,13 @@ import io.grpc.ServerCallHandler;
 import io.grpc.ServerInterceptor;
 import lombok.RequiredArgsConstructor;
 
-@Component(ArchiveManagerConfiguration.CALL_CONTEXT_SERVER_INTERCEPTOR_NAME) // NOSONAR
+@Component(ArchiveManagerConfiguration.CALL_CONTEXT_SERVER_INTERCEPTOR_NAME)
 @RequiredArgsConstructor
 public class CallContextGrpcServerInterceptor implements ServerInterceptor {
 
-	@Qualifier(ArchiveManagerConfiguration.CURRENT_USER_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.CURRENT_USER_SERVICE_NAME)
 	private final CurrentUserService currentUserService;
-	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_MAPPER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_MAPPER_NAME)
 	private final CallContextMapper callContextMapper;
 
 	@Override

archive-manager-server/src/main/java/de/ozgcloud/archive/common/callcontext/CallContextProvider.java

@@ -31,13 +31,13 @@ import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.archive.ArchiveManagerConfiguration;
 import lombok.RequiredArgsConstructor;
 
-@Component(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
+@Component(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME)
 @RequiredArgsConstructor
 public class CallContextProvider implements OzgCloudCallContextProvider {
 
-	@Qualifier(ArchiveManagerConfiguration.CURRENT_USER_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.CURRENT_USER_SERVICE_NAME)
 	private final CurrentUserService currentUserService;
-	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_MAPPER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_MAPPER_NAME)
 	private final CallContextMapper mapper;
 
 	@Override

archive-manager-server/src/main/java/de/ozgcloud/archive/common/callcontext/CurrentUserService.java

@@ -42,7 +42,7 @@ import de.ozgcloud.common.grpc.GrpcUtil;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
-@Service(ArchiveManagerConfiguration.CURRENT_USER_SERVICE_NAME) // NOSONAR
+@Service(ArchiveManagerConfiguration.CURRENT_USER_SERVICE_NAME)
 public class CurrentUserService {
 
 	private final AuthenticationTrustResolver trustResolver;
@@ -97,7 +97,6 @@ public class CurrentUserService {
 		return ThreadContext.getContext().getOrDefault(GrpcUtil.KEY_REQUEST_ID, UUID.randomUUID().toString());
 	}
 
-
 	public SecurityContext startAndReturnPreviousSecurityContext(CallContextUser user) {
 		var prevContext = SecurityContextHolder.getContext();
 

archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandRemoteService.java

@@ -39,14 +39,14 @@ import lombok.RequiredArgsConstructor;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @RequiredArgsConstructor
-@Service(ArchiveManagerConfiguration.COMMAND_REMOTE_SERVICE_NAME) // NOSONAR
+@Service(ArchiveManagerConfiguration.COMMAND_REMOTE_SERVICE_NAME)
 class CommandRemoteService {
 
-	@GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME) // NOSONAR
+	@GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME)
 	private final CommandServiceBlockingStub grpcService;
-	@Qualifier(ArchiveManagerConfiguration.COMMAND_MAPPER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.COMMAND_MAPPER_NAME)
 	private final CommandMapper mapper;
-	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME)
 	private final OzgCloudCallContextProvider contextProvider;
 
 	public Stream<ArchiveManagerCommand> findCommands(String vorgangId, Optional<String> status, Optional<String> order) {

archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandService.java

@@ -39,13 +39,13 @@ import de.ozgcloud.command.CommandStatus;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
-@Service(ArchiveManagerConfiguration.COMMAND_SERVICE_NAME) // NOSONAR
+@Service(ArchiveManagerConfiguration.COMMAND_SERVICE_NAME)
 @RequiredArgsConstructor
 public class CommandService {
 
-	@Qualifier(ArchiveManagerConfiguration.COMMAND_REMOTE_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.COMMAND_REMOTE_SERVICE_NAME)
 	private final CommandRemoteService remoteService;
-	@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_COMMAND_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_COMMAND_SERVICE_NAME)
 	private final OzgCloudCommandService ozgCloudCommandService;
 
 	public Stream<ArchiveManagerCommand> findPending(String vorgangId, String order) {

archive-manager-server/src/main/java/de/ozgcloud/archive/common/user/UserService.java

@@ -33,16 +33,16 @@ import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
 import de.ozgcloud.archive.ArchiveManagerConfiguration;
 import lombok.RequiredArgsConstructor;
 
-@Service(ArchiveManagerConfiguration.USER_SERVICE_NAME) // NOSONAR
+@Service(ArchiveManagerConfiguration.USER_SERVICE_NAME)
 @RequiredArgsConstructor
 public class UserService {
 
 	private static final String SYSTEM_USER_ID_PREFIX = "system_";
 
-	@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_USER_PROFILE_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_USER_PROFILE_SERVICE_NAME)
 	private final OzgCloudUserProfileService grpcOzgCloudUserProfileService;
 
-	@Qualifier(ArchiveManagerConfiguration.USER_PROFILE_MAPPER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.USER_PROFILE_MAPPER_NAME)
 	private final UserProfileMapper mapper;
 
 	public String getFullNameById(String userId) {

archive-manager-server/src/main/java/de/ozgcloud/archive/export/ExportService.java

@@ -65,10 +65,10 @@ public class ExportService {
 	private final XdomeaXmlMarshaller xDomeaXmlMarshaller;
 
 	private final ExportFileService exportFileService;
-	@Qualifier(ArchiveManagerConfiguration.VORGANG_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.VORGANG_SERVICE_NAME)
 	private final VorgangService vorgangService;
 	private final ExportHistorieService exportHistorieService;
-	@Qualifier(ArchiveManagerConfiguration.KOMMENTAR_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.KOMMENTAR_SERVICE_NAME)
 	private final ExportKommentarService exportKommentarService;
 	private final ExportNachrichtService exportNachrichtService;
 	private final ExportBescheidService exportBescheidService;

archive-manager-server/src/main/java/de/ozgcloud/archive/file/OzgFileRemoteService.java

@@ -41,10 +41,10 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
 @RequiredArgsConstructor
 class OzgFileRemoteService {
 
-	@GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME) // NOSONAR
+	@GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME)
 	private final FileServiceBlockingStub grpcService;
 	private final OzgFileMapper fileMapper;
-	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME)
 	private final OzgCloudCallContextProvider contextProvider;
 
 	public Stream<OzgFile> getAttachments(String vorgangId) {

archive-manager-server/src/main/java/de/ozgcloud/archive/historie/VorgangChangeHistoryService.java

@@ -40,10 +40,10 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 class VorgangChangeHistoryService {
 
-	@Qualifier(ArchiveManagerConfiguration.USER_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.USER_SERVICE_NAME)
 	private final UserService userService;
 
-	@Qualifier(ArchiveManagerConfiguration.COMMAND_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.COMMAND_SERVICE_NAME)
 	private final CommandService commandService;
 
 	public VorgangChangeHistory createVorgangChangeHistory(VorgangWithEingang vorgang) {

archive-manager-server/src/main/java/de/ozgcloud/archive/kommentar/ExportKommentarService.java

@@ -41,11 +41,11 @@ import lombok.RequiredArgsConstructor;
 @Service(ArchiveManagerConfiguration.KOMMENTAR_SERVICE_NAME)
 public class ExportKommentarService {
 
-	@Qualifier(ArchiveManagerConfiguration.KOMMENTAR_REMOTE_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.KOMMENTAR_REMOTE_SERVICE_NAME)
 	private final KommentarRemoteService kommentarRemoteService;
-	@Qualifier(ArchiveManagerConfiguration.BINARY_FILE_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.BINARY_FILE_SERVICE_NAME)
 	private final BinaryFileService binaryFileService;
-	@Qualifier(ArchiveManagerConfiguration.USER_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.USER_SERVICE_NAME)
 	private final UserService userService;
 
 	public KommentarsExportData createExportData(VorgangWithEingang vorgang) {

archive-manager-server/src/main/java/de/ozgcloud/archive/kommentar/KommentarRemoteService.java

@@ -36,7 +36,7 @@ import de.ozgcloud.vorgang.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.Vo
 import lombok.RequiredArgsConstructor;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
-@Service(ArchiveManagerConfiguration.KOMMENTAR_REMOTE_SERVICE_NAME) // NOSONAR
+@Service(ArchiveManagerConfiguration.KOMMENTAR_REMOTE_SERVICE_NAME)
 @RequiredArgsConstructor
 class KommentarRemoteService {
 
@@ -45,7 +45,7 @@ class KommentarRemoteService {
 	@GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME)
 	private final VorgangAttachedItemServiceBlockingStub grpcService;
 	private final KommentarMapper mapper;
-	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME)
 	private final OzgCloudCallContextProvider contextProvider;
 
 	public Stream<Kommentar> findByVorgangId(String vorgangId) {

archive-manager-server/src/main/java/de/ozgcloud/archive/postfach/ExportNachrichtService.java

@@ -46,7 +46,7 @@ public class ExportNachrichtService {
 
 	private final PostfachMailRemoteService postfachMailRemoteService;
 	private final BinaryFileService binaryFileService;
-	@Qualifier(ArchiveManagerConfiguration.USER_SERVICE_NAME) // NOSONAR
+	@Qualifier(ArchiveManagerConfiguration.USER_SERVICE_NAME)
 	private final UserService userService;
 
 	public PostfachMailExportData createExportData(VorgangWithEingang vorgang) {