Skip to content
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.

Sign up for GitHub

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

Jump to bottom

#642 Support the conversion of String In Map To Enum #643

Merged
merged 5 commits into from
Jun 11, 2018
Merged

#642 Support the conversion of String In Map To Enum #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ef3a1b
#642 Support the conversion of String In Map To Enum
yuanpli Jun 6, 2018
f378714
#642 Support the conversion of String In Map To Enum
yuanpli Jun 6, 2018
d61fd61
Merge branch 'StringInMap2Enum' of github.com:yuanpli/dozer into Stri…
yuanpli Jun 6, 2018
33ddd54
Refactor after code review
yuanpli Jun 11, 2018
8199155
Update according to the comments of review
yuanpli Jun 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/main/java/com/github/dozermapper/core/converters/PrimitiveOrWrapperConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ public boolean accepts(Class<?> aClass) {
|| Character.class.equals(aClass)
|| Boolean.class.equals(aClass)
|| java.util.Date.class.isAssignableFrom(aClass)
|| java.util.Calendar.class.isAssignableFrom(aClass);
|| java.util.Calendar.class.isAssignableFrom(aClass)
|| aClass.isEnum();
}

}
10 changes: 10 additions & 0 deletions core/src/test/java/com/github/dozermapper/core/functional_tests/EnumMappingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package com.github.dozermapper.core.functional_tests;

import java.util.HashMap;
import java.util.Map;

import com.github.dozermapper.core.DozerBeanMapperBuilder;
Expand Down Expand Up @@ -91,6 +92,15 @@ public static void setup() {
.build();
}

@Test
public void canStringInMapMapsToEnum() {
Map src = newInstance(HashMap.class);
src.put("destType", "FOO");

MyBeanPrime dest = enumMappingOverriedEnumToBasedEnum.map(src, MyBeanPrime.class);
assertEquals("FOO", dest.getDestType().toString());
}

@Test
public void canOverriddenEnumMapsToBasedEnum() {
MyBean src = newInstance(MyBean.class);
Expand Down
4 changes: 2 additions & 2 deletions ...va/com/github/dozermapper/core/functional_tests/EnumMapping_WithExceptionsLoggedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ public class EnumMapping_WithExceptionsLoggedTest extends AbstractFunctionalTest
public void testEnumMapsToNonexistEnumValue() {
LOG.error("WithExceptionsLoggedTest; 'IllegalArgumentException: No enum constant com.github.dozermapper.core.vo.enumtest.DestType.BAR'");

testEnumMapsToNonexistEnumValueEE.expectMessage("No enum constant com.github.dozermapper.core.vo.enumtest.DestType.BAR");
testEnumMapsToNonexistEnumValueEE.expect(IllegalArgumentException.class);
testEnumMapsToNonexistEnumValueEE.expectMessage("Cannot convert [BAR] to enum of type class com.github.dozermapper.core.vo.enumtest.DestType");
testEnumMapsToNonexistEnumValueEE.expect(MappingException.class);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whys this changed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IllegalArgumentException is caught in com.github.dozermapper.core.converters.EnumConverter#convert and then it is wrapped in MappingException and threw out.
So the expected exception should be MappingException, not the original IllegalArgumentException.


mapper = getMapper("mappings/enumMapping.xml");

Expand Down