From e5c5550182e75b399d77573fa876fb737a3aaf07 Mon Sep 17 00:00:00 2001 From: Andrei Arlou Date: Sat, 10 Aug 2019 17:38:37 +0300 Subject: [PATCH] Fix warning addAll in org.mapstruct.ap.internal.model.assignment Fix typo in org.mapstruct.ap.internal.model.common.Type --- .../ap/internal/model/BeanMappingMethod.java | 6 +++--- .../ap/internal/model/assignment/AdderWrapper.java | 3 +-- .../internal/model/assignment/ArrayCopyWrapper.java | 3 +-- ...ngInstanceSetterWrapperForCollectionsAndMaps.java | 2 +- .../model/assignment/StreamAdderWrapper.java | 3 +-- .../ap/internal/model/assignment/UpdateWrapper.java | 3 +-- .../org/mapstruct/ap/internal/model/common/Type.java | 12 ++++++------ 7 files changed, 14 insertions(+), 18 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 a5cb32e21..ba78f7291 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 @@ -387,7 +387,7 @@ public class BeanMappingMethod extends NormalTypeMappingMethod { private boolean canBeConstructed(Type typeToBeConstructed) { return !typeToBeConstructed.isAbstract() && typeToBeConstructed.isAssignableTo( this.method.getResultType() ) - && typeToBeConstructed.hasEmptyAccessibleContructor(); + && typeToBeConstructed.hasEmptyAccessibleConstructor(); } private void reportResultTypeFromBeanMappingNotConstructableError(Type resultType) { @@ -410,7 +410,7 @@ public class BeanMappingMethod extends NormalTypeMappingMethod { method.getResultType() ); } - else if ( !resultType.hasEmptyAccessibleContructor() ) { + else if ( !resultType.hasEmptyAccessibleConstructor() ) { ctx.getMessager().printMessage( method.getExecutable(), BeanMappingPrism.getInstanceOn( method.getExecutable() ).mirror, @@ -428,7 +428,7 @@ public class BeanMappingMethod extends NormalTypeMappingMethod { returnType ); } - else if ( !returnType.hasEmptyAccessibleContructor() ) { + else if ( !returnType.hasEmptyAccessibleConstructor() ) { ctx.getMessager().printMessage( method.getExecutable(), Message.GENERAL_NO_SUITABLE_CONSTRUCTOR, diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AdderWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AdderWrapper.java index 71b5f10a9..c5778628e 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AdderWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AdderWrapper.java @@ -74,8 +74,7 @@ public class AdderWrapper extends AssignmentWrapper { @Override public Set getImportTypes() { - Set imported = new HashSet<>(); - imported.addAll( super.getImportTypes() ); + Set imported = new HashSet<>( super.getImportTypes() ); imported.add( adderType.getTypeBound() ); return imported; } diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java index db2c7be5a..6b623f7e3 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java @@ -40,8 +40,7 @@ public class ArrayCopyWrapper extends AssignmentWrapper { @Override public Set getImportTypes() { - Set imported = new HashSet<>(); - imported.addAll( getAssignment().getImportTypes() ); + Set imported = new HashSet<>( getAssignment().getImportTypes() ); imported.add( arraysType ); imported.add( targetType ); return imported; diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ExistingInstanceSetterWrapperForCollectionsAndMaps.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ExistingInstanceSetterWrapperForCollectionsAndMaps.java index d567b2d28..d07c5acef 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ExistingInstanceSetterWrapperForCollectionsAndMaps.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ExistingInstanceSetterWrapperForCollectionsAndMaps.java @@ -60,7 +60,7 @@ public class ExistingInstanceSetterWrapperForCollectionsAndMaps @Override public Set getImportTypes() { - Set imported = new HashSet( super.getImportTypes() ); + Set imported = new HashSet<>( super.getImportTypes() ); if ( isMapNullToDefault() && ( targetType.getImplementationType() != null ) ) { imported.add( targetType.getImplementationType() ); } diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/StreamAdderWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/StreamAdderWrapper.java index 1deff95a2..21a028c79 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/StreamAdderWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/StreamAdderWrapper.java @@ -70,8 +70,7 @@ public class StreamAdderWrapper extends AssignmentWrapper { @Override public Set getImportTypes() { - Set imported = new HashSet<>(); - imported.addAll( super.getImportTypes() ); + Set imported = new HashSet<>( super.getImportTypes() ); imported.add( adderType.getTypeBound() ); return imported; } diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.java index dede03145..cf0140e8c 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.java @@ -74,8 +74,7 @@ public class UpdateWrapper extends AssignmentWrapper { @Override public Set getImportTypes() { - Set imported = new HashSet<>(); - imported.addAll( super.getImportTypes() ); + Set imported = new HashSet<>( super.getImportTypes() ); if ( factoryMethod != null ) { imported.addAll( factoryMethod.getImportTypes() ); } diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java index bc0170645..9aa996e7e 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java @@ -99,7 +99,7 @@ public class Type extends ModelElement implements Comparable { private Type boundingBase = null; - private Boolean hasEmptyAccessibleContructor; + private Boolean hasEmptyAccessibleConstructor; private final Filters filters; @@ -1018,20 +1018,20 @@ public class Type extends ModelElement implements Comparable { return boundingBase; } - public boolean hasEmptyAccessibleContructor() { + public boolean hasEmptyAccessibleConstructor() { - if ( this.hasEmptyAccessibleContructor == null ) { - hasEmptyAccessibleContructor = false; + if ( this.hasEmptyAccessibleConstructor == null ) { + hasEmptyAccessibleConstructor = false; List constructors = ElementFilter.constructorsIn( typeElement.getEnclosedElements() ); for ( ExecutableElement constructor : constructors ) { if ( !constructor.getModifiers().contains( Modifier.PRIVATE ) && constructor.getParameters().isEmpty() ) { - hasEmptyAccessibleContructor = true; + hasEmptyAccessibleConstructor = true; break; } } } - return hasEmptyAccessibleContructor; + return hasEmptyAccessibleConstructor; } /**