devbpulse
diff --git a/Collapse file
‎processor/src/main/java/org/mapstruct/ap/internal/model/ValueMappingMethod.java‎
Copy file name to clipboardExpand all lines: processor/src/main/java/org/mapstruct/ap/internal/model/ValueMappingMethod.java
+3-6Lines changed: 3 additions & 6 deletions b/Collapse file
‎processor/src/main/java/org/mapstruct/ap/internal/model/ValueMappingMethod.java‎
Copy file name to clipboardExpand all lines: processor/src/main/java/org/mapstruct/ap/internal/model/ValueMappingMethod.java
+3-6Lines changed: 3 additions & 6 deletions
diff --git a/Collapse file
‎processor/src/test/java/org/mapstruct/ap/test/value/string2enum/StringToEnumMappingTest.java‎
Copy file name to clipboardExpand all lines: processor/src/test/java/org/mapstruct/ap/test/value/string2enum/StringToEnumMappingTest.java
+15-1Lines changed: 15 additions & 1 deletion b/Collapse file
‎processor/src/test/java/org/mapstruct/ap/test/value/string2enum/StringToEnumMappingTest.java‎
Copy file name to clipboardExpand all lines: processor/src/test/java/org/mapstruct/ap/test/value/string2enum/StringToEnumMappingTest.java
+15-1Lines changed: 15 additions & 1 deletion
@@ -262,8 +262,8 @@ private List<MappingEntry> stringToEnumMapping(Method method, Type targetType )
             List<MappingEntry> mappings = new ArrayList<>();
             List<String> unmappedSourceConstants = new ArrayList<>( targetType.getEnumConstants() );
             boolean sourceErrorOccurred = !reportErrorIfMappedTargetEnumConstantsDontExist( method, targetType );
-            boolean mandatoryMissing = !reportErrorIfAnyRemainingOrAnyUnMappedMissing( method );
-            if ( sourceErrorOccurred || mandatoryMissing ) {
+            reportWarningIfAnyRemainingOrAnyUnMappedMissing( method );
+            if ( sourceErrorOccurred ) {
                 return mappings;
             }
             Set<String> mappedSources = new LinkedHashSet<>();
@@ -344,17 +344,14 @@ private boolean reportErrorIfSourceEnumConstantsContainsAnyRemaining(Method meth
             return !foundIncorrectMapping;
         }
 
-        private boolean reportErrorIfAnyRemainingOrAnyUnMappedMissing(Method method) {
-            boolean foundIncorrectMapping = false;
+        private void reportWarningIfAnyRemainingOrAnyUnMappedMissing(Method method) {
 
             if ( !( valueMappings.hasMapAnyUnmapped || valueMappings.hasMapAnyRemaining ) ) {
                 ctx.getMessager().printMessage(
                     method.getExecutable(),
                     Message.VALUEMAPPING_ANY_REMAINING_OR_UNMAPPED_MISSING
                 );
-                foundIncorrectMapping = true;
             }
-            return !foundIncorrectMapping;
         }
 
         private boolean reportErrorIfMappedTargetEnumConstantsDontExist(Method method, Type targetType) {
 
@@ -16,6 +16,7 @@
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @IssueKey( "1557" )
 @WithClasses({ OrderType.class, OrderMapper.class })
@@ -53,7 +54,20 @@ public void testRemainingAndNull() {
                     "type String to an enum type." )
         }
     )
-    public void shouldRaiseErrorWhenUsingAnyRemaining() {
+    public void shouldRaiseWarningWhenNotUsingAnyRemainingOrAnyUnmapped() {
+
+        assertThatThrownBy( () -> ErroneousOrderMapperUsingNoAnyRemainingAndNoAnyUnmapped.INSTANCE.map( "unknown" ) )
+            .isInstanceOf( IllegalArgumentException.class )
+            .hasMessage( "Unexpected enum constant: unknown" );
+
+        assertThat( ErroneousOrderMapperUsingNoAnyRemainingAndNoAnyUnmapped.INSTANCE.map( null ) )
+            .isEqualTo( OrderType.STANDARD );
+
+        assertThat( ErroneousOrderMapperUsingNoAnyRemainingAndNoAnyUnmapped.INSTANCE.map( "STANDARD" ) )
+            .isNull();
+
+        assertThat( ErroneousOrderMapperUsingNoAnyRemainingAndNoAnyUnmapped.INSTANCE.map( "RETAIL" ) )
+            .isEqualTo( OrderType.RETAIL );
     }
 
 }