diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/CommonConstantsCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/CommonConstantsCE.java index 370fe1e1a7..16411c4367 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/CommonConstantsCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/CommonConstantsCE.java @@ -6,4 +6,5 @@ public class CommonConstantsCE { public static String FOR = DELIMETER_SPACE + "for" + DELIMETER_SPACE; public static String IN = DELIMETER_SPACE + "in" + DELIMETER_SPACE; public static String DEFAULT = "default"; + public static final Integer EVALUATION_VERSION = 2; } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java index 3518b3e9c9..e0124e3b94 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/layouts/UpdateLayoutServiceCEImpl.java @@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Pattern; import java.util.stream.Collectors; -import static com.appsmith.server.services.ce.ApplicationPageServiceCEImpl.EVALUATION_VERSION; +import static com.appsmith.server.constants.CommonConstants.EVALUATION_VERSION; import static java.lang.Boolean.FALSE; @Slf4j diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/refactors/applications/RefactoringServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/refactors/applications/RefactoringServiceCEImpl.java index d47c7ca09f..ed1b381624 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/refactors/applications/RefactoringServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/refactors/applications/RefactoringServiceCEImpl.java @@ -39,8 +39,8 @@ import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Collectors; +import static com.appsmith.server.constants.CommonConstants.EVALUATION_VERSION; import static com.appsmith.server.helpers.ContextTypeUtils.getDefaultContextIfNull; -import static com.appsmith.server.services.ce.ApplicationPageServiceCEImpl.EVALUATION_VERSION; @Slf4j @RequiredArgsConstructor diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java index f0bb7158cc..8ed8a3ff76 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java @@ -87,6 +87,7 @@ import java.util.Set; import java.util.stream.Collectors; import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS; +import static com.appsmith.server.constants.CommonConstants.EVALUATION_VERSION; import static org.apache.commons.lang.ObjectUtils.defaultIfNull; @Slf4j @@ -127,8 +128,6 @@ public class ApplicationPageServiceCEImpl implements ApplicationPageServiceCE { private final ClonePageService actionClonePageService; private final ClonePageService actionCollectionClonePageService; - public static final Integer EVALUATION_VERSION = 2; - @Override public Mono createPage(PageDTO page) { if (page.getId() != null) { diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/refactors/ce/RefactoringServiceCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/refactors/ce/RefactoringServiceCEImplTest.java index 3c26bb00a5..585f11fe2b 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/refactors/ce/RefactoringServiceCEImplTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/refactors/ce/RefactoringServiceCEImplTest.java @@ -47,7 +47,7 @@ import reactor.test.StepVerifier; import java.util.ArrayList; import java.util.List; -import static com.appsmith.server.services.ce.ApplicationPageServiceCEImpl.EVALUATION_VERSION; +import static com.appsmith.server.constants.CommonConstants.EVALUATION_VERSION; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java index 6f5b86fb6b..af3e5a29f5 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java @@ -60,7 +60,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import static com.appsmith.server.services.ce.ApplicationPageServiceCEImpl.EVALUATION_VERSION; +import static com.appsmith.server.constants.CommonConstants.EVALUATION_VERSION; import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java index 8f9fd552e7..a8d3d5c56f 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java @@ -98,10 +98,10 @@ import static com.appsmith.server.acl.AclPermission.READ_ACTIONS; import static com.appsmith.server.acl.AclPermission.READ_DATASOURCES; import static com.appsmith.server.acl.AclPermission.READ_PAGES; import static com.appsmith.server.acl.AclPermission.READ_WORKSPACES; +import static com.appsmith.server.constants.CommonConstants.EVALUATION_VERSION; import static com.appsmith.server.constants.FieldName.ADMINISTRATOR; import static com.appsmith.server.constants.FieldName.DEVELOPER; import static com.appsmith.server.constants.FieldName.VIEWER; -import static com.appsmith.server.services.ce.ApplicationPageServiceCEImpl.EVALUATION_VERSION; import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java index 57a3a5e966..7d2a5c9030 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java @@ -149,6 +149,7 @@ import static com.appsmith.server.acl.AclPermission.READ_DATASOURCES; import static com.appsmith.server.acl.AclPermission.READ_PAGES; import static com.appsmith.server.acl.AclPermission.READ_WORKSPACES; import static com.appsmith.server.constants.ArtifactType.APPLICATION; +import static com.appsmith.server.constants.CommonConstants.EVALUATION_VERSION; import static com.appsmith.server.constants.FieldName.ADMINISTRATOR; import static com.appsmith.server.constants.FieldName.ANONYMOUS_USER; import static com.appsmith.server.constants.FieldName.DEFAULT_PAGE_LAYOUT; @@ -156,7 +157,6 @@ import static com.appsmith.server.constants.FieldName.DEVELOPER; import static com.appsmith.server.constants.FieldName.VIEWER; import static com.appsmith.server.constants.ce.FieldNameCE.WORKSPACE; import static com.appsmith.server.dtos.CustomJSLibContextDTO.getDTOFromCustomJSLib; -import static com.appsmith.server.services.ApplicationPageServiceImpl.EVALUATION_VERSION; import static java.lang.Boolean.TRUE; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals;