From deb39ac3b5ca43e5c3dab0cd56675954be320283 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Tue, 7 May 2024 22:09:32 +0530
Subject: [PATCH] chore: Remove `archiveById` in BaseService

This is used in two/three services only, so
isn't being reused a lot by being in `BaseService`.
---
 .../actioncollections/base/ActionCollectionServiceCE.java    | 2 ++
 .../main/java/com/appsmith/server/services/BaseService.java  | 5 -----
 .../main/java/com/appsmith/server/services/CrudService.java  | 2 --
 .../java/com/appsmith/server/themes/base/ThemeServiceCE.java | 2 ++
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCE.java
index dbb3f28d95..8a2fe482bf 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCE.java
@@ -70,6 +70,8 @@ public interface ActionCollectionServiceCE extends CrudService<ActionCollection,
 
     Flux<ActionCollection> findByPageIdsForExport(List<String> pageIds, AclPermission permission);
 
+    Mono<ActionCollection> archiveById(String id);
+
     Mono<ActionCollection> findByBranchNameAndDefaultCollectionId(
             String branchName, String defaultCollectionId, AclPermission permission);
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java
index 754f9c9c71..8598724571 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java
@@ -81,11 +81,6 @@ public abstract class BaseService<
                         analyticsService.sendCreateEvent(savedResource, getAnalyticsProperties(savedResource)));
     }
 
-    @Override
-    public Mono<T> archiveById(ID id) {
-        return Mono.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION));
-    }
-
     /**
      * This function runs the validation checks on the object and returns a Mono.error if any of the constraints
      * have been violated. If all checks pass, a Mono of the object is returned back to the caller
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CrudService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CrudService.java
index 688022c889..0ead1a370f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CrudService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CrudService.java
@@ -22,8 +22,6 @@ public interface CrudService<T extends BaseDomain, ID> {
         return this.getById(id);
     }
 
-    Mono<T> archiveById(ID id);
-
     Map<String, Object> getAnalyticsProperties(T savedResource);
 
     Flux<T> filterByEntityFieldsWithoutPublicAccess(
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceCE.java
index 3c75e6c10b..6d4eb43cab 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceCE.java
@@ -15,6 +15,8 @@ public interface ThemeServiceCE extends CrudService<Theme, String> {
 
     Flux<Theme> getSystemThemes();
 
+    Mono<Theme> archiveById(String themeId);
+
     Mono<Theme> getSystemTheme(String themeName);
 
     Mono<Theme> updateTheme(String applicationId, String branchName, Theme resource);