Skip to content

Commit 9541784

Browse files
dragonpooludomikula
authored andcommittedOct 17, 2024
Refactor code to use StringUtils
1 parent 7d5fb6b commit 9541784

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed
 

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceApiServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public Flux<Datasource> listJsDatasourcePlugins(String applicationId, String nam
9090
.flatMapMany(application -> datasourceService.getByOrgId(application.getOrganizationId()))
9191
.filter(datasource -> datasource.getDatasourceStatus() == DatasourceStatus.NORMAL)
9292
.filter(datasource -> datasourceMetaInfoService.isJsDatasourcePlugin(datasource.getType()) &&
93-
(name == null || datasource.getName().toLowerCase().contains(name.toLowerCase())) &&
93+
(name == null || StringUtils.containsIgnoreCase(datasource.getName(), name)) &&
9494
(type == null || datasource.getType().equals(type))
9595
)
9696
.delayUntil(jsDatasourceHelper::processDynamicQueryConfig)
@@ -108,7 +108,7 @@ public Flux<DatasourceView> listOrgDataSources(String orgId, String name, String
108108
// get datasource
109109
Flux<Datasource> datasourceFlux = datasourceService.getByOrgId(orgId)
110110
.filter(datasource -> datasource.getDatasourceStatus() == DatasourceStatus.NORMAL &&
111-
(name == null || datasource.getName().toLowerCase().contains(name.toLowerCase())) &&
111+
(name == null || StringUtils.containsIgnoreCase(datasource.getName(), name)) &&
112112
(type == null || datasource.getType().equals(type))
113113
)
114114
.cache();

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,9 @@ private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoView
294294
.collectMap(FolderElement::elementId, FolderElement::folderId);
295295

296296
Flux<Folder> folderFlux = orgMemberMono.flatMapMany(orgMember -> folderService.findByOrganizationId(orgMember.getOrgId()))
297-
.filter(folder -> name == null || folder.getName().toLowerCase().contains(name.toLowerCase())
298-
|| folder.getType().toLowerCase().contains(name.toLowerCase())
299-
|| folder.getDescription().toLowerCase().contains(name.toLowerCase()))
297+
.filter(folder -> name == null || StringUtils.containsIgnoreCase(folder.getName(), name)
298+
|| StringUtils.containsIgnoreCase(folder.getType(), name)
299+
|| StringUtils.containsIgnoreCase(folder.getDescription(), name))
300300
.cache();
301301

302302
Mono<Map<String, Instant>> folderId2LastViewTimeMapMono = orgMemberMono

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@
204204
})
205205
.filter(application -> (isNull(applicationType) || application.getApplicationType() == applicationType.getValue())
206206
&& (isNull(applicationStatus) || application.getApplicationStatus() == applicationStatus)
207-
&& (isNull(name) || application.getName().toLowerCase().contains(name.toLowerCase())))
207+
&& (isNull(name) || StringUtils.containsIgnoreCase(application.getName(), name)))
208208
.cache()
209209
.collectList()
210210
.flatMapIterable(Function.identity());

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public Mono<List<LibraryQueryView>> listLibraryQueries(String name) {
7575
return orgDevChecker.checkCurrentOrgDev()
7676
.then(sessionUserService.getVisitorOrgMemberCache())
7777
.flatMapMany(orgMember -> getByOrgIdWithDatasourcePermissions(orgMember.getOrgId()))
78-
.filter(libraryQuery -> libraryQuery.getName().toLowerCase().contains(name.toLowerCase()))
78+
.filter(libraryQuery -> StringUtils.containsIgnoreCase(libraryQuery.getName(), name))
7979
.collectList()
8080
.flatMap(libraryQueries -> ViewBuilder.multiBuild(libraryQueries,
8181
LibraryQuery::getCreatedBy,
@@ -156,7 +156,7 @@ public Mono<LibraryQueryRecordMetaView> publish(String libraryQueryId, LibraryQu
156156
public Mono<List<LibraryQueryAggregateView>> dropDownList(String name) {
157157
Mono<List<LibraryQuery>> libraryQueryListMono = sessionUserService.getVisitorOrgMemberCache()
158158
.flatMapMany(orgMember -> getByOrgIdWithDatasourcePermissions(orgMember.getOrgId()))
159-
.filter(libraryQuery -> libraryQuery.getName().toLowerCase().contains(name.toLowerCase()))
159+
.filter(libraryQuery -> StringUtils.containsIgnoreCase(libraryQuery.getName(), name))
160160
.collectList()
161161
.cache();
162162

0 commit comments

Comments
 (0)