Skip to content

Commit 730ef9f

Browse files
committed
review and simplify
Signed-off-by: neo <1100909+neowu@users.noreply.github.com>
1 parent dbea8d5 commit 730ef9f

File tree

6 files changed

+9
-14
lines changed

6 files changed

+9
-14
lines changed

core-ng-mongo-test/src/test/java/core/framework/mongo/impl/MongoCollectionIntegrationTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.ArrayList;
2121
import java.util.List;
2222
import java.util.Map;
23-
import java.util.stream.Collectors;
2423

2524
import static org.assertj.core.api.Assertions.assertThat;
2625

@@ -139,7 +138,7 @@ void bulkDelete() {
139138
List<TestMongoEntity> entities = entities();
140139
collection.bulkInsert(entities);
141140

142-
long deletedCount = collection.bulkDelete(entities.stream().map(entity -> entity.id).collect(Collectors.toList()));
141+
long deletedCount = collection.bulkDelete(entities.stream().map(entity -> entity.id).toList());
143142
assertThat(deletedCount).isEqualTo(2);
144143
entities.forEach(entity -> assertThat(collection.get(entity.id)).isEmpty());
145144
}

core-ng-search-test/src/test/java/core/framework/search/impl/ElasticSearchIntegrationTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.util.List;
3333
import java.util.Map;
3434
import java.util.Optional;
35-
import java.util.stream.Collectors;
3635

3736
import static core.framework.search.query.Queries.match;
3837
import static core.framework.search.query.Queries.range;
@@ -161,20 +160,20 @@ void searchDateRange() {
161160
request.sorts.add(Sorts.fieldSort("id", SortOrder.Asc));
162161
SearchResponse<TestDocument> response = documentType.search(request);
163162
assertThat(response.totalHits).isEqualTo(3);
164-
assertThat(response.hits.stream().map(document1 -> document1.stringField).collect(Collectors.toList()))
163+
assertThat(response.hits.stream().map(document1 -> document1.stringField).toList())
165164
.containsOnly("value1", "value2", "value3");
166165

167166
request.query = QueryBuilders.range(r -> r.untyped(u -> u.field("local_time_field").gt(JsonData.of(LocalTime.of(13, 0)))));
168167
response = documentType.search(request);
169168
assertThat(response.totalHits).isEqualTo(2);
170-
assertThat(response.hits.stream().map(document -> document.stringField).collect(Collectors.toList()))
169+
assertThat(response.hits.stream().map(document -> document.stringField).toList())
171170
.containsOnly("value3", "value4");
172171

173172
request.query = range("zoned_date_time_field", from.toLocalDate(), to.toLocalDate());
174173
request.sorts.add(Sorts.fieldSort("id", SortOrder.Asc));
175174
response = documentType.search(request);
176175
assertThat(response.totalHits).isEqualTo(3);
177-
assertThat(response.hits.stream().map(document1 -> document1.stringField).collect(Collectors.toList()))
176+
assertThat(response.hits.stream().map(document1 -> document1.stringField).toList())
178177
.containsOnly("value1", "value2", "value3");
179178
}
180179

core-ng-search/src/main/java/core/framework/search/impl/ElasticSearchTypeImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public List<String> complete(CompleteRequest request) {
136136
List<String> suggestions = response.suggest().values().stream()
137137
.flatMap(Collection::stream).flatMap(suggestion -> suggestion.completion().options().stream()).map(CompletionSuggestOption::text)
138138
.distinct()
139-
.collect(Collectors.toList());
139+
.toList();
140140
options = suggestions.size();
141141
return suggestions;
142142
} catch (IOException e) {

core-ng-test/src/main/java/core/framework/test/assertion/EnvResourceAssert.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import java.nio.file.Paths;
1111
import java.util.List;
1212
import java.util.Properties;
13-
import java.util.stream.Collectors;
1413
import java.util.stream.Stream;
1514

1615
import static org.assertj.core.api.Assertions.assertThat;
@@ -58,7 +57,7 @@ private List<Path> resourceDirs() throws IOException {
5857
try (Stream<Path> stream = Files.list(actual)) {
5958
return stream.filter(Files::isDirectory)
6059
.map(path -> path.resolve("resources")).filter(Files::exists)
61-
.collect(Collectors.toList());
60+
.toList();
6261
}
6362
}
6463

@@ -74,7 +73,7 @@ private void assertOverridesDefault(Path resourceDir) throws IOException {
7473
private void assertPropertyOverridesDefault(Path resourceDir) throws IOException {
7574
List<Path> propertyFiles;
7675
try (Stream<Path> stream = Files.walk(resourceDir).filter(path -> path.toString().endsWith(".properties"))) {
77-
propertyFiles = stream.collect(Collectors.toList());
76+
propertyFiles = stream.toList();
7877
}
7978
for (Path propertyFile : propertyFiles) {
8079
Path defaultPropertyFile = mainResources.resolve(resourceDir.relativize(propertyFile));

ext/log-collector/src/main/java/core/log/LogCollectorApp.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import java.time.Duration;
1212
import java.util.Arrays;
1313
import java.util.List;
14-
import java.util.stream.Collectors;
1514

1615
/**
1716
* @author neo
@@ -47,6 +46,6 @@ List<String> allowedOrigins(String value) {
4746

4847
private List<String> parseList(String value) {
4948
String[] origins = Strings.split(value, ',');
50-
return Arrays.stream(origins).map(String::strip).collect(Collectors.toList());
49+
return Arrays.stream(origins).map(String::strip).toList();
5150
}
5251
}

ext/monitor/src/main/java/app/monitor/alert/AlertService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import java.util.List;
1111
import java.util.Map;
1212
import java.util.concurrent.locks.ReentrantLock;
13-
import java.util.stream.Collectors;
1413

1514
/**
1615
* @author ericchung, neo
@@ -34,7 +33,7 @@ public AlertService(AlertConfig config) {
3433
criticalErrors = new Matchers(config.criticalErrors);
3534
notifications = config.notifications.stream()
3635
.map(notification -> new Notification(notification.channel, new Matcher(notification.matcher)))
37-
.collect(Collectors.toList());
36+
.toList();
3837
timespanInMinutes = config.timespanInHours * 60;
3938
}
4039

0 commit comments

Comments
 (0)