Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove findById signature with Optional #34302

Merged
merged 1 commit into from
Jun 20, 2024
Merged

chore: Remove findById signature with Optional #34302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ...th-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -141,16 +140,16 @@ public DatasourceServiceCEImpl(

@Override
public Mono<Datasource> create(Datasource datasource) {
return createEx(datasource, Optional.of(workspacePermission.getDatasourceCreatePermission()));
return createEx(datasource, workspacePermission.getDatasourceCreatePermission());
}

// TODO: Check usage
@Override
public Mono<Datasource> createWithoutPermissions(Datasource datasource) {
return createEx(datasource, Optional.empty());
return createEx(datasource, null);
}

private Mono<Datasource> createEx(@NotNull Datasource datasource, Optional<AclPermission> permission) {
private Mono<Datasource> createEx(@NotNull Datasource datasource, AclPermission permission) {
// Validate incoming request
String workspaceId = datasource.getWorkspaceId();
if (!hasText(workspaceId)) {
Expand Down Expand Up @@ -263,7 +262,7 @@ protected Flux<DatasourceStorage> organiseDatasourceStorages(@NotNull Datasource
}

private Mono<Datasource> generateAndSetDatasourcePolicies(
Mono<User> userMono, Datasource datasource, Optional<AclPermission> permission) {
Mono<User> userMono, Datasource datasource, AclPermission permission) {
return userMono.flatMap(user -> {
Mono<Workspace> workspaceMono = workspaceService
.findById(datasource.getWorkspaceId(), permission)
Expand Down
4 changes: 0 additions & 4 deletions ...er/appsmith-server/src/main/java/com/appsmith/server/repositories/AppsmithRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,12 @@
import reactor.core.publisher.Mono;

import java.util.List;
import java.util.Optional;
import java.util.Set;

public interface AppsmithRepository<T extends BaseDomain> {

Mono<T> findById(String id, AclPermission permission);

@Deprecated(forRemoval = true)
Mono<T> findById(String id, Optional<AclPermission> permission);

Mono<T> updateById(String id, T resource, AclPermission permission);

Mono<Integer> updateByIdWithoutPermissionCheck(String id, BridgeUpdate update);
Expand Down
9 changes: 0 additions & 9 deletions ...erver/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -117,14 +116,6 @@ public Mono<T> 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<T> findById(String id, Optional<AclPermission> permission) {
return findById(id, permission.orElse(null));
}

public Mono<T> updateById(@NonNull String id, @NonNull T resource, AclPermission permission) {
// Set policies to null in the update object
resource.setPolicies(null);
Expand Down
3 changes: 0 additions & 3 deletions ...ver/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Workspace, String> {
Expand All @@ -25,8 +24,6 @@ public interface WorkspaceServiceCE extends CrudService<Workspace, String> {

Mono<Workspace> findById(String id, AclPermission permission);

Mono<Workspace> findById(String id, Optional<AclPermission> permission);

Mono<Workspace> save(Workspace workspace);

Mono<Workspace> findByIdAndPluginsPluginId(String workspaceId, String pluginId);
Expand Down
6 changes: 0 additions & 6 deletions ...appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -449,11 +448,6 @@ public Mono<Workspace> findById(String id, AclPermission permission) {
return repository.findById(id, permission);
}

@Override
public Mono<Workspace> findById(String id, Optional<AclPermission> permission) {
return repository.findById(id, permission);
}

@Override
public Mono<Workspace> save(Workspace workspace) {
if (StringUtils.hasLength(workspace.getName())) {
Expand Down
Loading