#1378 Use Types instead of searching for type elements

This commit is contained in:
Filip Hrisafov 2018-03-18 20:36:00 +01:00 committed by GitHub
parent f2ef330304
commit 2ead42da25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions

View File

@ -44,7 +44,7 @@ public class MethodSelectors {
new TypeSelector( typeFactory ),
new QualifierSelector( typeUtils, elementUtils ),
new TargetTypeSelector( typeUtils, elementUtils ),
new XmlElementDeclSelector( typeUtils, elementUtils ),
new XmlElementDeclSelector( typeUtils ),
new InheritanceSelector(),
new CreateOrUpdateSelector(),
new FactoryParameterSelector() );

View File

@ -25,7 +25,6 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.Elements;
import javax.lang.model.util.Types;
import org.mapstruct.ap.internal.model.common.Type;
@ -53,11 +52,9 @@ import org.mapstruct.ap.internal.prism.XmlElementRefPrism;
public class XmlElementDeclSelector implements MethodSelector {
private final Types typeUtils;
private final Elements elementUtils;
public XmlElementDeclSelector( Types typeUtils, Elements elementUtils) {
public XmlElementDeclSelector(Types typeUtils) {
this.typeUtils = typeUtils;
this.elementUtils = elementUtils;
}
@Override
@ -163,7 +160,7 @@ public class XmlElementDeclSelector implements MethodSelector {
}
}
currentMirror = currentElement.getSuperclass();
currentElement = elementUtils.getTypeElement( currentMirror.toString() );
currentElement = (TypeElement) typeUtils.asElement( currentMirror );
}
return defaultInfo;
}