From 02f6031cec08a4e805f479b500be40b08a003142 Mon Sep 17 00:00:00 2001 From: Shrikant Sharat Kandula Date: Tue, 18 Jun 2024 15:14:29 +0530 Subject: [PATCH] chore: Remove `findById` signature with `Optional` --- .../server/datasources/base/DatasourceServiceCEImpl.java | 9 ++++----- .../appsmith/server/repositories/AppsmithRepository.java | 4 ---- .../repositories/ce/BaseAppsmithRepositoryCEImpl.java | 9 --------- .../appsmith/server/services/ce/WorkspaceServiceCE.java | 3 --- .../server/services/ce/WorkspaceServiceCEImpl.java | 6 ------ 5 files changed, 4 insertions(+), 27 deletions(-) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java index 690847fd0e1b..60738e7f7668 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java @@ -57,7 +57,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; import java.util.UUID; @@ -141,16 +140,16 @@ public DatasourceServiceCEImpl( @Override public Mono create(Datasource datasource) { - return createEx(datasource, Optional.of(workspacePermission.getDatasourceCreatePermission())); + return createEx(datasource, workspacePermission.getDatasourceCreatePermission()); } // TODO: Check usage @Override public Mono createWithoutPermissions(Datasource datasource) { - return createEx(datasource, Optional.empty()); + return createEx(datasource, null); } - private Mono createEx(@NotNull Datasource datasource, Optional permission) { + private Mono createEx(@NotNull Datasource datasource, AclPermission permission) { // Validate incoming request String workspaceId = datasource.getWorkspaceId(); if (!hasText(workspaceId)) { @@ -263,7 +262,7 @@ protected Flux organiseDatasourceStorages(@NotNull Datasource } private Mono generateAndSetDatasourcePolicies( - Mono userMono, Datasource datasource, Optional permission) { + Mono userMono, Datasource datasource, AclPermission permission) { return userMono.flatMap(user -> { Mono workspaceMono = workspaceService .findById(datasource.getWorkspaceId(), permission) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/AppsmithRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/AppsmithRepository.java index 6970a7fb324c..b4865bcab715 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/AppsmithRepository.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/AppsmithRepository.java @@ -7,16 +7,12 @@ import reactor.core.publisher.Mono; import java.util.List; -import java.util.Optional; import java.util.Set; public interface AppsmithRepository { Mono findById(String id, AclPermission permission); - @Deprecated(forRemoval = true) - Mono findById(String id, Optional permission); - Mono updateById(String id, T resource, AclPermission permission); Mono updateByIdWithoutPermissionCheck(String id, BridgeUpdate update); diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java index 1e1023cafc4b..fef9c8d18e24 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java @@ -40,7 +40,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -117,14 +116,6 @@ public Mono findById(String id, AclPermission permission) { return queryBuilder().byId(id).permission(permission).one(); } - /** - * @deprecated using `Optional` for function arguments is an anti-pattern. - */ - @Deprecated(forRemoval = true) - public Mono findById(String id, Optional permission) { - return findById(id, permission.orElse(null)); - } - public Mono updateById(@NonNull String id, @NonNull T resource, AclPermission permission) { // Set policies to null in the update object resource.setPolicies(null); diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java index 0e737c2b14b1..40ce39ce0298 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java @@ -10,7 +10,6 @@ import reactor.core.publisher.Mono; import java.util.List; -import java.util.Optional; import java.util.Set; public interface WorkspaceServiceCE extends CrudService { @@ -25,8 +24,6 @@ public interface WorkspaceServiceCE extends CrudService { Mono findById(String id, AclPermission permission); - Mono findById(String id, Optional permission); - Mono save(Workspace workspace); Mono findByIdAndPluginsPluginId(String workspaceId, String pluginId); diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java index 5acc95d56b4a..10f08224596e 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java @@ -45,7 +45,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Optional; import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -449,11 +448,6 @@ public Mono findById(String id, AclPermission permission) { return repository.findById(id, permission); } - @Override - public Mono findById(String id, Optional permission) { - return repository.findById(id, permission); - } - @Override public Mono save(Workspace workspace) { if (StringUtils.hasLength(workspace.getName())) {