Skip to content

#1948 Fix minor warnings with using collection in package model and util #1949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Captain1653 merged 1 commit into from
Oct 20, 2019
Merged

#1948 Fix minor warnings with using collection in package model and util #1949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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() ) ) );
}
}

Expand Down
10 changes: 2 additions & 8 deletions ...essor/src/main/java/org/mapstruct/ap/internal/model/LifecycleCallbackMethodReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}

/**
Expand Down
2 changes: 1 addition & 1 deletion processor/src/main/java/org/mapstruct/ap/internal/model/ObjectFactoryMethodResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );

Expand Down
2 changes: 1 addition & 1 deletion processor/src/main/java/org/mapstruct/ap/internal/model/source/ParameterProvidedMethods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 1 addition & 7 deletions processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...src/main/java/org/mapstruct/ap/internal/util/workarounds/EclipseAsMemberOfWorkaround.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down