Skip to content
Snippets Groups Projects
Commit 8b2b4a34 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6990 refactor configuration

parent e592f962
No related branches found
No related tags found
No related merge requests found
Showing
with 104 additions and 139 deletions
...@@ -10,12 +10,23 @@ import de.ozgcloud.apilib.client_attribute.grpc.OzgCloudClientAttributeMapper; ...@@ -10,12 +10,23 @@ import de.ozgcloud.apilib.client_attribute.grpc.OzgCloudClientAttributeMapper;
import de.ozgcloud.apilib.common.command.OzgCloudCommandService; import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.grpc.CommandMapper; import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService; import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService;
import de.ozgcloud.apilib.file.OzgCloudFileService;
import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService;
import de.ozgcloud.apilib.file.grpc.OzgCloudFileMapper;
import de.ozgcloud.apilib.user.GrpcOzgCloudUserProfileService;
import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
import de.ozgcloud.apilib.user.UserProfileMapper;
import de.ozgcloud.archive.common.callcontext.CallContextProvider; import de.ozgcloud.archive.common.callcontext.CallContextProvider;
import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub; import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub; import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.client.inject.GrpcClient; import net.devh.boot.grpc.client.inject.GrpcClient;
@Configuration @Configuration
@RequiredArgsConstructor
public class ArchiveManagerConfiguration { // NOSONAR public class ArchiveManagerConfiguration { // NOSONAR
public static final String VORGANG_SERVICE_NAME = "archive_VorgangService"; public static final String VORGANG_SERVICE_NAME = "archive_VorgangService";
...@@ -55,24 +66,48 @@ public class ArchiveManagerConfiguration { // NOSONAR ...@@ -55,24 +66,48 @@ public class ArchiveManagerConfiguration { // NOSONAR
public static final String CALL_CONTEXT_SERVER_INTERCEPTOR_NAME = "archive_CallContextGrpcServerInterceptor"; public static final String CALL_CONTEXT_SERVER_INTERCEPTOR_NAME = "archive_CallContextGrpcServerInterceptor";
public static final String GRPC_VORGANG_MANAGER_NAME = "vorgang-manager"; public static final String GRPC_VORGANG_MANAGER_CLIENT_NAME = "vorgang-manager";
public static final String GRPC_COMMAND_MANAGER_NAME = "command-manager"; public static final String GRPC_COMMAND_MANAGER_CLIENT_NAME = "command-manager";
public static final String GRPC_FILE_MANAGER_CLIENT_NAME = "file-manager";
public static final String GRPC_USER_MANAGER_CLIENT_NAME = "user-manager";
@GrpcClient(GRPC_VORGANG_MANAGER_NAME) @GrpcClient(GRPC_VORGANG_MANAGER_CLIENT_NAME)
private ClientAttributeServiceBlockingStub clientAttributeServiceBlockingStub; private final ClientAttributeServiceBlockingStub clientAttributeServiceBlockingStub;
@GrpcClient(GRPC_COMMAND_MANAGER_NAME)
private CommandServiceBlockingStub commandServiceStub; @GrpcClient(GRPC_COMMAND_MANAGER_CLIENT_NAME)
private final CommandServiceBlockingStub commandServiceStub;
@GrpcClient(GRPC_USER_MANAGER_CLIENT_NAME)
private final UserProfileServiceBlockingStub userProfileServiceBlockingStub;
@GrpcClient(GRPC_FILE_MANAGER_CLIENT_NAME)
private final BinaryFileServiceBlockingStub binaryFileServiceBlockingStub;
@GrpcClient(GRPC_FILE_MANAGER_CLIENT_NAME)
private final BinaryFileServiceStub binaryFileServiceStub;
@Qualifier(CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
private final CallContextProvider callContextProvider;
@Bean(ArchiveManagerConfiguration.OZGCLOUD_FILE_SERVICE_NAME) // NOSONAR
OzgCloudFileService ozgCloudFileService(OzgCloudFileMapper mapper) {
return new GrpcOzgCloudFileService(binaryFileServiceBlockingStub, binaryFileServiceStub, callContextProvider, mapper);
}
@Bean(ArchiveManagerConfiguration.OZGCLOUD_USER_PROFILE_SERVICE_NAME) // NOSONAR
OzgCloudUserProfileService grpcOzgCloudUserProfileService(UserProfileMapper userProfileMapper) {
return new GrpcOzgCloudUserProfileService(userProfileServiceBlockingStub, userProfileMapper, callContextProvider);
}
@Bean(OZGCLOUD_CLIENT_ATTRIBUTE_SERVICE_NAME) // NOSONAR @Bean(OZGCLOUD_CLIENT_ATTRIBUTE_SERVICE_NAME) // NOSONAR
OzgCloudClientAttributeService ozgCloudAttributesService(OzgCloudClientAttributeMapper mapper, OzgCloudClientAttributeService ozgCloudAttributesService(OzgCloudClientAttributeMapper mapper) {
@Qualifier(CALL_CONTEXT_PROVIDER_NAME) CallContextProvider contextProvider) { // NOSONAR return new OzgCloudClientAttributeGrpcService(clientAttributeServiceBlockingStub, mapper, callContextProvider);
return new OzgCloudClientAttributeGrpcService(clientAttributeServiceBlockingStub, mapper, contextProvider);
} }
@Bean(OZGCLOUD_COMMAND_SERVICE_NAME) // NOSONAR @Bean(OZGCLOUD_COMMAND_SERVICE_NAME) // NOSONAR
OzgCloudCommandService ozgCloudCommandService(CommandMapper commandMapper, OzgCloudCommandService ozgCloudCommandService(CommandMapper commandMapper) {
@Qualifier(CALL_CONTEXT_PROVIDER_NAME) CallContextProvider contextProvider) { // NOSONAR return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, callContextProvider,
return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider,
GrpcOzgCloudCommandService.DEFAULT_COMMAND_REQUEST_THRESHOLD_MILLIS); GrpcOzgCloudCommandService.DEFAULT_COMMAND_REQUEST_THRESHOLD_MILLIS);
} }
} }
package de.ozgcloud.archive;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.apilib.file.OzgCloudFileService;
import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService;
import de.ozgcloud.apilib.file.grpc.OzgCloudFileMapper;
import de.ozgcloud.apilib.user.GrpcOzgCloudUserProfileService;
import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
import de.ozgcloud.apilib.user.UserProfileMapper;
import de.ozgcloud.archive.common.GrpcUtil;
import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
import net.devh.boot.grpc.client.inject.GrpcClient;
@Configuration
class OzgcloudConfiguration {
@GrpcClient(GrpcUtil.USER_MANAGER_GRPC_CLIENT)
private UserProfileServiceBlockingStub userProfileServiceBlockingStub;
@GrpcClient(GrpcUtil.FILE_MANAGER_GRPC_CLIENT)
private BinaryFileServiceBlockingStub binaryFileServiceBlockingStub;
@GrpcClient(GrpcUtil.FILE_MANAGER_GRPC_CLIENT)
private BinaryFileServiceStub binaryFileServiceStub;
@Bean(ArchiveManagerConfiguration.OZGCLOUD_FILE_SERVICE_NAME)
OzgCloudFileService ozgCloudFileService(
@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_CALL_CONTEXT_PROVIDER_NAME) OzgCloudCallContextProvider contextProvider,
OzgCloudFileMapper mapper) {
return new GrpcOzgCloudFileService(binaryFileServiceBlockingStub, binaryFileServiceStub, contextProvider, mapper);
}
@Bean(ArchiveManagerConfiguration.OZGCLOUD_USER_PROFILE_SERVICE_NAME) // NOSONAR
OzgCloudUserProfileService grpcOzgCloudUserProfileService(
@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_CALL_CONTEXT_PROVIDER_NAME) OzgCloudCallContextProvider callContextProvider,
UserProfileMapper userProfileMapper) {
return new GrpcOzgCloudUserProfileService(userProfileServiceBlockingStub, userProfileMapper, callContextProvider);
}
}
...@@ -2,29 +2,27 @@ package de.ozgcloud.archive.bescheid; ...@@ -2,29 +2,27 @@ package de.ozgcloud.archive.bescheid;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.archive.ArchiveManagerConfiguration; import de.ozgcloud.archive.ArchiveManagerConfiguration;
import de.ozgcloud.archive.common.GrpcUtil;
import de.ozgcloud.document.bescheid.BescheidServiceGrpc.BescheidServiceBlockingStub; import de.ozgcloud.document.bescheid.BescheidServiceGrpc.BescheidServiceBlockingStub;
import de.ozgcloud.document.bescheid.GrpcGetAllBescheidRequest; import de.ozgcloud.document.bescheid.GrpcGetAllBescheidRequest;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.client.inject.GrpcClient; import net.devh.boot.grpc.client.inject.GrpcClient;
@Service(ArchiveManagerConfiguration.BESCHEID_REMOTE_SERVICE_NAME) // NOSONAR @Service(ArchiveManagerConfiguration.BESCHEID_REMOTE_SERVICE_NAME) // NOSONAR
@RequiredArgsConstructor
class BescheidRemoteService { class BescheidRemoteService {
@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT) @GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME)
private BescheidServiceBlockingStub grpcService; private final BescheidServiceBlockingStub grpcService;
@Autowired
@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR @Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
private OzgCloudCallContextProvider contextProvider; private final OzgCloudCallContextProvider contextProvider;
@Autowired
@Qualifier(ArchiveManagerConfiguration.BESCHEID_MAPPER_NAME) // NOSONAR @Qualifier(ArchiveManagerConfiguration.BESCHEID_MAPPER_NAME) // NOSONAR
private BescheidMapper bescheidMapper; private final BescheidMapper bescheidMapper;
public Stream<Bescheid> findByVorgangId(String vorgangId) { public Stream<Bescheid> findByVorgangId(String vorgangId) {
var request = buildGetAllBescheidRequest(vorgangId); var request = buildGetAllBescheidRequest(vorgangId);
......
package de.ozgcloud.archive.bescheid; package de.ozgcloud.archive.bescheid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.archive.ArchiveManagerConfiguration; import de.ozgcloud.archive.ArchiveManagerConfiguration;
import de.ozgcloud.archive.common.GrpcUtil;
import de.ozgcloud.common.binaryfile.FileId; import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.document.DocumentServiceGrpc.DocumentServiceBlockingStub; import de.ozgcloud.document.DocumentServiceGrpc.DocumentServiceBlockingStub;
import de.ozgcloud.document.GrpcGetDocumentRequest; import de.ozgcloud.document.GrpcGetDocumentRequest;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.client.inject.GrpcClient; import net.devh.boot.grpc.client.inject.GrpcClient;
@Service(ArchiveManagerConfiguration.DOCUMENT_REMOTE_SERVICE_NAME) // NOSONAR @Service(ArchiveManagerConfiguration.DOCUMENT_REMOTE_SERVICE_NAME) // NOSONAR
@RequiredArgsConstructor
class DocumentRemoteService { class DocumentRemoteService {
@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT) @GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME) // NOSONAR
private DocumentServiceBlockingStub grpcService; private final DocumentServiceBlockingStub grpcService;
@Autowired
@Qualifier(ArchiveManagerConfiguration.DOCUMENT_MAPPER_NAME) // NOSONAR @Qualifier(ArchiveManagerConfiguration.DOCUMENT_MAPPER_NAME) // NOSONAR
private DocumentMapper documentMapper; private final DocumentMapper documentMapper;
@Autowired
@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR @Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
private OzgCloudCallContextProvider contextProvider; private final OzgCloudCallContextProvider contextProvider;
public FileId getDocument(String documentId) { public FileId getDocument(String documentId) {
var response = getGrpcServiceWithInterceptor().getDocument(GrpcGetDocumentRequest.newBuilder().setId(documentId).build()); var response = getGrpcServiceWithInterceptor().getDocument(GrpcGetDocumentRequest.newBuilder().setId(documentId).build());
......
package de.ozgcloud.archive.common;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class GrpcUtil {
public static final String VORGANG_MANAGER_GRPC_CLIENT = "vorgang-manager";
public static final String FILE_MANAGER_GRPC_CLIENT = "file-manager";
public static final String USER_MANAGER_GRPC_CLIENT = "user-manager";
}
...@@ -4,7 +4,6 @@ import java.io.OutputStream; ...@@ -4,7 +4,6 @@ import java.io.OutputStream;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -12,32 +11,32 @@ import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterce ...@@ -12,32 +11,32 @@ import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterce
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.apilib.file.OzgCloudFileService; import de.ozgcloud.apilib.file.OzgCloudFileService;
import de.ozgcloud.archive.ArchiveManagerConfiguration; import de.ozgcloud.archive.ArchiveManagerConfiguration;
import de.ozgcloud.archive.common.GrpcUtil;
import de.ozgcloud.archive.file.OzgFile; import de.ozgcloud.archive.file.OzgFile;
import de.ozgcloud.archive.file.OzgFileMapper; import de.ozgcloud.archive.file.OzgFileMapper;
import de.ozgcloud.common.binaryfile.FileId; import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub; import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcBinaryFilesRequest; import de.ozgcloud.vorgang.grpc.binaryFile.GrpcBinaryFilesRequest;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse; import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.client.inject.GrpcClient; import net.devh.boot.grpc.client.inject.GrpcClient;
@Service(ArchiveManagerConfiguration.BINARY_FILE_REMOTE_SERVICE_NAME) // NOSONAR @Service(ArchiveManagerConfiguration.BINARY_FILE_REMOTE_SERVICE_NAME) // NOSONAR
@RequiredArgsConstructor
class BinaryFileRemoteService { class BinaryFileRemoteService {
@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT) @GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME) // NOSONAR
private BinaryFileServiceBlockingStub grpcService; private final BinaryFileServiceBlockingStub grpcService;
@Autowired
@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_FILE_SERVICE_NAME) @Qualifier(ArchiveManagerConfiguration.OZGCLOUD_FILE_SERVICE_NAME) // NOSONAR
private OzgCloudFileService ozgCloudFileService; private final OzgCloudFileService ozgCloudFileService;
@Autowired
private OzgFileMapper ozgFileMapper; private final OzgFileMapper ozgFileMapper;
@Autowired
@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) @Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
private OzgCloudCallContextProvider contextProvider; private final OzgCloudCallContextProvider contextProvider;
@Autowired
@Qualifier(ArchiveManagerConfiguration.FILE_ID_MAPPER_NAME) // NOSONAR @Qualifier(ArchiveManagerConfiguration.FILE_ID_MAPPER_NAME) // NOSONAR
private FileIdMapper fileIdMapper; private final FileIdMapper fileIdMapper;
public Stream<OzgFile> getFiles(List<FileId> fileIds) { public Stream<OzgFile> getFiles(List<FileId> fileIds) {
var response = getGrpcServiceWithInterceptor().findBinaryFilesMetaData(buildBinaryFilesRequest(fileIds)); var response = getGrpcServiceWithInterceptor().findBinaryFilesMetaData(buildBinaryFilesRequest(fileIds));
......
...@@ -3,29 +3,27 @@ package de.ozgcloud.archive.common.command; ...@@ -3,29 +3,27 @@ package de.ozgcloud.archive.common.command;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.archive.ArchiveManagerConfiguration; import de.ozgcloud.archive.ArchiveManagerConfiguration;
import de.ozgcloud.archive.common.GrpcUtil;
import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub; import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.command.GrpcFindCommandsRequest; import de.ozgcloud.vorgang.grpc.command.GrpcFindCommandsRequest;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.client.inject.GrpcClient; import net.devh.boot.grpc.client.inject.GrpcClient;
@RequiredArgsConstructor
@Service(ArchiveManagerConfiguration.COMMAND_REMOTE_SERVICE_NAME) // NOSONAR @Service(ArchiveManagerConfiguration.COMMAND_REMOTE_SERVICE_NAME) // NOSONAR
class CommandRemoteService { class CommandRemoteService {
@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT) @GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME) // NOSONAR
private CommandServiceBlockingStub grpcService; private final CommandServiceBlockingStub grpcService;
@Autowired
@Qualifier(ArchiveManagerConfiguration.COMMAND_MAPPER_NAME) // NOSONAR @Qualifier(ArchiveManagerConfiguration.COMMAND_MAPPER_NAME) // NOSONAR
private CommandMapper mapper; private final CommandMapper mapper;
@Autowired
@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR @Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
private OzgCloudCallContextProvider contextProvider; private final OzgCloudCallContextProvider contextProvider;
public Stream<ArchiveCommand> findCommands(String vorgangId, Optional<String> status, Optional<String> order) { public Stream<ArchiveCommand> findCommands(String vorgangId, Optional<String> status, Optional<String> order) {
var response = getGrpcServiceWithInterceptor().findCommands(buildFindCommandsRequest(vorgangId, status, order)); var response = getGrpcServiceWithInterceptor().findCommands(buildFindCommandsRequest(vorgangId, status, order));
......
...@@ -9,22 +9,22 @@ import org.springframework.stereotype.Service; ...@@ -9,22 +9,22 @@ import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.archive.ArchiveManagerConfiguration; import de.ozgcloud.archive.ArchiveManagerConfiguration;
import de.ozgcloud.archive.common.GrpcUtil;
import de.ozgcloud.vorgang.grpc.file.FileServiceGrpc.FileServiceBlockingStub; import de.ozgcloud.vorgang.grpc.file.FileServiceGrpc.FileServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.file.GrpcGetAttachmentsRequest; import de.ozgcloud.vorgang.grpc.file.GrpcGetAttachmentsRequest;
import de.ozgcloud.vorgang.grpc.file.GrpcGetRepresentationsRequest; import de.ozgcloud.vorgang.grpc.file.GrpcGetRepresentationsRequest;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.client.inject.GrpcClient; import net.devh.boot.grpc.client.inject.GrpcClient;
@Service @Service
@RequiredArgsConstructor
class OzgFileRemoteService { class OzgFileRemoteService {
@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT) @GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME) // NOSONAR
private FileServiceBlockingStub grpcService; private final FileServiceBlockingStub grpcService;
@Autowired @Autowired
private OzgFileMapper fileMapper; private final OzgFileMapper fileMapper;
@Autowired @Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) private final OzgCloudCallContextProvider contextProvider;
private OzgCloudCallContextProvider contextProvider;
public Stream<OzgFile> getAttachments(String vorgangId) { public Stream<OzgFile> getAttachments(String vorgangId) {
return getGrpcServiceWithInterceptor().getAttachments(buildGrpcGetAttachmentsRequest(vorgangId)).getFileList().stream() return getGrpcServiceWithInterceptor().getAttachments(buildGrpcGetAttachmentsRequest(vorgangId)).getFileList().stream()
......
...@@ -25,31 +25,28 @@ package de.ozgcloud.archive.kommentar; ...@@ -25,31 +25,28 @@ package de.ozgcloud.archive.kommentar;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.archive.ArchiveManagerConfiguration; import de.ozgcloud.archive.ArchiveManagerConfiguration;
import de.ozgcloud.archive.common.GrpcUtil;
import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest; import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
import de.ozgcloud.vorgang.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub; import de.ozgcloud.vorgang.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.client.inject.GrpcClient; import net.devh.boot.grpc.client.inject.GrpcClient;
@Service(ArchiveManagerConfiguration.KOMMENTAR_REMOTE_SERVICE_NAME) @Service(ArchiveManagerConfiguration.KOMMENTAR_REMOTE_SERVICE_NAME) // NOSONAR
@RequiredArgsConstructor
class KommentarRemoteService { class KommentarRemoteService {
static final String ITEM_NAME = "Kommentar"; static final String ITEM_NAME = "Kommentar";
@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT) @GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME)
private VorgangAttachedItemServiceBlockingStub grpcService; private final VorgangAttachedItemServiceBlockingStub grpcService;
@Autowired private final KommentarMapper mapper;
private KommentarMapper mapper;
@Autowired
@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR @Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
private OzgCloudCallContextProvider contextProvider; private final OzgCloudCallContextProvider contextProvider;
public Stream<Kommentar> findByVorgangId(String vorgangId) { public Stream<Kommentar> findByVorgangId(String vorgangId) {
var response = getGrpcServiceWithInterceptor().find(buildFindRequest(vorgangId)); var response = getGrpcServiceWithInterceptor().find(buildFindRequest(vorgangId));
......
...@@ -28,7 +28,7 @@ import java.util.stream.Stream; ...@@ -28,7 +28,7 @@ import java.util.stream.Stream;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import de.ozgcloud.archive.common.GrpcUtil; import de.ozgcloud.archive.ArchiveManagerConfiguration;
import de.ozgcloud.nachrichten.postfach.GrpcFindPostfachMailsRequest; import de.ozgcloud.nachrichten.postfach.GrpcFindPostfachMailsRequest;
import de.ozgcloud.nachrichten.postfach.PostfachServiceGrpc.PostfachServiceBlockingStub; import de.ozgcloud.nachrichten.postfach.PostfachServiceGrpc.PostfachServiceBlockingStub;
import net.devh.boot.grpc.client.inject.GrpcClient; import net.devh.boot.grpc.client.inject.GrpcClient;
...@@ -36,7 +36,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient; ...@@ -36,7 +36,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@Service @Service
class PostfachMailRemoteService { class PostfachMailRemoteService {
@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT) @GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME)
private PostfachServiceBlockingStub grpcService; private PostfachServiceBlockingStub grpcService;
@Autowired @Autowired
private PostfachMailMapper postfachNachrichtMapper; private PostfachMailMapper postfachNachrichtMapper;
......
package de.ozgcloud.archive.vorgang; package de.ozgcloud.archive.vorgang;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider; import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.archive.ArchiveManagerConfiguration; import de.ozgcloud.archive.ArchiveManagerConfiguration;
import de.ozgcloud.archive.common.GrpcUtil;
import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangRequest; import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangRequest;
import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub; import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -17,14 +15,14 @@ import net.devh.boot.grpc.client.inject.GrpcClient; ...@@ -17,14 +15,14 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@RequiredArgsConstructor @RequiredArgsConstructor
class VorgangRemoteService { class VorgangRemoteService {
@GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT) @GrpcClient(ArchiveManagerConfiguration.GRPC_VORGANG_MANAGER_CLIENT_NAME) // NOSONAR
private VorgangServiceBlockingStub grpcService; private final VorgangServiceBlockingStub grpcService;
@Autowired
@Qualifier(ArchiveManagerConfiguration.VORGANG_WITH_EINGANG_MAPPER_NAME) // NOSONAR @Qualifier(ArchiveManagerConfiguration.VORGANG_WITH_EINGANG_MAPPER_NAME) // NOSONAR
private VorgangWithEingangMapper vorgangWithEingangMapper; private final VorgangWithEingangMapper vorgangWithEingangMapper;
@Autowired
@Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) @Qualifier(ArchiveManagerConfiguration.CALL_CONTEXT_PROVIDER_NAME) // NOSONAR
private OzgCloudCallContextProvider contextProvider; private final OzgCloudCallContextProvider contextProvider;
public VorgangWithEingang findVorgangWithEingang(String vorgangId) { public VorgangWithEingang findVorgangWithEingang(String vorgangId) {
return vorgangWithEingangMapper return vorgangWithEingangMapper
......
...@@ -29,3 +29,4 @@ lombok.data.flagUsage = ERROR ...@@ -29,3 +29,4 @@ lombok.data.flagUsage = ERROR
lombok.nonNull.exceptionType = IllegalArgumentException lombok.nonNull.exceptionType = IllegalArgumentException
lombok.addLombokGeneratedAnnotation = true lombok.addLombokGeneratedAnnotation = true
lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Qualifier lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Qualifier
lombok.copyableAnnotations += net.devh.boot.grpc.client.inject.GrpcClient
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment