mapstruct#1948 Fix minor warnings with using collection in package model and class util/workarounds/EclipseAsMemberOfWorkaround (mapstruct#1949)

Captain1653 · web-flow · commit e8a7832d5b6c · 2019-10-20T14:16:26.000+03:00
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
@@ -8,7 +8,6 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -371,11 +370,8 @@ private void sortPropertyMappingsByDependencies() {
                 );
             }
             else {
-                Collections.sort(
-                    propertyMappings,
-                    Comparator.comparingInt( propertyMapping ->
-                            graphAnalyzer.getTraversalSequence( propertyMapping.getName() ) )
-                );
+                propertyMappings.sort( Comparator.comparingInt( propertyMapping ->
+                    graphAnalyzer.getTraversalSequence( propertyMapping.getName() ) ) );
             }
         }
 
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleCallbackMethodReference.java b/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleCallbackMethodReference.java
@@ -80,17 +80,11 @@ public String getTargetVariableName() {
 
     @Override
     public Set<Type> getImportTypes() {
-        return declaringType != null ? Collections.asSet( declaringType ) : java.util.Collections.<Type> emptySet();
+        return declaringType != null ? Collections.asSet( declaringType ) : java.util.Collections.emptySet();
     }
 
     public boolean hasMappingTargetParameter() {
-        for ( ParameterBinding param : getParameterBindings() ) {
-            if ( param.isMappingTarget() ) {
-                return true;
-            }
-        }
-
-        return false;
+        return getParameterBindings().stream().anyMatch( ParameterBinding::isMappingTarget );
     }
 
     /**
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/ObjectFactoryMethodResolver.java b/processor/src/main/java/org/mapstruct/ap/internal/model/ObjectFactoryMethodResolver.java
@@ -76,7 +76,7 @@ public static MethodReference getFactoryMethod( Method method,
             selectors.getMatchingMethods(
                 method,
                 getAllAvailableMethods( method, ctx.getSourceModel() ),
-                java.util.Collections.<Type> emptyList(),
+                java.util.Collections.emptyList(),
                 alternativeTarget,
                 SelectionCriteria.forFactoryMethods( selectionParameters ) );
 
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/ParameterProvidedMethods.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/ParameterProvidedMethods.java
@@ -23,7 +23,7 @@
  */
 public class ParameterProvidedMethods {
     private static final ParameterProvidedMethods EMPTY =
-        new ParameterProvidedMethods( Collections.<Parameter, List<SourceMethod>> emptyMap() );
+        new ParameterProvidedMethods( Collections.emptyMap() );
 
     private final Map<Parameter, List<SourceMethod>> parameterToProvidedMethods;
     private final Map<SourceMethod, Parameter> methodToProvidingParameter;
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceMethod.java
@@ -454,13 +454,7 @@ public boolean matches(List<Type> sourceTypes, Type targetType) {
      * @return {@code true} if the parameter list contains a parameter annotated with {@code @TargetType}
      */
     public static boolean containsTargetTypeParameter(List<Parameter> parameters) {
-        for ( Parameter param : parameters ) {
-            if ( param.isTargetType() ) {
-                return true;
-            }
-        }
-
-        return false;
+        return parameters.stream().anyMatch( Parameter::isTargetType );
     }
 
     @Override
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/util/workarounds/EclipseAsMemberOfWorkaround.java b/processor/src/main/java/org/mapstruct/ap/internal/util/workarounds/EclipseAsMemberOfWorkaround.java
@@ -6,7 +6,6 @@
 package org.mapstruct.ap.internal.util.workarounds;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
@@ -73,7 +72,7 @@ static TypeMirror asMemberOf(ProcessingEnvironment environment, DeclaredType con
             candidatesFromInterfaces );
 
         // there can be multiple matches for the same method name from adjacent interface hierarchies.
-        Collections.sort( candidatesFromInterfaces, MostSpecificMethodBindingComparator.INSTANCE );
+        candidatesFromInterfaces.sort( MostSpecificMethodBindingComparator.INSTANCE );
 
         if ( !candidatesFromInterfaces.isEmpty() ) {
             // return the most specific match
