third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#2439 Do not throw NPE getting accessors for null typeElement

Browse Source 
Provide better error message if the source type has no read properties
This commit is contained in:
Filip Hrisafov 2021-06-05 11:39:52 +02:00
parent 934a47323a
commit 845d83e9d5
5 changed files with 124 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
processor/src/main/java/org/mapstruct/ap/internal/model/beanmapping/SourceReference.java
View File

@ -10,6 +10,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue;
import javax.lang.model.type.DeclaredType;
@ -277,10 +278,15 @@ public class SourceReference extends AbstractReference {
notFoundPropertyIndex = entries.size();
sourceType = last( entries ).getType();
}
Set<String> readProperties = sourceType.getPropertyReadAccessors().keySet();
if ( !readProperties.isEmpty() ) {
String mostSimilarWord = Strings.getMostSimilarWord(
propertyNames[notFoundPropertyIndex],
sourceType.getPropertyReadAccessors().keySet()
readProperties
);
List<String> elements = new ArrayList<>(
Arrays.asList( propertyNames ).subList( 0, notFoundPropertyIndex )
);
@ -289,6 +295,14 @@ public class SourceReference extends AbstractReference {
Message.PROPERTYMAPPING_INVALID_PROPERTY_NAME, sourceName, Strings.join( elements, "." )
);
}
else {
reportMappingError(
Message.PROPERTYMAPPING_INVALID_PROPERTY_NAME_SOURCE_HAS_NO_PROPERTIES,
sourceName,
sourceType.describe()
);
}
}
}
private List<PropertyEntry> matchWithSourceAccessorTypes(Type type, String[] entryNames) {

15
processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java
View File

@ -14,6 +14,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -693,7 +694,7 @@ public class Type extends ModelElement implements Comparable<Type> {
public List<Element> getRecordComponents() {
if ( recordComponents == null ) {
recordComponents = filters.recordComponentsIn( typeElement );
recordComponents = nullSafeTypeElementListConversion( filters::recordComponentsIn );
}
return recordComponents;
@ -720,7 +721,7 @@ public class Type extends ModelElement implements Comparable<Type> {
private List<ExecutableElement> getAllMethods() {
if ( allMethods == null ) {
allMethods = elementUtils.getAllEnclosedExecutableElements( typeElement );
allMethods = nullSafeTypeElementListConversion( elementUtils::getAllEnclosedExecutableElements );
}
return allMethods;
@ -728,12 +729,20 @@ public class Type extends ModelElement implements Comparable<Type> {
private List<VariableElement> getAllFields() {
if ( allFields == null ) {
allFields = elementUtils.getAllEnclosedFields( typeElement );
allFields = nullSafeTypeElementListConversion( elementUtils::getAllEnclosedFields );
}
return allFields;
}
private <T> List<T> nullSafeTypeElementListConversion(Function<TypeElement, List<T>> conversionFunction) {
if ( typeElement != null ) {
return conversionFunction.apply( typeElement );
}
return Collections.emptyList();
}
private String getPropertyName(Accessor accessor ) {
Element accessorElement = accessor.getElement();
if ( accessorElement instanceof ExecutableElement ) {

1
processor/src/main/java/org/mapstruct/ap/internal/util/Message.java
View File

@ -70,6 +70,7 @@ public enum Message {
PROPERTYMAPPING_INVALID_PARAMETER_NAME( "Method has no source parameter named \"%s\". Method source parameters are: \"%s\"." ),
PROPERTYMAPPING_NO_PROPERTY_IN_PARAMETER( "The type of parameter \"%s\" has no property named \"%s\"." ),
PROPERTYMAPPING_INVALID_PROPERTY_NAME( "No property named \"%s\" exists in source parameter(s). Did you mean \"%s\"?" ),
PROPERTYMAPPING_INVALID_PROPERTY_NAME_SOURCE_HAS_NO_PROPERTIES( "No property named \"%s\" exists in source parameter(s). Type \"%s\" has no properties." ),
PROPERTYMAPPING_NO_PRESENCE_CHECKER_FOR_SOURCE_TYPE( "Using custom source value presence checking strategy, but no presence checker found for %s in source type." ),
PROPERTYMAPPING_NO_READ_ACCESSOR_FOR_TARGET_TYPE( "No read accessor found for property \"%s\" in target type." ),
PROPERTYMAPPING_NO_WRITE_ACCESSOR_FOR_TARGET_TYPE( "No write accessor found for property \"%s\" in target type." ),

48
processor/src/test/java/org/mapstruct/ap/test/bugs/_2439/ErroneousIssue2439Mapper.java Normal file
View File

@ -0,0 +1,48 @@
/*
* 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._2439;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
/**
* @author Filip Hrisafov
*/
@Mapper
public interface ErroneousIssue2439Mapper {
@Mapping(target = "modeName", source = "mode.desc")
LiveDto map(LiveEntity entity);
class LiveEntity {
private final LiveMode[] mode;
public LiveEntity(LiveMode... mode) {
this.mode = mode;
}
public LiveMode[] getMode() {
return mode;
}
}
class LiveDto {
private String modeName;
public String getModeName() {
return modeName;
}
public void setModeName(String modeName) {
this.modeName = modeName;
}
}
enum LiveMode {
TEST,
PROD,
}
}

38
processor/src/test/java/org/mapstruct/ap/test/bugs/_2439/Issuer2439Test.java Normal file
View File

@ -0,0 +1,38 @@
/*
* 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._2439;
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 Filip Hrisafov
*/
@IssueKey("2439")
@WithClasses({
ErroneousIssue2439Mapper.class
})
class Issuer2439Test {
@ProcessorTest
@ExpectedCompilationOutcome(
value = CompilationResult.FAILED,
diagnostics = {
@Diagnostic(type = ErroneousIssue2439Mapper.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 17,
message = "No property named \"mode.desc\" exists in source parameter(s)." +
" Type \"ErroneousIssue2439Mapper.LiveMode[]\" has no properties.")
}
)
void shouldProvideGoodErrorMessage() {
}
}