valitydev/deanonimus
14
0
Fork 0
mirror of https://github.com/valitydev/deanonimus.git synced 2024-11-06 02:05:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from rbkmoney/ft/fixed-dublicates

Browse Source 
Fixed merge conflict in collector
This commit is contained in:
Pospolita Nikita 2020-10-22 18:47:58 +03:00 committed by GitHub
commit 678ede14ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_utils

@ -1 +1 @@
Subproject commit e6b981649e073a2dbf646ab491212a2c951aeb19 Subproject commit f42e059d9ec93826ba4ad23232eed8ce67bd5486

2
pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.rbkmoney</groupId> <groupId>com.rbkmoney</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.3.RELEASE</version> <version>2.3.4.RELEASE</version>
</parent> </parent>
<artifactId>deanonimus</artifactId> <artifactId>deanonimus</artifactId>

2
src/main/java/com/rbkmoney/deanonimus/converter/ContractConverter.java
View File

@ -17,7 +17,7 @@ public class ContractConverter {
return Optional.ofNullable(contracts).orElse(Collections.emptyList()) return Optional.ofNullable(contracts).orElse(Collections.emptyList())
.stream() .stream()
.map(this::convertToEntity) .map(this::convertToEntity)
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a));
} }
private Map.Entry<String, Contract> convertToEntity(com.rbkmoney.deanonimus.domain.Contract contract) { private Map.Entry<String, Contract> convertToEntity(com.rbkmoney.deanonimus.domain.Contract contract) {

2
src/main/java/com/rbkmoney/deanonimus/converter/ContractorConverter.java
View File

@ -17,7 +17,7 @@ public class ContractorConverter {
return Optional.ofNullable(contractors).orElse(Collections.emptyList()) return Optional.ofNullable(contractors).orElse(Collections.emptyList())
.stream() .stream()
.map(this::convertToEntity) .map(this::convertToEntity)
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a));
} }
private Map.Entry<String, PartyContractor> convertToEntity(Contractor contractor) { private Map.Entry<String, PartyContractor> convertToEntity(Contractor contractor) {

2
src/main/java/com/rbkmoney/deanonimus/converter/ShopConverter.java
View File

@ -17,7 +17,7 @@ public class ShopConverter {
return Optional.ofNullable(shops).orElse(Collections.emptyList()) return Optional.ofNullable(shops).orElse(Collections.emptyList())
.stream() .stream()
.map(this::convertToEntity) .map(this::convertToEntity)
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a));
} }
private Map.Entry<String, Shop> convertToEntity(com.rbkmoney.deanonimus.domain.Shop shopDomain) { private Map.Entry<String, Shop> convertToEntity(com.rbkmoney.deanonimus.domain.Shop shopDomain) {