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

#330 Formatting

Browse Source
This commit is contained in:
Gunnar Morling 2014-10-26 22:41:04 +01:00
parent 9ea7f96b9c
commit b560b953cf
3 changed files with 72 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
processor/src/main/java/org/mapstruct/ap/model/EnumMappingMethod.java
View File

@ -20,7 +20,6 @@ package org.mapstruct.ap.model;
import java.util.ArrayList;
import java.util.List;
import javax.tools.Diagnostic;
import org.mapstruct.ap.model.common.Parameter;
@ -74,8 +73,11 @@ public class EnumMappingMethod extends MappingMethod {
enumMappings.add( new EnumMapping( enumConstant, enumConstant ) );
}
else if ( mappedConstants.size() == 1 ) {
enumMappings.add( new EnumMapping(
enumConstant, mappedConstants.iterator().next().getTargetName() ) );
enumMappings.add(
new EnumMapping(
enumConstant, mappedConstants.iterator().next().getTargetName()
)
);
}
else {
List<String> targetConstants = new ArrayList<String>( mappedConstants.size() );

11
processor/src/main/java/org/mapstruct/ap/model/source/SourceMethod.java
View File

@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.util.Types;
@ -76,7 +75,8 @@ public class SourceMethod implements Method {
mappings,
iterableMapping,
mapMapping,
typeUtils );
typeUtils
);
}
public static SourceMethod forReferencedMethod(Type declaringMapper, ExecutableElement executable,
@ -92,7 +92,8 @@ public class SourceMethod implements Method {
Collections.<String, List<Mapping>>emptyMap(),
null,
null,
typeUtils );
typeUtils
);
}
public static SourceMethod forFactoryMethod(Type declaringMapper, ExecutableElement executable, Type returnType,
@ -107,7 +108,8 @@ public class SourceMethod implements Method {
Collections.<String, List<Mapping>>emptyMap(),
null,
null,
typeUtils );
typeUtils
);
}
private SourceMethod(Type declaringMapper, ExecutableElement executable, List<Parameter> parameters,
@ -352,6 +354,7 @@ public class SourceMethod implements Method {
/**
* @param parameters the parameter list to check
*
* @return <code>true</code>, iff the parameter list contains a parameter annotated with {@code @TargetType}
*/
public static boolean containsTargetTypeParameter(List<Parameter> parameters) {

8
processor/src/test/java/org/mapstruct/ap/test/source/constants/SourceConstantsTest.java
View File

@ -18,13 +18,10 @@
*/
package org.mapstruct.ap.test.source.constants;
import static org.fest.assertions.Assertions.assertThat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import javax.tools.Diagnostic.Kind;
import org.junit.Test;
@ -36,6 +33,8 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* @author Sjaak Derksen
*/
@ -124,7 +123,8 @@ public class SourceConstantsTest {
@Diagnostic(type = ErroneousMapper3.class,
kind = Kind.ERROR,
line = 41,
messageRegExp = "Expression and constant are both defined in @Mapping, either define an expression or a "
messageRegExp =
"Expression and constant are both defined in @Mapping, either define an expression or a "
+ "constant"),
@Diagnostic(type = ErroneousMapper3.class,
kind = Kind.WARNING,