Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce Checkstyle rule for separator symbol location

Browse Source
This commit is contained in:
Sam Brannen
2025-03-19 15:35:35 +01:00
parent 18c3b637e4
commit 208d52d852
97 changed files with 378 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataCollector.java
View File

@@ -93,8 +93,8 @@ class MetadataCollector {
private boolean shouldBeMerged(ItemMetadata itemMetadata) {
String sourceType = itemMetadata.getType();
return (sourceType != null && !deletedInCurrentBuild(sourceType)
&& !processedInCurrentBuild(sourceType));
return (sourceType != null && !deletedInCurrentBuild(sourceType) &&
!processedInCurrentBuild(sourceType));
}
private boolean deletedInCurrentBuild(String sourceType) {

4
spring-context-indexer/src/test/java/org/springframework/context/index/processor/Metadata.java
View File

@@ -42,8 +42,8 @@ class Metadata {
ItemMetadata itemMetadata = metadata.getItems().stream()
.filter(item -> item.getType().equals(type))
.findFirst().orElse(null);
return itemMetadata != null && itemMetadata.getStereotypes().size() == stereotypes.size()
&& itemMetadata.getStereotypes().containsAll(stereotypes);
return (itemMetadata != null && itemMetadata.getStereotypes().size() == stereotypes.size() &&
itemMetadata.getStereotypes().containsAll(stereotypes));
}, "Candidates with type %s and stereotypes %s", type, stereotypes);
}