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

#32 Some clean-up

Browse Source
This commit is contained in:
Gunnar Morling 2013-06-30 10:56:27 +02:00
parent 53597469ad
commit 17f106c6ea
3 changed files with 81 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java
View File

@ -89,75 +89,10 @@ public class MethodRetrievalProcessor implements ModelElementProcessor<TypeEleme
MapperPrism mapperPrism = implementationRequired ? MapperPrism.getInstanceOn( element ) : null; MapperPrism mapperPrism = implementationRequired ? MapperPrism.getInstanceOn( element ) : null;
//TODO Extract to separate method for ( ExecutableElement executable : methodsIn( element.getEnclosedElements() ) ) {
for ( ExecutableElement method : methodsIn( element.getEnclosedElements() ) ) { Method method = getMethod( element, executable, implementationRequired );
Parameter parameter = executables.retrieveParameter( method ); if ( method != null ) {
Type returnType = executables.retrieveReturnType( method ); methods.add( method );
boolean mappingErroneous = false;
if ( implementationRequired ) {
if ( parameter.getType().isIterableType() && !returnType.isIterableType() ) {
printMessage(
ReportingPolicy.ERROR,
"Can't generate mapping method from iterable type to non-iterable type.",
method
);
mappingErroneous = true;
}
if ( !parameter.getType().isIterableType() && returnType.isIterableType() ) {
printMessage(
ReportingPolicy.ERROR,
"Can't generate mapping method from non-iterable type to iterable type.",
method
);
mappingErroneous = true;
}
if ( parameter.getType().isPrimitive() ) {
printMessage(
ReportingPolicy.ERROR,
"Can't generate mapping method with primitive parameter type.",
method
);
mappingErroneous = true;
}
if ( returnType.isPrimitive() ) {
printMessage(
ReportingPolicy.ERROR,
"Can't generate mapping method with primitive return type.",
method
);
mappingErroneous = true;
}
if ( mappingErroneous ) {
continue;
}
}
//add method with property mappings if an implementation needs to be generated
if ( implementationRequired ) {
methods.add(
Method.forMethodRequiringImplementation(
method,
parameter.getName(),
parameter.getType(),
returnType,
getMappings( method )
)
);
}
//otherwise add reference to existing mapper method
else {
methods.add(
Method.forReferencedMethod(
typeUtil.getType( typeUtils.getDeclaredType( element ) ),
method,
parameter.getName(),
parameter.getType(),
returnType
)
);
} }
} }
@ -176,6 +111,81 @@ public class MethodRetrievalProcessor implements ModelElementProcessor<TypeEleme
return methods; return methods;
} }
private Method getMethod(TypeElement element, ExecutableElement method, boolean implementationRequired) {
Parameter parameter = executables.retrieveParameter( method );
Type returnType = executables.retrieveReturnType( method );
//add method with property mappings if an implementation needs to be generated
if ( implementationRequired ) {
boolean isValid = checkParameterAndReturnType( method, parameter.getType(), returnType );
if ( isValid ) {
return
Method.forMethodRequiringImplementation(
method,
parameter.getName(),
parameter.getType(),
returnType,
getMappings( method )
);
}
else {
return null;
}
}
//otherwise add reference to existing mapper method
else {
return
Method.forReferencedMethod(
typeUtil.getType( typeUtils.getDeclaredType( element ) ),
method,
parameter.getName(),
parameter.getType(),
returnType
);
}
}
private boolean checkParameterAndReturnType(ExecutableElement method, Type parameterType, Type returnType) {
if ( parameterType.isIterableType() && !returnType.isIterableType() ) {
printMessage(
ReportingPolicy.ERROR,
"Can't generate mapping method from iterable type to non-iterable type.",
method
);
return false;
}
if ( !parameterType.isIterableType() && returnType.isIterableType() ) {
printMessage(
ReportingPolicy.ERROR,
"Can't generate mapping method from non-iterable type to iterable type.",
method
);
return false;
}
if ( parameterType.isPrimitive() ) {
printMessage(
ReportingPolicy.ERROR,
"Can't generate mapping method with primitive parameter type.",
method
);
return false;
}
if ( returnType.isPrimitive() ) {
printMessage(
ReportingPolicy.ERROR,
"Can't generate mapping method with primitive return type.",
method
);
return false;
}
return true;
}
/** /**
* Retrieves the mappings configured via {@code @Mapping} from the given * Retrieves the mappings configured via {@code @Mapping} from the given
* method. * method.

2
processor/src/test/java/org/mapstruct/ap/test/collection/erronuous/ErronuousCollectionMappingTest.java → processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErronuousCollectionMappingTest.java
View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.mapstruct.ap.test.collection.erronuous; package org.mapstruct.ap.test.collection.erroneous;
import javax.tools.Diagnostic.Kind; import javax.tools.Diagnostic.Kind;

2
processor/src/test/java/org/mapstruct/ap/test/collection/erronuous/ErronuousMapper.java → processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErronuousMapper.java
View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.mapstruct.ap.test.collection.erronuous; package org.mapstruct.ap.test.collection.erroneous;
import java.util.Set; import java.util.Set;