Skip to content

Commit bf14f33

Browse files
authored
Merge pull request #1470 from kezhenxu94/polishing-remove-if
use removeIf and list.sort to polish code
2 parents a84f691 + 81d1d75 commit bf14f33

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,7 @@ public ResultMap addResultMap(
199199
}
200200
}
201201
if (declaresConstructor) {
202-
Iterator<ResultMapping> extendedResultMappingsIter = extendedResultMappings.iterator();
203-
while (extendedResultMappingsIter.hasNext()) {
204-
if (extendedResultMappingsIter.next().getFlags().contains(ResultFlag.CONSTRUCTOR)) {
205-
extendedResultMappingsIter.remove();
206-
}
207-
}
202+
extendedResultMappings.removeIf(resultMapping -> resultMapping.getFlags().contains(ResultFlag.CONSTRUCTOR));
208203
}
209204
resultMappings.addAll(extendedResultMappings);
210205
}

src/main/java/org/apache/ibatis/mapping/ResultMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public ResultMap build() {
130130
+ resultMap.getType().getName() + "' by arg names " + constructorArgNames
131131
+ ". There might be more info in debug log.");
132132
}
133-
Collections.sort(resultMap.constructorResultMappings, (o1, o2) -> {
133+
resultMap.constructorResultMappings.sort((o1, o2) -> {
134134
int paramIdx1 = actualArgNames.indexOf(o1.getProperty());
135135
int paramIdx2 = actualArgNames.indexOf(o2.getProperty());
136136
return paramIdx1 - paramIdx2;

0 commit comments

Comments
 (0)