-
-
Notifications
You must be signed in to change notification settings - Fork 1k
#3591 Potential fix for duplicate methods generated. #3604
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
69d698f
#3591 Potential fix for duplicate methods generated.
Hypnagokali 37d89e5
#3591 Use forged method under creation if it exists
Hypnagokali 2566993
Add test for nested Map and Stream
Hypnagokali 0b90068
#3591 ContainerMappingMethod: create empty selectionParameters if null
Hypnagokali 5a62c04
Add license header
Hypnagokali fc7a6e5
AbstractBaseBuilder#createAssignment stays private and refactoring
Hypnagokali 1887f16
Polish
filiphr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
processor/src/test/java/org/mapstruct/ap/test/bugs/_3591/Bean.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Copyright MapStruct Authors. | ||
| * | ||
| * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 | ||
| */ | ||
| package org.mapstruct.ap.test.bugs._3591; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class Bean { | ||
| private List<Bean> beans; | ||
| private String value; | ||
|
|
||
| public Bean() { | ||
| } | ||
|
|
||
| public Bean(String value) { | ||
| this.value = value; | ||
| } | ||
|
|
||
| public String getValue() { | ||
| return value; | ||
| } | ||
|
|
||
| public void setValue(String value) { | ||
| this.value = value; | ||
| } | ||
|
|
||
| public List<Bean> getBeans() { | ||
| return beans; | ||
| } | ||
|
|
||
| public void setBeans(List<Bean> beans) { | ||
| this.beans = beans; | ||
| } | ||
| } |
30 changes: 30 additions & 0 deletions
30
processor/src/test/java/org/mapstruct/ap/test/bugs/_3591/BeanDto.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright MapStruct Authors. | ||
| * | ||
| * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 | ||
| */ | ||
| package org.mapstruct.ap.test.bugs._3591; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class BeanDto { | ||
|
|
||
| private List<BeanDto> beans; | ||
| private String value; | ||
|
|
||
| public String getValue() { | ||
| return value; | ||
| } | ||
|
|
||
| public void setValue(String value) { | ||
| this.value = value; | ||
| } | ||
|
|
||
| public List<BeanDto> getBeans() { | ||
| return beans; | ||
| } | ||
|
|
||
| public void setBeans(List<BeanDto> beans) { | ||
| this.beans = beans; | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
processor/src/test/java/org/mapstruct/ap/test/bugs/_3591/BeanMapper.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * Copyright MapStruct Authors. | ||
| * | ||
| * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 | ||
| */ | ||
| package org.mapstruct.ap.test.bugs._3591; | ||
|
|
||
| import org.mapstruct.Mapper; | ||
| import org.mapstruct.Mapping; | ||
| import org.mapstruct.MappingTarget; | ||
| import org.mapstruct.factory.Mappers; | ||
|
|
||
| @Mapper | ||
| public interface BeanMapper { | ||
|
|
||
| BeanMapper INSTANCE = Mappers.getMapper( BeanMapper.class ); | ||
|
|
||
| @Mapping(source = "beans", target = "beans") | ||
| BeanDto map(Bean bean, @MappingTarget BeanDto beanDto); | ||
|
|
||
| } |
47 changes: 47 additions & 0 deletions
47
processor/src/test/java/org/mapstruct/ap/test/bugs/_3591/ContainerBean.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright MapStruct Authors. | ||
| * | ||
| * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 | ||
| */ | ||
| package org.mapstruct.ap.test.bugs._3591; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public class ContainerBean { | ||
|
|
||
| private String value; | ||
| private Map<String, ContainerBean> beanMap; | ||
| private Stream<ContainerBean> beanStream; | ||
|
|
||
| public ContainerBean() { | ||
| } | ||
|
|
||
| public ContainerBean(String value) { | ||
| this.value = value; | ||
| } | ||
|
|
||
| public Map<String, ContainerBean> getBeanMap() { | ||
| return beanMap; | ||
| } | ||
|
|
||
| public void setBeanMap(Map<String, ContainerBean> beanMap) { | ||
| this.beanMap = beanMap; | ||
| } | ||
|
|
||
| public Stream<ContainerBean> getBeanStream() { | ||
| return beanStream; | ||
| } | ||
|
|
||
| public void setBeanStream(Stream<ContainerBean> beanStream) { | ||
| this.beanStream = beanStream; | ||
| } | ||
|
|
||
| public String getValue() { | ||
| return value; | ||
| } | ||
|
|
||
| public void setValue(String value) { | ||
| this.value = value; | ||
| } | ||
| } |
40 changes: 40 additions & 0 deletions
40
processor/src/test/java/org/mapstruct/ap/test/bugs/_3591/ContainerBeanDto.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Copyright MapStruct Authors. | ||
| * | ||
| * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 | ||
| */ | ||
| package org.mapstruct.ap.test.bugs._3591; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public class ContainerBeanDto { | ||
|
|
||
| private String value; | ||
| private Map<String, ContainerBeanDto> beanMap; | ||
| private Stream<ContainerBeanDto> beanStream; | ||
|
|
||
| public Map<String, ContainerBeanDto> getBeanMap() { | ||
| return beanMap; | ||
| } | ||
|
|
||
| public void setBeanMap(Map<String, ContainerBeanDto> beanMap) { | ||
| this.beanMap = beanMap; | ||
| } | ||
|
|
||
| public Stream<ContainerBeanDto> getBeanStream() { | ||
| return beanStream; | ||
| } | ||
|
|
||
| public void setBeanStream(Stream<ContainerBeanDto> beanStream) { | ||
| this.beanStream = beanStream; | ||
| } | ||
|
|
||
| public String getValue() { | ||
| return value; | ||
| } | ||
|
|
||
| public void setValue(String value) { | ||
| this.value = value; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.