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

#151 rework inheritance and support auto inheritance #152

Merged
merged 8 commits into from
Sep 17, 2023
Merged

#151 rework inheritance and support auto inheritance #152

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1aed6ba
#151 rework inheritance and support auto inheritance
thunderhook Sep 6, 2023
1c440f4
#151 stabilize flaky test with latest EAP
thunderhook Sep 9, 2023
b5eb23c
#151 move tests to a subpackage
thunderhook Sep 10, 2023
1078146
#151 avoid stream distinction by avoiding of collecting duplicates vi…
thunderhook Sep 10, 2023
4a2d1ff
#151 use a more expressive method name
thunderhook Sep 10, 2023
4557472
#151 explain workaround
thunderhook Sep 10, 2023
66203f5
#151 rename method to be more concise
thunderhook Sep 16, 2023
f7821f9
#151 enable unmapped target properties inspection only on methods ins…
thunderhook Sep 16, 2023
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
16 changes: 1 addition & 15 deletions src/main/java/org/mapstruct/intellij/codeinsight/references/MapstructTargetReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import static org.mapstruct.intellij.util.TargetUtils.isBuilderEnabled;
import static org.mapstruct.intellij.util.TargetUtils.publicWriteAccessors;
import static org.mapstruct.intellij.util.TargetUtils.resolveBuilderOrSelfClass;
import static org.mapstruct.intellij.util.TypeUtils.firstParameterPsiType;

/**
* Reference for {@link org.mapstruct.Mapping#target()}.
Expand Down Expand Up @@ -227,19 +228,4 @@ else if ( psiMember instanceof PsiVariable ) {
}

}

/**
* Util function for extracting the type of the first parameter of a method.
*
* @param psiMethod the method to extract the parameter from
*
* @return the type of the first parameter of the method
*/
private static PsiType firstParameterPsiType(PsiMethod psiMethod) {
PsiParameter[] psiParameters = psiMethod.getParameterList().getParameters();
if ( psiParameters.length == 0) {
return null;
}
return psiParameters[0].getType();
}
}
25 changes: 24 additions & 1 deletion src/main/java/org/mapstruct/intellij/inspection/UnmappedTargetPropertiesInspection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -41,16 +42,17 @@

import static com.intellij.codeInsight.AnnotationUtil.findAnnotation;
import static com.intellij.codeInsight.AnnotationUtil.getBooleanAttributeValue;
import static org.mapstruct.intellij.inspection.inheritance.InheritConfigurationUtils.findInheritedTargetProperties;
import static org.mapstruct.intellij.util.MapstructAnnotationUtils.addMappingAnnotation;
import static org.mapstruct.intellij.util.MapstructAnnotationUtils.getUnmappedTargetPolicy;
import static org.mapstruct.intellij.util.MapstructUtil.MAPPER_CONFIG_ANNOTATION_FQN;
import static org.mapstruct.intellij.util.MapstructUtil.isInheritInverseConfiguration;
import static org.mapstruct.intellij.util.MapstructUtil.isMapper;
import static org.mapstruct.intellij.util.MapstructUtil.isMapperConfig;
import static org.mapstruct.intellij.util.SourceUtils.findAllSourceProperties;
import static org.mapstruct.intellij.util.TargetUtils.findAllDefinedMappingTargets;
import static org.mapstruct.intellij.util.TargetUtils.findAllSourcePropertiesForCurrentTarget;
import static org.mapstruct.intellij.util.TargetUtils.findAllTargetProperties;
import static org.mapstruct.intellij.util.TargetUtils.findInheritedTargetProperties;
import static org.mapstruct.intellij.util.TargetUtils.getRelevantType;

/**
Expand Down Expand Up @@ -86,11 +88,18 @@ public void visitMethod(PsiMethod method) {
if ( isBeanMappingIgnoreByDefault( method ) ) {
return;
}

ReportingPolicy reportingPolicy = getUnmappedTargetPolicy( method );
if (reportingPolicy == ReportingPolicy.IGNORE) {
return;
}

if ( isPrototypeMethod( method )) {
// prototype methods can be incomplete and therefore should not provide errors or warnings
// that cannot be solved with quick fixes
return;
}


Set<String> allTargetProperties = findAllTargetProperties( targetType, mapStructVersion, method );

Expand Down Expand Up @@ -181,6 +190,19 @@ private static boolean isBeanMappingIgnoreByDefault(PsiMethod method) {
return false;
}

private static boolean isPrototypeMethod(@NotNull PsiMethod method) {

return isContainedInsideMapperConfig( method );
}

private static boolean isContainedInsideMapperConfig(@NotNull PsiMethod method) {

return Optional.ofNullable( method.getContainingClass() )
.map( containingClass -> findAnnotation( containingClass, MAPPER_CONFIG_ANNOTATION_FQN ) )
.stream().findFirst()
.isPresent();
filiphr marked this conversation as resolved.
Show resolved Hide resolved
}

/**
* @param method the method to be used
*
Expand All @@ -204,6 +226,7 @@ private static PsiType getTargetType(PsiMethod method) {
}
return getRelevantType( method );
}

}

private static class UnmappedTargetPropertyFix extends LocalQuickFixOnPsiElement {
Expand Down
Loading
Loading