From 75fa2fb0f70578b7e6ec0fe17b987eff2352891f Mon Sep 17 00:00:00 2001 From: navpil Date: Wed, 10 May 2017 15:11:18 +0300 Subject: [PATCH] #122 Minor formatting changes --- .../ap/internal/model/BeanMappingMethod.java | 9 ++++---- .../model/source/SourceReference.java | 23 +++++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java index 4e9acc991f..1b05739100 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java @@ -102,9 +102,9 @@ public Builder souceMethod(SourceMethod sourceMethod) { return setupMethodWithMapping( sourceMethod ); } - public Builder forgedMethod(Method method ) { + public Builder forgedMethod(Method method) { singleMapping = new EmptySingleMapping(); - return setupMethodWithMapping( method ); + return setupMethodWithMapping( method ); } private Builder setupMethodWithMapping(Method sourceMethod) { @@ -206,7 +206,8 @@ else if ( !method.isUpdateMethod() && method.getReturnType().isAbstract() ) { method, selectionParameters, ctx, - existingVariableNames ); + existingVariableNames + ); List afterMappingMethods = LifecycleCallbackFactory.afterMappingMethods( method, selectionParameters, ctx, existingVariableNames ); @@ -427,7 +428,7 @@ else if ( mapping.getSourceName() != null ) { unprocessedSourceParameters.remove( sourceRef.getParameter() ); } else { - errorOccured = true; + errorOccured = true; } } diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceReference.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceReference.java index e8234614d4..582e0fed7e 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceReference.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceReference.java @@ -127,7 +127,7 @@ public SourceReference build() { if ( segments.length > 1 && parameter != null ) { sourcePropertyNames = Arrays.copyOfRange( segments, 1, segments.length ); entries = getSourceEntries( parameter.getType(), sourcePropertyNames ); - foundEntryMatch = (entries.size() == sourcePropertyNames.length); + foundEntryMatch = ( entries.size() == sourcePropertyNames.length ); } else { // its only a parameter, no property @@ -141,14 +141,14 @@ public SourceReference build() { sourcePropertyNames = segments; parameter = method.getSourceParameters().get( 0 ); entries = getSourceEntries( parameter.getType(), sourcePropertyNames ); - foundEntryMatch = (entries.size() == sourcePropertyNames.length); + foundEntryMatch = ( entries.size() == sourcePropertyNames.length ); if ( !foundEntryMatch ) { //Lets see if the expression contains the parameterName, so parameterName.propName1.propName2 if ( parameter.getName().equals( segments[0] ) ) { sourcePropertyNames = Arrays.copyOfRange( segments, 1, segments.length ); entries = getSourceEntries( parameter.getType(), sourcePropertyNames ); - foundEntryMatch = (entries.size() == sourcePropertyNames.length); + foundEntryMatch = ( entries.size() == sourcePropertyNames.length ); } else { // segment[0] cannot be attributed to the parameter name. @@ -161,7 +161,8 @@ public SourceReference build() { if ( parameter != null ) { reportMappingError( Message.PROPERTYMAPPING_NO_PROPERTY_IN_PARAMETER, parameter.getName(), - Strings.join( Arrays.asList( sourcePropertyNames ), "." ) ); + Strings.join( Arrays.asList( sourcePropertyNames ), "." ) + ); } else { int notFoundPropertyIndex; @@ -202,12 +203,15 @@ private List getSourceEntries(Type type, String[] entryNames) { Map sourceReadAccessors = newType.getPropertyReadAccessors(); Map sourcePresenceCheckers = newType.getPropertyPresenceCheckers(); - for ( Map.Entry getter : sourceReadAccessors.entrySet() ) { + for ( Map.Entry getter : sourceReadAccessors.entrySet() ) { if ( getter.getKey().equals( entryName ) ) { - newType = typeFactory.getReturnType( (DeclaredType) newType.getTypeMirror(), - getter.getValue() ); + newType = typeFactory.getReturnType( + (DeclaredType) newType.getTypeMirror(), + getter.getValue() + ); sourceEntries.add( forSourceReference( entryName, getter.getValue(), - sourcePresenceCheckers.get( entryName ), newType ) ); + sourcePresenceCheckers.get( entryName ), newType + ) ); matchFound = true; break; } @@ -221,7 +225,8 @@ private List getSourceEntries(Type type, String[] entryNames) { private void reportMappingError(Message msg, Object... objects) { messager.printMessage( method.getExecutable(), mapping.getMirror(), mapping.getSourceAnnotationValue(), - msg, objects ); + msg, objects + ); } }