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

#3036 Fix compile errors when intersection types are used in lifecycle methods

Browse Source
This commit is contained in:
Filip Hrisafov 2022-10-03 21:12:19 +02:00
parent 7cfac7c060
commit 6f262ef405
5 changed files with 152 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
integrationtest/src/test/java/org/mapstruct/itest/tests/FullFeatureCompilationExclusionCliEnhancer.java
View File

@ -28,6 +28,12 @@ public final class FullFeatureCompilationExclusionCliEnhancer implements Process
additionalExcludes.add( "org/mapstruct/ap/test/bugs/_1801/*.java" );
switch ( currentJreVersion ) {
case JAVA_8:
if ( processorType == ProcessorTest.ProcessorType.ECLIPSE_JDT ) {
additionalExcludes.add(
"org/mapstruct/ap/test/selection/methodgenerics/wildcards/LifecycleIntersectionMapper.java" );
}
break;
case JAVA_9:
// TODO find out why this fails:
additionalExcludes.add( "org/mapstruct/ap/test/collection/wildcard/BeanMapper.java" );

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

@ -28,6 +28,7 @@ import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.ArrayType;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.IntersectionType;
import javax.lang.model.type.PrimitiveType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
@ -114,6 +115,7 @@ public class Type extends ModelElement implements Comparable<Type> {
private List<Accessor> alternativeTargetAccessors = null;
private Type boundingBase = null;
private List<Type> boundTypes = null;
private Type boxedEquivalent = null;
@ -354,6 +356,10 @@ public class Type extends ModelElement implements Comparable<Type> {
return (typeMirror.getKind() == TypeKind.TYPEVAR);
}
public boolean isIntersection() {
return typeMirror.getKind() == TypeKind.INTERSECTION;
}
public boolean isJavaLangType() {
return packageName != null && packageName.startsWith( "java." );
}
@ -1264,6 +1270,29 @@ public class Type extends ModelElement implements Comparable<Type> {
return boundingBase;
}
public List<Type> getTypeBounds() {
if ( this.boundTypes != null ) {
return boundTypes;
}
Type bound = getTypeBound();
if ( bound == null ) {
this.boundTypes = Collections.emptyList();
}
else if ( !bound.isIntersection() ) {
this.boundTypes = Collections.singletonList( bound );
}
else {
List<? extends TypeMirror> bounds = ( (IntersectionType) bound.typeMirror ).getBounds();
this.boundTypes = new ArrayList<>( bounds.size() );
for ( TypeMirror mirror : bounds ) {
boundTypes.add( typeFactory.getType( mirror ) );
}
}
return this.boundTypes;
}
public boolean hasAccessibleConstructor() {
if ( hasAccessibleConstructor == null ) {
hasAccessibleConstructor = false;

3
processor/src/main/java/org/mapstruct/ap/internal/model/source/MethodMatcher.java
View File

@ -325,8 +325,7 @@ public class MethodMatcher {
*/
private boolean candidatesWithinBounds(Map<Type, TypeVarCandidate> methodParCandidates ) {
for ( Map.Entry<Type, TypeVarCandidate> entry : methodParCandidates.entrySet() ) {
Type bound = entry.getKey().getTypeBound();
if ( bound != null ) {
for ( Type bound : entry.getKey().getTypeBounds() ) {
for ( Type.ResolvedPair pair : entry.getValue().pairs ) {
if ( entry.getKey().hasUpperBound() ) {
if ( !pair.getMatch().asRawType().isAssignableTo( bound.asRawType() ) ) {

96
processor/src/test/java/org/mapstruct/ap/test/selection/methodgenerics/wildcards/LifecycleIntersectionMapper.java Normal file
View File

@ -0,0 +1,96 @@
/*
* 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.selection.methodgenerics.wildcards;
import org.mapstruct.AfterMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.MappingTarget;
import org.mapstruct.factory.Mappers;
/**
* @author Filip Hrisafov
*/
@Mapper
public interface LifecycleIntersectionMapper {
LifecycleIntersectionMapper INSTANCE = Mappers.getMapper( LifecycleIntersectionMapper.class );
@Mapping(target = "realm", ignore = true)
RealmTarget mapRealm(String source);
@Mapping(target = "uniqueRealm", ignore = true)
UniqueRealmTarget mapUniqueRealm(String source);
@Mapping(target = "realm", ignore = true)
@Mapping(target = "uniqueRealm", ignore = true)
BothRealmsTarget mapBothRealms(String source);
@AfterMapping
default <T extends RealmObject & UniqueRealmObject> void afterMapping(String source, @MappingTarget T target) {
target.setRealm( "realm_" + source );
target.setUniqueRealm( "uniqueRealm_" + source );
}
interface RealmObject {
void setRealm(String realm);
}
interface UniqueRealmObject {
void setUniqueRealm(String realm);
}
class RealmTarget implements RealmObject {
protected String realm;
public String getRealm() {
return realm;
}
@Override
public void setRealm(String realm) {
this.realm = realm;
}
}
class UniqueRealmTarget implements UniqueRealmObject {
protected String uniqueRealm;
@Override
public void setUniqueRealm(String uniqueRealm) {
this.uniqueRealm = uniqueRealm;
}
public String getUniqueRealm() {
return uniqueRealm;
}
}
class BothRealmsTarget implements RealmObject, UniqueRealmObject {
protected String realm;
protected String uniqueRealm;
public String getRealm() {
return realm;
}
@Override
public void setRealm(String realm) {
this.realm = realm;
}
public String getUniqueRealm() {
return uniqueRealm;
}
@Override
public void setUniqueRealm(String uniqueRealm) {
this.uniqueRealm = uniqueRealm;
}
}
}

20
processor/src/test/java/org/mapstruct/ap/test/selection/methodgenerics/wildcards/WildCardTest.java
View File

@ -5,6 +5,7 @@
*/
package org.mapstruct.ap.test.selection.methodgenerics.wildcards;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.ProcessorTest;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.Compiler;
@ -54,4 +55,23 @@ public class WildCardTest {
assertThat( target ).isNotNull();
assertThat( target.getProp() ).isEqualTo( typeC );
}
// Eclipse does not handle intersection types correctly (TODO: worthwhile to investigate?)
@ProcessorTest(Compiler.JDK)
@WithClasses(LifecycleIntersectionMapper.class)
@IssueKey("3036")
public void testLifecycleIntersection() {
LifecycleIntersectionMapper.RealmTarget realmTarget = LifecycleIntersectionMapper.INSTANCE.mapRealm( "test" );
assertThat( realmTarget.getRealm() ).isNull();
LifecycleIntersectionMapper.UniqueRealmTarget uniqueRealmTarget =
LifecycleIntersectionMapper.INSTANCE.mapUniqueRealm( "test" );
assertThat( uniqueRealmTarget.getUniqueRealm() ).isNull();
LifecycleIntersectionMapper.BothRealmsTarget bothRealmsTarget =
LifecycleIntersectionMapper.INSTANCE.mapBothRealms( "test" );
assertThat( bothRealmsTarget.getRealm() ).isEqualTo( "realm_test" );
assertThat( bothRealmsTarget.getUniqueRealm() ).isEqualTo( "uniqueRealm_test" );
}
}