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

#79 Formatting

Browse Source
This commit is contained in:
Gunnar Morling 2014-01-05 19:56:27 +01:00
parent 623acb6f10
commit e325862448
3 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
processor/src/main/java/org/mapstruct/ap/util/MethodMatcher.java
View File

@ -21,7 +21,6 @@ package org.mapstruct.ap.util;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.lang.model.element.TypeParameterElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.ArrayType;
@ -152,8 +151,7 @@ public class MethodMatcher {
if ( t.asElement().getSimpleName().equals( t1.asElement().getSimpleName() )
&& t.getTypeArguments().size() == t1.getTypeArguments().size() ) {
for ( int i = 0; i < t.getTypeArguments().size(); i++ ) {
if (!t.getTypeArguments().get( i ).accept( this, t1.getTypeArguments().get( i ) ))
{
if ( !t.getTypeArguments().get( i ).accept( this, t1.getTypeArguments().get( i ) ) ) {
return Boolean.FALSE;
}
}
@ -254,6 +252,7 @@ public class MethodMatcher {
* Looks through the list of type parameters of the candidate method for a match
*
* @param t type parameter to match
*
* @return matching type parameter
*/
private TypeParameterElement getTypeParamFromCandidate(TypeMirror t) {
@ -270,6 +269,7 @@ public class MethodMatcher {
*
* @param t
* @param tpe
*
* @return true if within bounds
*/
private boolean isWithinBounds(TypeMirror t, TypeParameterElement tpe) {

21
processor/src/test/java/org/mapstruct/ap/test/conversion/generics/ConversionTest.java
View File

@ -35,9 +35,11 @@ import org.testng.annotations.Test;
*
* @author Sjaak Derksen
*/
@WithClasses( { GenericTypeMapper.class, Wrapper.class, ArrayWrapper.class, TwoArgHolder.class, TwoArgWrapper.class,
@WithClasses({
GenericTypeMapper.class, Wrapper.class, ArrayWrapper.class, TwoArgHolder.class, TwoArgWrapper.class,
UpperBoundWrapper.class, WildCardExtendsWrapper.class, WildCardSuperWrapper.class, WildCardExtendsMBWrapper.class,
TypeA.class, TypeB.class, TypeC.class } )
TypeA.class, TypeB.class, TypeC.class
})
@IssueKey(value = "79")
public class ConversionTest extends MapperTestBase {
@ -95,7 +97,8 @@ public class ConversionTest extends MapperTestBase {
kind = javax.tools.Diagnostic.Kind.ERROR, line = 29,
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics.UpperBoundWrapper"
+ "<org.mapstruct.ap.test.conversion.generics.TypeA> fooUpperBoundFailure\" to "
+ "\"org.mapstruct.ap.test.conversion.generics.TypeA fooUpperBoundFailure\"") } )
+ "\"org.mapstruct.ap.test.conversion.generics.TypeA fooUpperBoundFailure\"")
})
public void shouldFailOnUpperBound() {
}
@ -108,7 +111,8 @@ public class ConversionTest extends MapperTestBase {
line = 29,
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics.WildCardExtendsWrapper"
+ "<org.mapstruct.ap.test.conversion.generics.TypeA> fooWildCardExtendsTypeAFailure\" to"
+ " \"org.mapstruct.ap.test.conversion.generics.TypeA fooWildCardExtendsTypeAFailure\"" ) } )
+ " \"org.mapstruct.ap.test.conversion.generics.TypeA fooWildCardExtendsTypeAFailure\"")
})
public void shouldFailOnWildCardBound() {
}
@ -122,7 +126,8 @@ public class ConversionTest extends MapperTestBase {
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics."
+ "WildCardExtendsMBWrapper<org.mapstruct.ap.test.conversion.generics.TypeB> "
+ "fooWildCardExtendsMBTypeBFailure\" to \"org.mapstruct.ap.test.conversion.generics.TypeB "
+ "fooWildCardExtendsMBTypeBFailure\"" ) } )
+ "fooWildCardExtendsMBTypeBFailure\"")
})
public void shouldFailOnWildCardMultipleBounds() {
}
@ -135,7 +140,8 @@ public class ConversionTest extends MapperTestBase {
line = 29,
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics.WildCardSuperWrapper"
+ "<org.mapstruct.ap.test.conversion.generics.TypeA> fooWildCardSuperTypeAFailure\" to"
+ " \"org.mapstruct.ap.test.conversion.generics.TypeA fooWildCardSuperTypeAFailure\"" ) } )
+ " \"org.mapstruct.ap.test.conversion.generics.TypeA fooWildCardSuperTypeAFailure\"")
})
public void shouldFailOnSuperBounds1() {
}
@ -148,7 +154,8 @@ public class ConversionTest extends MapperTestBase {
line = 29,
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics.WildCardSuperWrapper"
+ "<org.mapstruct.ap.test.conversion.generics.TypeC> fooWildCardSuperTypeCFailure\" to"
+ " \"org.mapstruct.ap.test.conversion.generics.TypeC fooWildCardSuperTypeCFailure\"" ) } )
+ " \"org.mapstruct.ap.test.conversion.generics.TypeC fooWildCardSuperTypeCFailure\"")
})
public void shouldFailOnSuperBounds2() {
}
}