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

OZG-6811 Set Bean name for Mappers

parent dcac9865
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,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>
<relativePath /> <relativePath />
</parent> </parent>
......
...@@ -3,6 +3,7 @@ package de.ozgcloud.bescheid; ...@@ -3,6 +3,7 @@ package de.ozgcloud.bescheid;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import de.ozgcloud.bescheid.BescheidServiceGrpc.BescheidServiceImplBase; import de.ozgcloud.bescheid.BescheidServiceGrpc.BescheidServiceImplBase;
...@@ -20,6 +21,7 @@ import net.devh.boot.grpc.server.service.GrpcService; ...@@ -20,6 +21,7 @@ import net.devh.boot.grpc.server.service.GrpcService;
class BescheidGrpcService extends BescheidServiceImplBase { class BescheidGrpcService extends BescheidServiceImplBase {
private final BescheidService service; private final BescheidService service;
@Qualifier("deprecatedBescheidMapper")
private final BescheidMapper mapper; private final BescheidMapper mapper;
@Override @Override
......
...@@ -13,6 +13,7 @@ import java.util.Optional; ...@@ -13,6 +13,7 @@ import java.util.Optional;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.mapstruct.AnnotateWith;
import org.mapstruct.CollectionMappingStrategy; import org.mapstruct.CollectionMappingStrategy;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;
...@@ -20,6 +21,7 @@ import org.mapstruct.NullValueCheckStrategy; ...@@ -20,6 +21,7 @@ import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.NullValuePropertyMappingStrategy; import org.mapstruct.NullValuePropertyMappingStrategy;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import de.ozgcloud.command.Command; import de.ozgcloud.command.Command;
import de.ozgcloud.common.binaryfile.FileId; import de.ozgcloud.common.binaryfile.FileId;
...@@ -40,6 +42,7 @@ import de.ozgcloud.document.common.attached_item.AttachedItemService; ...@@ -40,6 +42,7 @@ import de.ozgcloud.document.common.attached_item.AttachedItemService;
collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, // collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, //
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, // nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, //
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) // nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) //
@AnnotateWith(value = Component.class, elements = @AnnotateWith.Element(strings = "deprecatedBescheidMapper"))
@Deprecated @Deprecated
public abstract class BescheidMapper { public abstract class BescheidMapper {
......
...@@ -7,14 +7,17 @@ import java.util.HashMap; ...@@ -7,14 +7,17 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.mapstruct.AnnotateWith;
import org.mapstruct.CollectionMappingStrategy; import org.mapstruct.CollectionMappingStrategy;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
import org.springframework.stereotype.Component;
import de.ozgcloud.document.bescheid.SentInfo; import de.ozgcloud.document.bescheid.SentInfo;
@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED) @Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED)
@AnnotateWith(value = Component.class, elements = @AnnotateWith.Element(strings = "deprecatedSentInfoMapper"))
@Deprecated @Deprecated
public interface SentInfoMapper { public interface SentInfoMapper {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment