Skip to content

Commit 70f485f

Browse files
filiphrLuke Rohde
authored andcommitted
mapstruct#1378 Use Types instead of searching for type elements
1 parent a217649 commit 70f485f

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/MethodSelectors.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public MethodSelectors(Types typeUtils, Elements elementUtils, TypeFactory typeF
4444
new TypeSelector( typeFactory ),
4545
new QualifierSelector( typeUtils, elementUtils ),
4646
new TargetTypeSelector( typeUtils, elementUtils ),
47-
new XmlElementDeclSelector( typeUtils, elementUtils ),
47+
new XmlElementDeclSelector( typeUtils ),
4848
new InheritanceSelector(),
4949
new CreateOrUpdateSelector(),
5050
new FactoryParameterSelector() );

processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/XmlElementDeclSelector.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import javax.lang.model.element.ElementKind;
2626
import javax.lang.model.element.TypeElement;
2727
import javax.lang.model.type.TypeMirror;
28-
import javax.lang.model.util.Elements;
2928
import javax.lang.model.util.Types;
3029

3130
import org.mapstruct.ap.internal.model.common.Type;
@@ -53,11 +52,9 @@
5352
public class XmlElementDeclSelector implements MethodSelector {
5453

5554
private final Types typeUtils;
56-
private final Elements elementUtils;
5755

58-
public XmlElementDeclSelector( Types typeUtils, Elements elementUtils) {
56+
public XmlElementDeclSelector(Types typeUtils) {
5957
this.typeUtils = typeUtils;
60-
this.elementUtils = elementUtils;
6158
}
6259

6360
@Override
@@ -163,7 +160,7 @@ private XmlElementRefInfo findXmlElementRef(Type resultType, String targetProper
163160
}
164161
}
165162
currentMirror = currentElement.getSuperclass();
166-
currentElement = elementUtils.getTypeElement( currentMirror.toString() );
163+
currentElement = (TypeElement) typeUtils.asElement( currentMirror );
167164
}
168165
return defaultInfo;
169166
}

0 commit comments

Comments
 (0)