Skip to content
Snippets Groups Projects
Commit 0f5b8223 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6944 add qualifier to OzgCloudFileMapper

parent 553ccffb
No related branches found
No related tags found
No related merge requests found
...@@ -23,6 +23,7 @@ public class NachrichtenManagerConfiguration { ...@@ -23,6 +23,7 @@ public class NachrichtenManagerConfiguration {
public static final String NACHRICHTEN_VORGANG_SERVICE = "nachrichten_vorgangService"; public static final String NACHRICHTEN_VORGANG_SERVICE = "nachrichten_vorgangService";
public static final String NACHRICHTEN_VORGANG_REMOTE_SERVICE = "nachrichten_vorgangRemoteService"; public static final String NACHRICHTEN_VORGANG_REMOTE_SERVICE = "nachrichten_vorgangRemoteService";
public static final String NACHRICHTEN_ATTACHED_ITEM_SERVICE = "nachrichten_attachedItemService"; public static final String NACHRICHTEN_ATTACHED_ITEM_SERVICE = "nachrichten_attachedItemService";
public static final String NACHRICHTEN_OZG_CLOUD_FILE_MAPPER = "nachrichten_OzgCloudFileMapperImpl";
public static final String GRPC_VORGANG_MANAGER_NAME = "vorgang-manager"; public static final String GRPC_VORGANG_MANAGER_NAME = "vorgang-manager";
public static final String GRPC_COMMAND_MANAGER_NAME = "command-manager"; public static final String GRPC_COMMAND_MANAGER_NAME = "command-manager";
......
...@@ -34,12 +34,14 @@ import java.util.stream.Stream; ...@@ -34,12 +34,14 @@ import java.util.stream.Stream;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import de.ozgcloud.apilib.file.OzgCloudFile; import de.ozgcloud.apilib.file.OzgCloudFile;
import de.ozgcloud.common.errorhandling.TechnicalException; import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.nachrichten.NachrichtenManagerConfiguration;
import de.ozgcloud.nachrichten.common.vorgang.VorgangService; import de.ozgcloud.nachrichten.common.vorgang.VorgangService;
import de.ozgcloud.nachrichten.postfach.PostfachNachricht; import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
import io.grpc.stub.StreamObserver; import io.grpc.stub.StreamObserver;
...@@ -57,6 +59,7 @@ class AntragraumGrpcService extends AntragraumServiceGrpc.AntragraumServiceImplB ...@@ -57,6 +59,7 @@ class AntragraumGrpcService extends AntragraumServiceGrpc.AntragraumServiceImplB
private final AntragraumNachrichtMapper mapper; private final AntragraumNachrichtMapper mapper;
private final RueckfrageMapper rueckfrageMapper; private final RueckfrageMapper rueckfrageMapper;
private final AttachmentFileRequestMapper attachmentFileRequestMapper; private final AttachmentFileRequestMapper attachmentFileRequestMapper;
@Qualifier(NachrichtenManagerConfiguration.NACHRICHTEN_OZG_CLOUD_FILE_MAPPER)
private final OzgCloudFileMapper ozgCloudFileMapper; private final OzgCloudFileMapper ozgCloudFileMapper;
private final VorgangService vorgangService; private final VorgangService vorgangService;
......
package de.ozgcloud.nachrichten.antragraum; package de.ozgcloud.nachrichten.antragraum;
import org.mapstruct.AnnotateWith;
import org.mapstruct.AnnotateWith.Element;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy; import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
import org.springframework.stereotype.Component;
import de.ozgcloud.apilib.file.OzgCloudFile; import de.ozgcloud.apilib.file.OzgCloudFile;
import de.ozgcloud.nachrichten.NachrichtenManagerConfiguration;
@AnnotateWith(value = Component.class, elements = @Element(strings = NachrichtenManagerConfiguration.NACHRICHTEN_OZG_CLOUD_FILE_MAPPER))
@Mapper(nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, unmappedTargetPolicy = ReportingPolicy.WARN) @Mapper(nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, unmappedTargetPolicy = ReportingPolicy.WARN)
interface OzgCloudFileMapper { interface OzgCloudFileMapper {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<parent> <parent>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId> <artifactId>ozgcloud-common-parent</artifactId>
<version>4.3.1</version> <version>4.3.2</version>
</parent> </parent>
<groupId>de.ozgcloud.nachrichten</groupId> <groupId>de.ozgcloud.nachrichten</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment