Skip to content

#3786 Fix NPE situations and have the normal resulting message pop out. #3794

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

Merged
filiphr merged 7 commits into from
Jan 24, 2025
Merged

#3786 Fix NPE situations and have the normal resulting message pop out. #3794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4596c53
#3786: give message for primitive array return type.
Dec 21, 2024
3d6dbb8
#3786 Fixed the NPE situations instead of an additional message.
Dec 21, 2024
06c9cdb
fix checkstyle by replacing tertiary with if statement.
Dec 21, 2024
266e48c
fix checkstyle, line was still 1 character too long.
Dec 21, 2024
9330ea9
Renamed Mapper because it should not compile
Dec 21, 2024
9b41678
#3786: Added new error message for non-iterable to array mapping.
Dec 22, 2024
6b62540
#3786: revert changes to Type
Jan 23, 2025
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
5 changes: 5 additions & 0 deletions processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,11 @@ private boolean checkParameterAndReturnType(ExecutableElement method, List<Param
return false;
}

if ( !parameterType.isIterableOrStreamType() && resultType.isArrayType() ) {
messager.printMessage( method, Message.RETRIEVAL_NON_ITERABLE_TO_ARRAY );
return false;
}

if ( parameterType.isPrimitive() ) {
messager.printMessage( method, Message.RETRIEVAL_PRIMITIVE_PARAMETER );
return false;
Expand Down
1 change: 1 addition & 0 deletions processor/src/main/java/org/mapstruct/ap/internal/util/Message.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ public enum Message {
RETRIEVAL_ITERABLE_TO_NON_ITERABLE( "Can't generate mapping method from iterable type from java stdlib to non-iterable type." ),
RETRIEVAL_MAPPING_HAS_TARGET_TYPE_PARAMETER( "Can't generate mapping method that has a parameter annotated with @TargetType." ),
RETRIEVAL_NON_ITERABLE_TO_ITERABLE( "Can't generate mapping method from non-iterable type to iterable type from java stdlib." ),
RETRIEVAL_NON_ITERABLE_TO_ARRAY( "Can't generate mapping method from non-iterable type to array." ),
RETRIEVAL_PRIMITIVE_PARAMETER( "Can't generate mapping method with primitive parameter type." ),
RETRIEVAL_PRIMITIVE_RETURN( "Can't generate mapping method with primitive return type." ),
RETRIEVAL_TYPE_VAR_SOURCE( "Can't generate mapping method for a generic type variable source." ),
Expand Down
13 changes: 13 additions & 0 deletions processor/src/test/java/org/mapstruct/ap/test/bugs/_3786/ErroneousByteArrayMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* 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._3786;

import org.mapstruct.Mapper;

@Mapper
public interface ErroneousByteArrayMapper {
byte[] map( String something );
}
36 changes: 36 additions & 0 deletions processor/src/test/java/org/mapstruct/ap/test/bugs/_3786/Issue3786Test.java
View file
Open in desktop
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._3786;

import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.ProcessorTest;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.compilation.annotation.CompilationResult;
import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;

/**
* @author Ben Zegveld
*/
@IssueKey( "3786" )
public class Issue3786Test {

@WithClasses( ErroneousByteArrayMapper.class )
@ProcessorTest
@ExpectedCompilationOutcome(
value = CompilationResult.FAILED,
diagnostics = {
@Diagnostic(
type = ErroneousByteArrayMapper.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 12,
message = "Can't generate mapping method from non-iterable type to array."
)
}
)
void byteArrayReturnTypeShouldGiveInaccessibleContructorError() {
}
}
Loading