diff --git a/app/server/pom.xml b/app/server/pom.xml index 72e3b0c3c7..11b90b2c3d 100644 --- a/app/server/pom.xml +++ b/app/server/pom.xml @@ -8,11 +8,11 @@ 2.1.3.RELEASE - com.mobtools + com.appsmith server 0.0.1-SNAPSHOT server - This is the API server for the Mobtools project + This is the API server for the Appsmith project 11 diff --git a/app/server/src/main/java/com/mobtools/server/ServerApplication.java b/app/server/src/main/java/com/appsmith/server/ServerApplication.java similarity index 92% rename from app/server/src/main/java/com/mobtools/server/ServerApplication.java rename to app/server/src/main/java/com/appsmith/server/ServerApplication.java index 339a23ca73..ff17d23847 100644 --- a/app/server/src/main/java/com/mobtools/server/ServerApplication.java +++ b/app/server/src/main/java/com/appsmith/server/ServerApplication.java @@ -1,4 +1,4 @@ -package com.mobtools.server; +package com.appsmith.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/app/server/src/main/java/com/mobtools/server/configurations/ClientUserRepository.java b/app/server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java similarity index 95% rename from app/server/src/main/java/com/mobtools/server/configurations/ClientUserRepository.java rename to app/server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java index c4f57144f0..06910d2122 100644 --- a/app/server/src/main/java/com/mobtools/server/configurations/ClientUserRepository.java +++ b/app/server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java @@ -1,10 +1,10 @@ -package com.mobtools.server.configurations; +package com.appsmith.server.configurations; -import com.mobtools.server.domains.LoginSource; -import com.mobtools.server.domains.User; -import com.mobtools.server.domains.UserState; -import com.mobtools.server.services.TenantService; -import com.mobtools.server.services.UserService; +import com.appsmith.server.domains.LoginSource; +import com.appsmith.server.domains.User; +import com.appsmith.server.domains.UserState; +import com.appsmith.server.services.UserService; +import com.appsmith.server.services.TenantService; import org.springframework.context.annotation.Configuration; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.client.OAuth2AuthorizedClient; diff --git a/app/server/src/main/java/com/mobtools/server/configurations/CommonConfig.java b/app/server/src/main/java/com/appsmith/server/configurations/CommonConfig.java similarity index 77% rename from app/server/src/main/java/com/mobtools/server/configurations/CommonConfig.java rename to app/server/src/main/java/com/appsmith/server/configurations/CommonConfig.java index 68c318b812..7668a381bf 100644 --- a/app/server/src/main/java/com/mobtools/server/configurations/CommonConfig.java +++ b/app/server/src/main/java/com/appsmith/server/configurations/CommonConfig.java @@ -1,4 +1,4 @@ -package com.mobtools.server.configurations; +package com.appsmith.server.configurations; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -8,7 +8,7 @@ import reactor.core.scheduler.Schedulers; @Configuration public class CommonConfig { - private String ELASTIC_THREAD_POOL_NAME = "mobtools-elastic-pool"; + private String ELASTIC_THREAD_POOL_NAME = "appsmith-elastic-pool"; @Bean public Scheduler scheduler() { diff --git a/app/server/src/main/java/com/mobtools/server/configurations/MongoConfig.java b/app/server/src/main/java/com/appsmith/server/configurations/MongoConfig.java similarity index 96% rename from app/server/src/main/java/com/mobtools/server/configurations/MongoConfig.java rename to app/server/src/main/java/com/appsmith/server/configurations/MongoConfig.java index 6520c03226..cb3b59990e 100644 --- a/app/server/src/main/java/com/mobtools/server/configurations/MongoConfig.java +++ b/app/server/src/main/java/com/appsmith/server/configurations/MongoConfig.java @@ -1,4 +1,4 @@ -package com.mobtools.server.configurations; +package com.appsmith.server.configurations; import com.mongodb.reactivestreams.client.MongoClient; import com.mongodb.reactivestreams.client.MongoClients; diff --git a/app/server/src/main/java/com/mobtools/server/configurations/SecurityConfig.java b/app/server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java similarity index 93% rename from app/server/src/main/java/com/mobtools/server/configurations/SecurityConfig.java rename to app/server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java index 9209c0d91c..9d1253ee79 100644 --- a/app/server/src/main/java/com/mobtools/server/configurations/SecurityConfig.java +++ b/app/server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java @@ -1,9 +1,9 @@ -package com.mobtools.server.configurations; +package com.appsmith.server.configurations; -import com.mobtools.server.constants.Security; -import com.mobtools.server.services.TenantService; -import com.mobtools.server.services.UserService; +import com.appsmith.server.services.UserService; +import com.appsmith.server.constants.Security; +import com.appsmith.server.services.TenantService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; diff --git a/app/server/src/main/java/com/mobtools/server/constants/Security.java b/app/server/src/main/java/com/appsmith/server/constants/Security.java similarity index 63% rename from app/server/src/main/java/com/mobtools/server/constants/Security.java rename to app/server/src/main/java/com/appsmith/server/constants/Security.java index 5b818ce2c4..a4beff71ac 100644 --- a/app/server/src/main/java/com/mobtools/server/constants/Security.java +++ b/app/server/src/main/java/com/appsmith/server/constants/Security.java @@ -1,4 +1,4 @@ -package com.mobtools.server.constants; +package com.appsmith.server.constants; public interface Security { String USER_ROLE = "USER_ROLE"; diff --git a/app/server/src/main/java/com/mobtools/server/constants/Url.java b/app/server/src/main/java/com/appsmith/server/constants/Url.java similarity index 92% rename from app/server/src/main/java/com/mobtools/server/constants/Url.java rename to app/server/src/main/java/com/appsmith/server/constants/Url.java index c7b6486982..ae8842e9c5 100644 --- a/app/server/src/main/java/com/mobtools/server/constants/Url.java +++ b/app/server/src/main/java/com/appsmith/server/constants/Url.java @@ -1,4 +1,4 @@ -package com.mobtools.server.constants; +package com.appsmith.server.constants; public interface Url { String BASE_URL = "/api"; diff --git a/app/server/src/main/java/com/mobtools/server/controllers/BaseController.java b/app/server/src/main/java/com/appsmith/server/controllers/BaseController.java similarity index 85% rename from app/server/src/main/java/com/mobtools/server/controllers/BaseController.java rename to app/server/src/main/java/com/appsmith/server/controllers/BaseController.java index a8bfbe2122..5060aae58b 100644 --- a/app/server/src/main/java/com/mobtools/server/controllers/BaseController.java +++ b/app/server/src/main/java/com/appsmith/server/controllers/BaseController.java @@ -1,9 +1,9 @@ -package com.mobtools.server.controllers; +package com.appsmith.server.controllers; -import com.mobtools.server.domains.BaseDomain; -import com.mobtools.server.dtos.ResponseDto; -import com.mobtools.server.exceptions.MobtoolsException; -import com.mobtools.server.services.CrudService; +import com.appsmith.server.domains.BaseDomain; +import com.appsmith.server.dtos.ResponseDto; +import com.appsmith.server.services.CrudService; +import com.appsmith.server.exceptions.AppsmithException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -21,7 +21,7 @@ public abstract class BaseController> create(@Valid @RequestBody T resource) throws MobtoolsException { + public Mono> create(@Valid @RequestBody T resource) throws AppsmithException { log.debug("Going to create resource {}", resource.getClass().getName()); return service.create(resource) .map(created -> new ResponseDto<>(HttpStatus.CREATED.value(), created, null)); diff --git a/app/server/src/main/java/com/mobtools/server/controllers/IndexController.java b/app/server/src/main/java/com/appsmith/server/controllers/IndexController.java similarity index 93% rename from app/server/src/main/java/com/mobtools/server/controllers/IndexController.java rename to app/server/src/main/java/com/appsmith/server/controllers/IndexController.java index c7201e7e7a..b3075f8dd5 100644 --- a/app/server/src/main/java/com/mobtools/server/controllers/IndexController.java +++ b/app/server/src/main/java/com/appsmith/server/controllers/IndexController.java @@ -1,4 +1,4 @@ -package com.mobtools.server.controllers; +package com.appsmith.server.controllers; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/app/server/src/main/java/com/mobtools/server/controllers/LayoutController.java b/app/server/src/main/java/com/appsmith/server/controllers/LayoutController.java similarity index 70% rename from app/server/src/main/java/com/mobtools/server/controllers/LayoutController.java rename to app/server/src/main/java/com/appsmith/server/controllers/LayoutController.java index 3f76d6eb33..c291869fc3 100644 --- a/app/server/src/main/java/com/mobtools/server/controllers/LayoutController.java +++ b/app/server/src/main/java/com/appsmith/server/controllers/LayoutController.java @@ -1,8 +1,8 @@ -package com.mobtools.server.controllers; +package com.appsmith.server.controllers; -import com.mobtools.server.constants.Url; -import com.mobtools.server.domains.Layout; -import com.mobtools.server.services.LayoutService; +import com.appsmith.server.domains.Layout; +import com.appsmith.server.services.LayoutService; +import com.appsmith.server.constants.Url; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/app/server/src/main/java/com/mobtools/server/controllers/PluginController.java b/app/server/src/main/java/com/appsmith/server/controllers/PluginController.java similarity index 77% rename from app/server/src/main/java/com/mobtools/server/controllers/PluginController.java rename to app/server/src/main/java/com/appsmith/server/controllers/PluginController.java index 08c4a845a6..91b5261308 100644 --- a/app/server/src/main/java/com/mobtools/server/controllers/PluginController.java +++ b/app/server/src/main/java/com/appsmith/server/controllers/PluginController.java @@ -1,11 +1,11 @@ -package com.mobtools.server.controllers; +package com.appsmith.server.controllers; -import com.mobtools.server.constants.Url; -import com.mobtools.server.domains.Plugin; -import com.mobtools.server.domains.Tenant; -import com.mobtools.server.dtos.PluginTenantDTO; -import com.mobtools.server.dtos.ResponseDto; -import com.mobtools.server.services.PluginService; +import com.appsmith.server.domains.Plugin; +import com.appsmith.server.domains.Tenant; +import com.appsmith.server.dtos.PluginTenantDTO; +import com.appsmith.server.dtos.ResponseDto; +import com.appsmith.server.services.PluginService; +import com.appsmith.server.constants.Url; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; diff --git a/app/server/src/main/java/com/mobtools/server/controllers/QueryController.java b/app/server/src/main/java/com/appsmith/server/controllers/QueryController.java similarity index 71% rename from app/server/src/main/java/com/mobtools/server/controllers/QueryController.java rename to app/server/src/main/java/com/appsmith/server/controllers/QueryController.java index 3645b1e591..be65d64f7a 100644 --- a/app/server/src/main/java/com/mobtools/server/controllers/QueryController.java +++ b/app/server/src/main/java/com/appsmith/server/controllers/QueryController.java @@ -1,9 +1,9 @@ -package com.mobtools.server.controllers; +package com.appsmith.server.controllers; -import com.mobtools.server.constants.Url; -import com.mobtools.server.domains.Query; -import com.mobtools.server.dtos.CommandQueryParams; -import com.mobtools.server.services.QueryService; +import com.appsmith.server.domains.Query; +import com.appsmith.server.dtos.CommandQueryParams; +import com.appsmith.server.services.QueryService; +import com.appsmith.server.constants.Url; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import reactor.core.publisher.Flux; diff --git a/app/server/src/main/java/com/mobtools/server/controllers/ResourceController.java b/app/server/src/main/java/com/appsmith/server/controllers/ResourceController.java similarity index 70% rename from app/server/src/main/java/com/mobtools/server/controllers/ResourceController.java rename to app/server/src/main/java/com/appsmith/server/controllers/ResourceController.java index ea04fac1e5..69a8fcf1e1 100644 --- a/app/server/src/main/java/com/mobtools/server/controllers/ResourceController.java +++ b/app/server/src/main/java/com/appsmith/server/controllers/ResourceController.java @@ -1,8 +1,8 @@ -package com.mobtools.server.controllers; +package com.appsmith.server.controllers; -import com.mobtools.server.constants.Url; -import com.mobtools.server.domains.Resource; -import com.mobtools.server.services.ResourceService; +import com.appsmith.server.services.ResourceService; +import com.appsmith.server.constants.Url; +import com.appsmith.server.domains.Resource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/app/server/src/main/java/com/mobtools/server/controllers/SettingController.java b/app/server/src/main/java/com/appsmith/server/controllers/SettingController.java similarity index 71% rename from app/server/src/main/java/com/mobtools/server/controllers/SettingController.java rename to app/server/src/main/java/com/appsmith/server/controllers/SettingController.java index 0a86e280d5..e81b4d1dd4 100644 --- a/app/server/src/main/java/com/mobtools/server/controllers/SettingController.java +++ b/app/server/src/main/java/com/appsmith/server/controllers/SettingController.java @@ -1,8 +1,8 @@ -package com.mobtools.server.controllers; +package com.appsmith.server.controllers; -import com.mobtools.server.constants.Url; -import com.mobtools.server.domains.Setting; -import com.mobtools.server.services.SettingService; +import com.appsmith.server.domains.Setting; +import com.appsmith.server.services.SettingService; +import com.appsmith.server.constants.Url; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/app/server/src/main/java/com/mobtools/server/controllers/TenantController.java b/app/server/src/main/java/com/appsmith/server/controllers/TenantController.java similarity index 71% rename from app/server/src/main/java/com/mobtools/server/controllers/TenantController.java rename to app/server/src/main/java/com/appsmith/server/controllers/TenantController.java index f227109837..05257a0887 100644 --- a/app/server/src/main/java/com/mobtools/server/controllers/TenantController.java +++ b/app/server/src/main/java/com/appsmith/server/controllers/TenantController.java @@ -1,8 +1,8 @@ -package com.mobtools.server.controllers; +package com.appsmith.server.controllers; -import com.mobtools.server.constants.Url; -import com.mobtools.server.domains.Tenant; -import com.mobtools.server.services.TenantService; +import com.appsmith.server.domains.Tenant; +import com.appsmith.server.constants.Url; +import com.appsmith.server.services.TenantService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/app/server/src/main/java/com/mobtools/server/controllers/WidgetController.java b/app/server/src/main/java/com/appsmith/server/controllers/WidgetController.java similarity index 79% rename from app/server/src/main/java/com/mobtools/server/controllers/WidgetController.java rename to app/server/src/main/java/com/appsmith/server/controllers/WidgetController.java index dcf4c6a757..6ed8c2b208 100644 --- a/app/server/src/main/java/com/mobtools/server/controllers/WidgetController.java +++ b/app/server/src/main/java/com/appsmith/server/controllers/WidgetController.java @@ -1,9 +1,9 @@ -package com.mobtools.server.controllers; +package com.appsmith.server.controllers; -import com.mobtools.server.constants.Url; -import com.mobtools.server.domains.Widget; -import com.mobtools.server.dtos.ResponseDto; -import com.mobtools.server.services.WidgetService; +import com.appsmith.server.domains.Widget; +import com.appsmith.server.dtos.ResponseDto; +import com.appsmith.server.services.WidgetService; +import com.appsmith.server.constants.Url; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.GetMapping; diff --git a/app/server/src/main/java/com/mobtools/server/domains/Action.java b/app/server/src/main/java/com/appsmith/server/domains/Action.java similarity index 93% rename from app/server/src/main/java/com/mobtools/server/domains/Action.java rename to app/server/src/main/java/com/appsmith/server/domains/Action.java index 9994fcef6e..f1c89e0949 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/Action.java +++ b/app/server/src/main/java/com/appsmith/server/domains/Action.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/ActionConfiguration.java b/app/server/src/main/java/com/appsmith/server/domains/ActionConfiguration.java similarity index 96% rename from app/server/src/main/java/com/mobtools/server/domains/ActionConfiguration.java rename to app/server/src/main/java/com/appsmith/server/domains/ActionConfiguration.java index d796a0d90e..4318bbc822 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/ActionConfiguration.java +++ b/app/server/src/main/java/com/appsmith/server/domains/ActionConfiguration.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/BaseDomain.java b/app/server/src/main/java/com/appsmith/server/domains/BaseDomain.java similarity index 95% rename from app/server/src/main/java/com/mobtools/server/domains/BaseDomain.java rename to app/server/src/main/java/com/appsmith/server/domains/BaseDomain.java index 5db5e9e9b2..cbe5ee10dc 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/BaseDomain.java +++ b/app/server/src/main/java/com/appsmith/server/domains/BaseDomain.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.Setter; diff --git a/app/server/src/main/java/com/mobtools/server/domains/Layout.java b/app/server/src/main/java/com/appsmith/server/domains/Layout.java similarity index 89% rename from app/server/src/main/java/com/mobtools/server/domains/Layout.java rename to app/server/src/main/java/com/appsmith/server/domains/Layout.java index 9677402d9c..a42efb8770 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/Layout.java +++ b/app/server/src/main/java/com/appsmith/server/domains/Layout.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/LoginSource.java b/app/server/src/main/java/com/appsmith/server/domains/LoginSource.java similarity index 55% rename from app/server/src/main/java/com/mobtools/server/domains/LoginSource.java rename to app/server/src/main/java/com/appsmith/server/domains/LoginSource.java index 576f07bf53..7ed840d16a 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/LoginSource.java +++ b/app/server/src/main/java/com/appsmith/server/domains/LoginSource.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; public enum LoginSource { GOOGLE, FORM diff --git a/app/server/src/main/java/com/mobtools/server/domains/Plugin.java b/app/server/src/main/java/com/appsmith/server/domains/Plugin.java similarity index 94% rename from app/server/src/main/java/com/mobtools/server/domains/Plugin.java rename to app/server/src/main/java/com/appsmith/server/domains/Plugin.java index efde52b180..8f71b6f9d5 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/Plugin.java +++ b/app/server/src/main/java/com/appsmith/server/domains/Plugin.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/PluginParameterType.java b/app/server/src/main/java/com/appsmith/server/domains/PluginParameterType.java similarity index 85% rename from app/server/src/main/java/com/mobtools/server/domains/PluginParameterType.java rename to app/server/src/main/java/com/appsmith/server/domains/PluginParameterType.java index 646b5690b4..8e19cc2ad1 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/PluginParameterType.java +++ b/app/server/src/main/java/com/appsmith/server/domains/PluginParameterType.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/PluginType.java b/app/server/src/main/java/com/appsmith/server/domains/PluginType.java similarity index 52% rename from app/server/src/main/java/com/mobtools/server/domains/PluginType.java rename to app/server/src/main/java/com/appsmith/server/domains/PluginType.java index b6200c9216..a3c2872959 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/PluginType.java +++ b/app/server/src/main/java/com/appsmith/server/domains/PluginType.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; public enum PluginType { DB, REST diff --git a/app/server/src/main/java/com/mobtools/server/domains/PricingPlan.java b/app/server/src/main/java/com/appsmith/server/domains/PricingPlan.java similarity index 65% rename from app/server/src/main/java/com/mobtools/server/domains/PricingPlan.java rename to app/server/src/main/java/com/appsmith/server/domains/PricingPlan.java index 11ac68d2a1..8c96cf5166 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/PricingPlan.java +++ b/app/server/src/main/java/com/appsmith/server/domains/PricingPlan.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; public enum PricingPlan { FREE, STARTUP, BUSINESS, ENTERPRISE diff --git a/app/server/src/main/java/com/mobtools/server/domains/Property.java b/app/server/src/main/java/com/appsmith/server/domains/Property.java similarity index 82% rename from app/server/src/main/java/com/mobtools/server/domains/Property.java rename to app/server/src/main/java/com/appsmith/server/domains/Property.java index 4f160a7c1f..7768228499 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/Property.java +++ b/app/server/src/main/java/com/appsmith/server/domains/Property.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.Setter; diff --git a/app/server/src/main/java/com/mobtools/server/domains/Query.java b/app/server/src/main/java/com/appsmith/server/domains/Query.java similarity index 95% rename from app/server/src/main/java/com/mobtools/server/domains/Query.java rename to app/server/src/main/java/com/appsmith/server/domains/Query.java index d5fdafe5d1..2590e5e39a 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/Query.java +++ b/app/server/src/main/java/com/appsmith/server/domains/Query.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/Resource.java b/app/server/src/main/java/com/appsmith/server/domains/Resource.java similarity index 93% rename from app/server/src/main/java/com/mobtools/server/domains/Resource.java rename to app/server/src/main/java/com/appsmith/server/domains/Resource.java index 52e2da7ba6..ef946cb7e9 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/Resource.java +++ b/app/server/src/main/java/com/appsmith/server/domains/Resource.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/ResourceConfiguration.java b/app/server/src/main/java/com/appsmith/server/domains/ResourceConfiguration.java similarity index 81% rename from app/server/src/main/java/com/mobtools/server/domains/ResourceConfiguration.java rename to app/server/src/main/java/com/appsmith/server/domains/ResourceConfiguration.java index 35008d9a19..69a72901e0 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/ResourceConfiguration.java +++ b/app/server/src/main/java/com/appsmith/server/domains/ResourceConfiguration.java @@ -1,6 +1,6 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; -import com.mobtools.server.dtos.AuthenticationDTO; +import com.appsmith.server.dtos.AuthenticationDTO; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/app/server/src/main/java/com/mobtools/server/domains/Role.java b/app/server/src/main/java/com/appsmith/server/domains/Role.java similarity index 90% rename from app/server/src/main/java/com/mobtools/server/domains/Role.java rename to app/server/src/main/java/com/appsmith/server/domains/Role.java index 609626ad76..4c8250f121 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/Role.java +++ b/app/server/src/main/java/com/appsmith/server/domains/Role.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; diff --git a/app/server/src/main/java/com/mobtools/server/domains/Setting.java b/app/server/src/main/java/com/appsmith/server/domains/Setting.java similarity index 92% rename from app/server/src/main/java/com/mobtools/server/domains/Setting.java rename to app/server/src/main/java/com/appsmith/server/domains/Setting.java index af3ff34d22..df6290adae 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/Setting.java +++ b/app/server/src/main/java/com/appsmith/server/domains/Setting.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/Tenant.java b/app/server/src/main/java/com/appsmith/server/domains/Tenant.java similarity index 92% rename from app/server/src/main/java/com/mobtools/server/domains/Tenant.java rename to app/server/src/main/java/com/appsmith/server/domains/Tenant.java index 899f33f932..26d8a3b49d 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/Tenant.java +++ b/app/server/src/main/java/com/appsmith/server/domains/Tenant.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/TenantPlugin.java b/app/server/src/main/java/com/appsmith/server/domains/TenantPlugin.java similarity index 78% rename from app/server/src/main/java/com/mobtools/server/domains/TenantPlugin.java rename to app/server/src/main/java/com/appsmith/server/domains/TenantPlugin.java index 3068da38b6..b93e2d9b73 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/TenantPlugin.java +++ b/app/server/src/main/java/com/appsmith/server/domains/TenantPlugin.java @@ -1,6 +1,6 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; -import com.mobtools.server.dtos.TenantPluginStatus; +import com.appsmith.server.dtos.TenantPluginStatus; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/app/server/src/main/java/com/mobtools/server/domains/TenantSetting.java b/app/server/src/main/java/com/appsmith/server/domains/TenantSetting.java similarity index 92% rename from app/server/src/main/java/com/mobtools/server/domains/TenantSetting.java rename to app/server/src/main/java/com/appsmith/server/domains/TenantSetting.java index 12c45dcc65..14c3a38d9b 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/TenantSetting.java +++ b/app/server/src/main/java/com/appsmith/server/domains/TenantSetting.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/User.java b/app/server/src/main/java/com/appsmith/server/domains/User.java similarity index 97% rename from app/server/src/main/java/com/mobtools/server/domains/User.java rename to app/server/src/main/java/com/appsmith/server/domains/User.java index f3a508dd2a..d542b01c6b 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/User.java +++ b/app/server/src/main/java/com/appsmith/server/domains/User.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/UserState.java b/app/server/src/main/java/com/appsmith/server/domains/UserState.java similarity index 59% rename from app/server/src/main/java/com/mobtools/server/domains/UserState.java rename to app/server/src/main/java/com/appsmith/server/domains/UserState.java index 9043527e78..66d8216102 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/UserState.java +++ b/app/server/src/main/java/com/appsmith/server/domains/UserState.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; public enum UserState { NEW, INVITED, ACTIVATED diff --git a/app/server/src/main/java/com/mobtools/server/domains/Widget.java b/app/server/src/main/java/com/appsmith/server/domains/Widget.java similarity index 93% rename from app/server/src/main/java/com/mobtools/server/domains/Widget.java rename to app/server/src/main/java/com/appsmith/server/domains/Widget.java index 00a0f19b43..a2848df99c 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/Widget.java +++ b/app/server/src/main/java/com/appsmith/server/domains/Widget.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/app/server/src/main/java/com/mobtools/server/domains/WidgetType.java b/app/server/src/main/java/com/appsmith/server/domains/WidgetType.java similarity index 54% rename from app/server/src/main/java/com/mobtools/server/domains/WidgetType.java rename to app/server/src/main/java/com/appsmith/server/domains/WidgetType.java index 9888f7d4a8..812406b6db 100644 --- a/app/server/src/main/java/com/mobtools/server/domains/WidgetType.java +++ b/app/server/src/main/java/com/appsmith/server/domains/WidgetType.java @@ -1,4 +1,4 @@ -package com.mobtools.server.domains; +package com.appsmith.server.domains; public enum WidgetType { DB, DISPLAY diff --git a/app/server/src/main/java/com/mobtools/server/dtos/AuthenticationDTO.java b/app/server/src/main/java/com/appsmith/server/dtos/AuthenticationDTO.java similarity index 84% rename from app/server/src/main/java/com/mobtools/server/dtos/AuthenticationDTO.java rename to app/server/src/main/java/com/appsmith/server/dtos/AuthenticationDTO.java index 6ed8047570..706c93786f 100644 --- a/app/server/src/main/java/com/mobtools/server/dtos/AuthenticationDTO.java +++ b/app/server/src/main/java/com/appsmith/server/dtos/AuthenticationDTO.java @@ -1,4 +1,4 @@ -package com.mobtools.server.dtos; +package com.appsmith.server.dtos; import lombok.*; diff --git a/app/server/src/main/java/com/mobtools/server/dtos/CommandQueryParams.java b/app/server/src/main/java/com/appsmith/server/dtos/CommandQueryParams.java similarity index 84% rename from app/server/src/main/java/com/mobtools/server/dtos/CommandQueryParams.java rename to app/server/src/main/java/com/appsmith/server/dtos/CommandQueryParams.java index 3d9c09e71e..ef4bca1ad0 100644 --- a/app/server/src/main/java/com/mobtools/server/dtos/CommandQueryParams.java +++ b/app/server/src/main/java/com/appsmith/server/dtos/CommandQueryParams.java @@ -1,4 +1,4 @@ -package com.mobtools.server.dtos; +package com.appsmith.server.dtos; import lombok.Getter; import lombok.Setter; diff --git a/app/server/src/main/java/com/mobtools/server/dtos/Param.java b/app/server/src/main/java/com/appsmith/server/dtos/Param.java similarity index 78% rename from app/server/src/main/java/com/mobtools/server/dtos/Param.java rename to app/server/src/main/java/com/appsmith/server/dtos/Param.java index d42d073cac..614e96c80c 100644 --- a/app/server/src/main/java/com/mobtools/server/dtos/Param.java +++ b/app/server/src/main/java/com/appsmith/server/dtos/Param.java @@ -1,4 +1,4 @@ -package com.mobtools.server.dtos; +package com.appsmith.server.dtos; import lombok.Getter; import lombok.Setter; diff --git a/app/server/src/main/java/com/mobtools/server/dtos/PluginDTO.java b/app/server/src/main/java/com/appsmith/server/dtos/PluginDTO.java similarity index 68% rename from app/server/src/main/java/com/mobtools/server/dtos/PluginDTO.java rename to app/server/src/main/java/com/appsmith/server/dtos/PluginDTO.java index 0ec890b9da..498fd1e7f0 100644 --- a/app/server/src/main/java/com/mobtools/server/dtos/PluginDTO.java +++ b/app/server/src/main/java/com/appsmith/server/dtos/PluginDTO.java @@ -1,6 +1,6 @@ -package com.mobtools.server.dtos; +package com.appsmith.server.dtos; -import com.mobtools.server.domains.PluginType; +import com.appsmith.server.domains.PluginType; import lombok.Getter; import lombok.Setter; diff --git a/app/server/src/main/java/com/mobtools/server/dtos/PluginTenantDTO.java b/app/server/src/main/java/com/appsmith/server/dtos/PluginTenantDTO.java similarity index 80% rename from app/server/src/main/java/com/mobtools/server/dtos/PluginTenantDTO.java rename to app/server/src/main/java/com/appsmith/server/dtos/PluginTenantDTO.java index 649532cb07..1104c2840a 100644 --- a/app/server/src/main/java/com/mobtools/server/dtos/PluginTenantDTO.java +++ b/app/server/src/main/java/com/appsmith/server/dtos/PluginTenantDTO.java @@ -1,4 +1,4 @@ -package com.mobtools.server.dtos; +package com.appsmith.server.dtos; import lombok.Getter; import lombok.Setter; diff --git a/app/server/src/main/java/com/mobtools/server/dtos/ResponseDto.java b/app/server/src/main/java/com/appsmith/server/dtos/ResponseDto.java similarity index 90% rename from app/server/src/main/java/com/mobtools/server/dtos/ResponseDto.java rename to app/server/src/main/java/com/appsmith/server/dtos/ResponseDto.java index 6e5ae2edcb..f4c12b1f0d 100644 --- a/app/server/src/main/java/com/mobtools/server/dtos/ResponseDto.java +++ b/app/server/src/main/java/com/appsmith/server/dtos/ResponseDto.java @@ -1,4 +1,4 @@ -package com.mobtools.server.dtos; +package com.appsmith.server.dtos; import lombok.*; diff --git a/app/server/src/main/java/com/mobtools/server/dtos/TenantPluginStatus.java b/app/server/src/main/java/com/appsmith/server/dtos/TenantPluginStatus.java similarity index 64% rename from app/server/src/main/java/com/mobtools/server/dtos/TenantPluginStatus.java rename to app/server/src/main/java/com/appsmith/server/dtos/TenantPluginStatus.java index dfb70f18b9..1f8cf9be01 100644 --- a/app/server/src/main/java/com/mobtools/server/dtos/TenantPluginStatus.java +++ b/app/server/src/main/java/com/appsmith/server/dtos/TenantPluginStatus.java @@ -1,4 +1,4 @@ -package com.mobtools.server.dtos; +package com.appsmith.server.dtos; public enum TenantPluginStatus { FREE, TRIAL, ACTIVATED diff --git a/app/server/src/main/java/com/appsmith/server/exceptions/AppsmithException.java b/app/server/src/main/java/com/appsmith/server/exceptions/AppsmithException.java new file mode 100644 index 0000000000..28787d8086 --- /dev/null +++ b/app/server/src/main/java/com/appsmith/server/exceptions/AppsmithException.java @@ -0,0 +1,8 @@ +package com.appsmith.server.exceptions; + +public class AppsmithException extends Exception { + + public AppsmithException(String msg) { + super(msg); + } +} diff --git a/app/server/src/main/java/com/mobtools/server/filters/MDCFilter.java b/app/server/src/main/java/com/appsmith/server/filters/MDCFilter.java similarity index 97% rename from app/server/src/main/java/com/mobtools/server/filters/MDCFilter.java rename to app/server/src/main/java/com/appsmith/server/filters/MDCFilter.java index 44bde1f43f..5cbacee57a 100644 --- a/app/server/src/main/java/com/mobtools/server/filters/MDCFilter.java +++ b/app/server/src/main/java/com/appsmith/server/filters/MDCFilter.java @@ -1,6 +1,6 @@ -package com.mobtools.server.filters; +package com.appsmith.server.filters; -import com.mobtools.server.helpers.LogHelper; +import com.appsmith.server.helpers.LogHelper; import org.slf4j.MDC; import org.springframework.http.HttpHeaders; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/app/server/src/main/java/com/mobtools/server/filters/RequestIdFilter.java b/app/server/src/main/java/com/appsmith/server/filters/RequestIdFilter.java similarity index 93% rename from app/server/src/main/java/com/mobtools/server/filters/RequestIdFilter.java rename to app/server/src/main/java/com/appsmith/server/filters/RequestIdFilter.java index cd47aab5bb..903bab3b13 100644 --- a/app/server/src/main/java/com/mobtools/server/filters/RequestIdFilter.java +++ b/app/server/src/main/java/com/appsmith/server/filters/RequestIdFilter.java @@ -1,6 +1,6 @@ -package com.mobtools.server.filters; +package com.appsmith.server.filters; -import com.mobtools.server.helpers.LogHelper; +import com.appsmith.server.helpers.LogHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; diff --git a/app/server/src/main/java/com/mobtools/server/helpers/LogHelper.java b/app/server/src/main/java/com/appsmith/server/helpers/LogHelper.java similarity index 98% rename from app/server/src/main/java/com/mobtools/server/helpers/LogHelper.java rename to app/server/src/main/java/com/appsmith/server/helpers/LogHelper.java index d98b4c1eea..825d66da16 100644 --- a/app/server/src/main/java/com/mobtools/server/helpers/LogHelper.java +++ b/app/server/src/main/java/com/appsmith/server/helpers/LogHelper.java @@ -1,4 +1,4 @@ -package com.mobtools.server.helpers; +package com.appsmith.server.helpers; import org.slf4j.MDC; import reactor.core.publisher.Signal; diff --git a/app/server/src/main/java/com/mobtools/server/plugins/PostgresDBPluginExecutor.java b/app/server/src/main/java/com/appsmith/server/plugins/PostgresDBPluginExecutor.java similarity index 92% rename from app/server/src/main/java/com/mobtools/server/plugins/PostgresDBPluginExecutor.java rename to app/server/src/main/java/com/appsmith/server/plugins/PostgresDBPluginExecutor.java index 365b54f1c3..3e1499c3db 100644 --- a/app/server/src/main/java/com/mobtools/server/plugins/PostgresDBPluginExecutor.java +++ b/app/server/src/main/java/com/appsmith/server/plugins/PostgresDBPluginExecutor.java @@ -1,8 +1,8 @@ -package com.mobtools.server.plugins; +package com.appsmith.server.plugins; -import com.mobtools.server.domains.Query; -import com.mobtools.server.dtos.CommandQueryParams; -import com.mobtools.server.services.PluginExecutor; +import com.appsmith.server.services.PluginExecutor; +import com.appsmith.server.domains.Query; +import com.appsmith.server.dtos.CommandQueryParams; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/app/server/src/main/java/com/mobtools/server/plugins/RestTemplatePluginExecutor.java b/app/server/src/main/java/com/appsmith/server/plugins/RestTemplatePluginExecutor.java similarity index 91% rename from app/server/src/main/java/com/mobtools/server/plugins/RestTemplatePluginExecutor.java rename to app/server/src/main/java/com/appsmith/server/plugins/RestTemplatePluginExecutor.java index fc3126c900..62b6dbbf2f 100644 --- a/app/server/src/main/java/com/mobtools/server/plugins/RestTemplatePluginExecutor.java +++ b/app/server/src/main/java/com/appsmith/server/plugins/RestTemplatePluginExecutor.java @@ -1,9 +1,9 @@ -package com.mobtools.server.plugins; +package com.appsmith.server.plugins; -import com.mobtools.server.domains.Property; -import com.mobtools.server.domains.Query; -import com.mobtools.server.dtos.CommandQueryParams; -import com.mobtools.server.services.PluginExecutor; +import com.appsmith.server.services.PluginExecutor; +import com.appsmith.server.domains.Property; +import com.appsmith.server.domains.Query; +import com.appsmith.server.dtos.CommandQueryParams; import lombok.extern.slf4j.Slf4j; import net.minidev.json.JSONObject; import org.springframework.http.HttpHeaders; diff --git a/app/server/src/main/java/com/mobtools/server/repositories/BaseRepository.java b/app/server/src/main/java/com/appsmith/server/repositories/BaseRepository.java similarity index 87% rename from app/server/src/main/java/com/mobtools/server/repositories/BaseRepository.java rename to app/server/src/main/java/com/appsmith/server/repositories/BaseRepository.java index d427e5f80b..bbf5ece6d9 100644 --- a/app/server/src/main/java/com/mobtools/server/repositories/BaseRepository.java +++ b/app/server/src/main/java/com/appsmith/server/repositories/BaseRepository.java @@ -1,4 +1,4 @@ -package com.mobtools.server.repositories; +package com.appsmith.server.repositories; import org.springframework.data.repository.NoRepositoryBean; import org.springframework.data.repository.reactive.ReactiveCrudRepository; diff --git a/app/server/src/main/java/com/mobtools/server/repositories/LayoutRepository.java b/app/server/src/main/java/com/appsmith/server/repositories/LayoutRepository.java similarity index 62% rename from app/server/src/main/java/com/mobtools/server/repositories/LayoutRepository.java rename to app/server/src/main/java/com/appsmith/server/repositories/LayoutRepository.java index a20e37ef3a..34036a1d73 100644 --- a/app/server/src/main/java/com/mobtools/server/repositories/LayoutRepository.java +++ b/app/server/src/main/java/com/appsmith/server/repositories/LayoutRepository.java @@ -1,6 +1,6 @@ -package com.mobtools.server.repositories; +package com.appsmith.server.repositories; -import com.mobtools.server.domains.Layout; +import com.appsmith.server.domains.Layout; import org.springframework.stereotype.Repository; @Repository diff --git a/app/server/src/main/java/com/mobtools/server/repositories/PluginRepository.java b/app/server/src/main/java/com/appsmith/server/repositories/PluginRepository.java similarity index 72% rename from app/server/src/main/java/com/mobtools/server/repositories/PluginRepository.java rename to app/server/src/main/java/com/appsmith/server/repositories/PluginRepository.java index f6f7b9b858..6fb8e3869f 100644 --- a/app/server/src/main/java/com/mobtools/server/repositories/PluginRepository.java +++ b/app/server/src/main/java/com/appsmith/server/repositories/PluginRepository.java @@ -1,6 +1,6 @@ -package com.mobtools.server.repositories; +package com.appsmith.server.repositories; -import com.mobtools.server.domains.Plugin; +import com.appsmith.server.domains.Plugin; import org.springframework.stereotype.Repository; import reactor.core.publisher.Mono; diff --git a/app/server/src/main/java/com/mobtools/server/repositories/QueryRepository.java b/app/server/src/main/java/com/appsmith/server/repositories/QueryRepository.java similarity index 72% rename from app/server/src/main/java/com/mobtools/server/repositories/QueryRepository.java rename to app/server/src/main/java/com/appsmith/server/repositories/QueryRepository.java index 3bdad6f42a..176f2566b8 100644 --- a/app/server/src/main/java/com/mobtools/server/repositories/QueryRepository.java +++ b/app/server/src/main/java/com/appsmith/server/repositories/QueryRepository.java @@ -1,6 +1,6 @@ -package com.mobtools.server.repositories; +package com.appsmith.server.repositories; -import com.mobtools.server.domains.Query; +import com.appsmith.server.domains.Query; import org.springframework.stereotype.Repository; import reactor.core.publisher.Mono; diff --git a/app/server/src/main/java/com/mobtools/server/repositories/ResourceRepository.java b/app/server/src/main/java/com/appsmith/server/repositories/ResourceRepository.java similarity index 62% rename from app/server/src/main/java/com/mobtools/server/repositories/ResourceRepository.java rename to app/server/src/main/java/com/appsmith/server/repositories/ResourceRepository.java index 9465e2438e..e7830d5f03 100644 --- a/app/server/src/main/java/com/mobtools/server/repositories/ResourceRepository.java +++ b/app/server/src/main/java/com/appsmith/server/repositories/ResourceRepository.java @@ -1,6 +1,6 @@ -package com.mobtools.server.repositories; +package com.appsmith.server.repositories; -import com.mobtools.server.domains.Resource; +import com.appsmith.server.domains.Resource; import org.springframework.stereotype.Repository; @Repository diff --git a/app/server/src/main/java/com/mobtools/server/repositories/SettingRepository.java b/app/server/src/main/java/com/appsmith/server/repositories/SettingRepository.java similarity index 71% rename from app/server/src/main/java/com/mobtools/server/repositories/SettingRepository.java rename to app/server/src/main/java/com/appsmith/server/repositories/SettingRepository.java index bedc261d57..72a1409bee 100644 --- a/app/server/src/main/java/com/mobtools/server/repositories/SettingRepository.java +++ b/app/server/src/main/java/com/appsmith/server/repositories/SettingRepository.java @@ -1,6 +1,6 @@ -package com.mobtools.server.repositories; +package com.appsmith.server.repositories; -import com.mobtools.server.domains.Setting; +import com.appsmith.server.domains.Setting; import org.springframework.stereotype.Repository; import reactor.core.publisher.Mono; diff --git a/app/server/src/main/java/com/mobtools/server/repositories/TenantRepository.java b/app/server/src/main/java/com/appsmith/server/repositories/TenantRepository.java similarity index 72% rename from app/server/src/main/java/com/mobtools/server/repositories/TenantRepository.java rename to app/server/src/main/java/com/appsmith/server/repositories/TenantRepository.java index f11113c0ea..8bfb464cc6 100644 --- a/app/server/src/main/java/com/mobtools/server/repositories/TenantRepository.java +++ b/app/server/src/main/java/com/appsmith/server/repositories/TenantRepository.java @@ -1,6 +1,6 @@ -package com.mobtools.server.repositories; +package com.appsmith.server.repositories; -import com.mobtools.server.domains.Tenant; +import com.appsmith.server.domains.Tenant; import org.springframework.stereotype.Repository; import reactor.core.publisher.Mono; diff --git a/app/server/src/main/java/com/mobtools/server/repositories/UserRepository.java b/app/server/src/main/java/com/appsmith/server/repositories/UserRepository.java similarity index 75% rename from app/server/src/main/java/com/mobtools/server/repositories/UserRepository.java rename to app/server/src/main/java/com/appsmith/server/repositories/UserRepository.java index 7a53303b29..3f230f47ae 100644 --- a/app/server/src/main/java/com/mobtools/server/repositories/UserRepository.java +++ b/app/server/src/main/java/com/appsmith/server/repositories/UserRepository.java @@ -1,6 +1,6 @@ -package com.mobtools.server.repositories; +package com.appsmith.server.repositories; -import com.mobtools.server.domains.User; +import com.appsmith.server.domains.User; import org.springframework.stereotype.Repository; import reactor.core.publisher.Mono; diff --git a/app/server/src/main/java/com/mobtools/server/repositories/WidgetRepository.java b/app/server/src/main/java/com/appsmith/server/repositories/WidgetRepository.java similarity index 72% rename from app/server/src/main/java/com/mobtools/server/repositories/WidgetRepository.java rename to app/server/src/main/java/com/appsmith/server/repositories/WidgetRepository.java index faa1f8c49d..edd8142c46 100644 --- a/app/server/src/main/java/com/mobtools/server/repositories/WidgetRepository.java +++ b/app/server/src/main/java/com/appsmith/server/repositories/WidgetRepository.java @@ -1,6 +1,6 @@ -package com.mobtools.server.repositories; +package com.appsmith.server.repositories; -import com.mobtools.server.domains.Widget; +import com.appsmith.server.domains.Widget; import org.springframework.stereotype.Repository; import reactor.core.publisher.Mono; diff --git a/app/server/src/main/java/com/mobtools/server/services/BaseService.java b/app/server/src/main/java/com/appsmith/server/services/BaseService.java similarity index 87% rename from app/server/src/main/java/com/mobtools/server/services/BaseService.java rename to app/server/src/main/java/com/appsmith/server/services/BaseService.java index 5d13c8a98a..1132ff3c85 100644 --- a/app/server/src/main/java/com/mobtools/server/services/BaseService.java +++ b/app/server/src/main/java/com/appsmith/server/services/BaseService.java @@ -1,8 +1,8 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.BaseDomain; -import com.mobtools.server.exceptions.MobtoolsException; -import com.mobtools.server.repositories.BaseRepository; +import com.appsmith.server.domains.BaseDomain; +import com.appsmith.server.exceptions.AppsmithException; +import com.appsmith.server.repositories.BaseRepository; import com.mongodb.BasicDBObject; import com.mongodb.DBObject; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; @@ -63,11 +63,11 @@ public abstract class BaseService getById(ID id) { return repository.findById(id) - .switchIfEmpty(Mono.error(new MobtoolsException("Unable to find resource with id: " + id.toString()))); + .switchIfEmpty(Mono.error(new AppsmithException("Unable to find resource with id: " + id.toString()))); } @Override - public Mono create(T object) throws MobtoolsException { + public Mono create(T object) throws AppsmithException { return repository.save(object); } diff --git a/app/server/src/main/java/com/mobtools/server/services/CrudService.java b/app/server/src/main/java/com/appsmith/server/services/CrudService.java similarity index 54% rename from app/server/src/main/java/com/mobtools/server/services/CrudService.java rename to app/server/src/main/java/com/appsmith/server/services/CrudService.java index e6f82f7211..6ffb3dcaf7 100644 --- a/app/server/src/main/java/com/mobtools/server/services/CrudService.java +++ b/app/server/src/main/java/com/appsmith/server/services/CrudService.java @@ -1,7 +1,7 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.BaseDomain; -import com.mobtools.server.exceptions.MobtoolsException; +import com.appsmith.server.domains.BaseDomain; +import com.appsmith.server.exceptions.AppsmithException; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -9,7 +9,7 @@ public interface CrudService { Flux get(); - Mono create(T resource) throws MobtoolsException; + Mono create(T resource) throws AppsmithException; Mono update(ID id, T resource) throws Exception; diff --git a/app/server/src/main/java/com/appsmith/server/services/LayoutService.java b/app/server/src/main/java/com/appsmith/server/services/LayoutService.java new file mode 100644 index 0000000000..39e2331501 --- /dev/null +++ b/app/server/src/main/java/com/appsmith/server/services/LayoutService.java @@ -0,0 +1,6 @@ +package com.appsmith.server.services; + +import com.appsmith.server.domains.Layout; + +public interface LayoutService extends CrudService { +} diff --git a/app/server/src/main/java/com/mobtools/server/services/LayoutServiceImpl.java b/app/server/src/main/java/com/appsmith/server/services/LayoutServiceImpl.java similarity index 85% rename from app/server/src/main/java/com/mobtools/server/services/LayoutServiceImpl.java rename to app/server/src/main/java/com/appsmith/server/services/LayoutServiceImpl.java index 38574ce1e5..d9e5501f25 100644 --- a/app/server/src/main/java/com/mobtools/server/services/LayoutServiceImpl.java +++ b/app/server/src/main/java/com/appsmith/server/services/LayoutServiceImpl.java @@ -1,7 +1,7 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.Layout; -import com.mobtools.server.repositories.LayoutRepository; +import com.appsmith.server.domains.Layout; +import com.appsmith.server.repositories.LayoutRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; diff --git a/app/server/src/main/java/com/mobtools/server/services/PluginExecutor.java b/app/server/src/main/java/com/appsmith/server/services/PluginExecutor.java similarity index 94% rename from app/server/src/main/java/com/mobtools/server/services/PluginExecutor.java rename to app/server/src/main/java/com/appsmith/server/services/PluginExecutor.java index ef5efd0219..2a0a67d87e 100644 --- a/app/server/src/main/java/com/mobtools/server/services/PluginExecutor.java +++ b/app/server/src/main/java/com/appsmith/server/services/PluginExecutor.java @@ -1,11 +1,11 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; import com.github.mustachejava.DefaultMustacheFactory; import com.github.mustachejava.Mustache; import com.github.mustachejava.MustacheFactory; -import com.mobtools.server.domains.Query; -import com.mobtools.server.dtos.CommandQueryParams; -import com.mobtools.server.dtos.Param; +import com.appsmith.server.domains.Query; +import com.appsmith.server.dtos.CommandQueryParams; +import com.appsmith.server.dtos.Param; import reactor.core.publisher.Flux; import java.io.StringReader; diff --git a/app/server/src/main/java/com/mobtools/server/services/PluginService.java b/app/server/src/main/java/com/appsmith/server/services/PluginService.java similarity index 64% rename from app/server/src/main/java/com/mobtools/server/services/PluginService.java rename to app/server/src/main/java/com/appsmith/server/services/PluginService.java index f1653090a4..cb9a43b053 100644 --- a/app/server/src/main/java/com/mobtools/server/services/PluginService.java +++ b/app/server/src/main/java/com/appsmith/server/services/PluginService.java @@ -1,10 +1,10 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.Plugin; -import com.mobtools.server.domains.PluginType; -import com.mobtools.server.domains.Tenant; -import com.mobtools.server.dtos.PluginTenantDTO; -import com.mobtools.server.exceptions.MobtoolsException; +import com.appsmith.server.domains.Plugin; +import com.appsmith.server.domains.PluginType; +import com.appsmith.server.domains.Tenant; +import com.appsmith.server.dtos.PluginTenantDTO; +import com.appsmith.server.exceptions.AppsmithException; import reactor.core.publisher.Mono; public interface PluginService extends CrudService { @@ -19,7 +19,7 @@ public interface PluginService extends CrudService { */ PluginExecutor getPluginExecutor(PluginType pluginType, String className); - public Mono create(Plugin plugin) throws MobtoolsException; + public Mono create(Plugin plugin) throws AppsmithException; public Mono installPlugin(PluginTenantDTO plugin); diff --git a/app/server/src/main/java/com/mobtools/server/services/PluginServiceImpl.java b/app/server/src/main/java/com/appsmith/server/services/PluginServiceImpl.java similarity index 91% rename from app/server/src/main/java/com/mobtools/server/services/PluginServiceImpl.java rename to app/server/src/main/java/com/appsmith/server/services/PluginServiceImpl.java index 2a99552cf1..1b5fd8dbf4 100644 --- a/app/server/src/main/java/com/mobtools/server/services/PluginServiceImpl.java +++ b/app/server/src/main/java/com/appsmith/server/services/PluginServiceImpl.java @@ -1,15 +1,15 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.configurations.ClientUserRepository; -import com.mobtools.server.domains.Plugin; -import com.mobtools.server.domains.PluginType; -import com.mobtools.server.domains.Tenant; -import com.mobtools.server.domains.TenantPlugin; -import com.mobtools.server.dtos.PluginTenantDTO; -import com.mobtools.server.dtos.TenantPluginStatus; -import com.mobtools.server.exceptions.MobtoolsException; -import com.mobtools.server.repositories.PluginRepository; -import com.mobtools.server.repositories.UserRepository; +import com.appsmith.server.configurations.ClientUserRepository; +import com.appsmith.server.domains.Plugin; +import com.appsmith.server.domains.PluginType; +import com.appsmith.server.domains.Tenant; +import com.appsmith.server.domains.TenantPlugin; +import com.appsmith.server.dtos.PluginTenantDTO; +import com.appsmith.server.dtos.TenantPluginStatus; +import com.appsmith.server.exceptions.AppsmithException; +import com.appsmith.server.repositories.PluginRepository; +import com.appsmith.server.repositories.UserRepository; import lombok.extern.slf4j.Slf4j; import org.bson.types.ObjectId; import org.springframework.beans.factory.annotation.Autowired; @@ -69,9 +69,9 @@ public class PluginServiceImpl extends BaseService create(Plugin plugin) throws MobtoolsException { + public Mono create(Plugin plugin) throws AppsmithException { if (plugin.getId() != null) { - throw new MobtoolsException("During create plugin, Id is not null. Can't create new plugin."); + throw new AppsmithException("During create plugin, Id is not null. Can't create new plugin."); } plugin.setDeleted(false); return pluginRepository.save(plugin); diff --git a/app/server/src/main/java/com/mobtools/server/services/QueryService.java b/app/server/src/main/java/com/appsmith/server/services/QueryService.java similarity index 57% rename from app/server/src/main/java/com/mobtools/server/services/QueryService.java rename to app/server/src/main/java/com/appsmith/server/services/QueryService.java index 43d56e6bdc..2abad4d539 100644 --- a/app/server/src/main/java/com/mobtools/server/services/QueryService.java +++ b/app/server/src/main/java/com/appsmith/server/services/QueryService.java @@ -1,7 +1,7 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.Query; -import com.mobtools.server.dtos.CommandQueryParams; +import com.appsmith.server.domains.Query; +import com.appsmith.server.dtos.CommandQueryParams; import reactor.core.publisher.Flux; public interface QueryService extends CrudService { diff --git a/app/server/src/main/java/com/mobtools/server/services/QueryServiceImpl.java b/app/server/src/main/java/com/appsmith/server/services/QueryServiceImpl.java similarity index 84% rename from app/server/src/main/java/com/mobtools/server/services/QueryServiceImpl.java rename to app/server/src/main/java/com/appsmith/server/services/QueryServiceImpl.java index 5752fec89f..d1b0421cfe 100644 --- a/app/server/src/main/java/com/mobtools/server/services/QueryServiceImpl.java +++ b/app/server/src/main/java/com/appsmith/server/services/QueryServiceImpl.java @@ -1,9 +1,9 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.Query; -import com.mobtools.server.dtos.CommandQueryParams; -import com.mobtools.server.exceptions.MobtoolsException; -import com.mobtools.server.repositories.QueryRepository; +import com.appsmith.server.domains.Query; +import com.appsmith.server.dtos.CommandQueryParams; +import com.appsmith.server.exceptions.AppsmithException; +import com.appsmith.server.repositories.QueryRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; @@ -36,7 +36,7 @@ public class QueryServiceImpl extends BaseService queryMono = repository.findByName(name) - .switchIfEmpty(Mono.defer(() -> Mono.error(new MobtoolsException("Unable to find query by id: " + name)))); + .switchIfEmpty(Mono.defer(() -> Mono.error(new AppsmithException("Unable to find query by id: " + name)))); // 2. Instantiate the implementation class based on the query type Mono pluginExecutorMono = queryMono.map(queryObj -> diff --git a/app/server/src/main/java/com/appsmith/server/services/ResourceService.java b/app/server/src/main/java/com/appsmith/server/services/ResourceService.java new file mode 100644 index 0000000000..ed8d44619c --- /dev/null +++ b/app/server/src/main/java/com/appsmith/server/services/ResourceService.java @@ -0,0 +1,6 @@ +package com.appsmith.server.services; + +import com.appsmith.server.domains.Resource; + +public interface ResourceService extends CrudService { +} diff --git a/app/server/src/main/java/com/mobtools/server/services/ResourceServiceImpl.java b/app/server/src/main/java/com/appsmith/server/services/ResourceServiceImpl.java similarity index 87% rename from app/server/src/main/java/com/mobtools/server/services/ResourceServiceImpl.java rename to app/server/src/main/java/com/appsmith/server/services/ResourceServiceImpl.java index 1c6ca9c111..cc12391980 100644 --- a/app/server/src/main/java/com/mobtools/server/services/ResourceServiceImpl.java +++ b/app/server/src/main/java/com/appsmith/server/services/ResourceServiceImpl.java @@ -1,11 +1,11 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.Plugin; -import com.mobtools.server.domains.Resource; -import com.mobtools.server.domains.Tenant; -import com.mobtools.server.domains.TenantPlugin; -import com.mobtools.server.exceptions.MobtoolsException; -import com.mobtools.server.repositories.ResourceRepository; +import com.appsmith.server.domains.Plugin; +import com.appsmith.server.domains.Resource; +import com.appsmith.server.domains.Tenant; +import com.appsmith.server.domains.TenantPlugin; +import com.appsmith.server.exceptions.AppsmithException; +import com.appsmith.server.repositories.ResourceRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -39,9 +39,9 @@ public class ResourceServiceImpl extends BaseService create(@NotNull Resource resource) throws MobtoolsException { + public Mono create(@NotNull Resource resource) throws AppsmithException { if (resource.getId() != null) { - throw new MobtoolsException("During create resource, Id is not null. Can't create new resource."); + throw new AppsmithException("During create resource, Id is not null. Can't create new resource."); } Mono tenantMono = tenantService.findById(tenantId); diff --git a/app/server/src/main/java/com/mobtools/server/services/SettingService.java b/app/server/src/main/java/com/appsmith/server/services/SettingService.java similarity index 64% rename from app/server/src/main/java/com/mobtools/server/services/SettingService.java rename to app/server/src/main/java/com/appsmith/server/services/SettingService.java index b7575e9b60..b10030b418 100644 --- a/app/server/src/main/java/com/mobtools/server/services/SettingService.java +++ b/app/server/src/main/java/com/appsmith/server/services/SettingService.java @@ -1,6 +1,6 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.Setting; +import com.appsmith.server.domains.Setting; import reactor.core.publisher.Mono; public interface SettingService extends CrudService { diff --git a/app/server/src/main/java/com/mobtools/server/services/SettingServiceImpl.java b/app/server/src/main/java/com/appsmith/server/services/SettingServiceImpl.java similarity index 87% rename from app/server/src/main/java/com/mobtools/server/services/SettingServiceImpl.java rename to app/server/src/main/java/com/appsmith/server/services/SettingServiceImpl.java index a06e2f27e3..3017ff5281 100644 --- a/app/server/src/main/java/com/mobtools/server/services/SettingServiceImpl.java +++ b/app/server/src/main/java/com/appsmith/server/services/SettingServiceImpl.java @@ -1,7 +1,7 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.Setting; -import com.mobtools.server.repositories.SettingRepository; +import com.appsmith.server.domains.Setting; +import com.appsmith.server.repositories.SettingRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.data.mongodb.core.convert.MongoConverter; diff --git a/app/server/src/main/java/com/mobtools/server/services/TenantService.java b/app/server/src/main/java/com/appsmith/server/services/TenantService.java similarity index 76% rename from app/server/src/main/java/com/mobtools/server/services/TenantService.java rename to app/server/src/main/java/com/appsmith/server/services/TenantService.java index 645bf80152..be44a4da5b 100644 --- a/app/server/src/main/java/com/mobtools/server/services/TenantService.java +++ b/app/server/src/main/java/com/appsmith/server/services/TenantService.java @@ -1,6 +1,6 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.Tenant; +import com.appsmith.server.domains.Tenant; import reactor.core.publisher.Mono; public interface TenantService extends CrudService { diff --git a/app/server/src/main/java/com/mobtools/server/services/TenantServiceImpl.java b/app/server/src/main/java/com/appsmith/server/services/TenantServiceImpl.java similarity index 93% rename from app/server/src/main/java/com/mobtools/server/services/TenantServiceImpl.java rename to app/server/src/main/java/com/appsmith/server/services/TenantServiceImpl.java index 5c2301072c..e27d6b40e3 100644 --- a/app/server/src/main/java/com/mobtools/server/services/TenantServiceImpl.java +++ b/app/server/src/main/java/com/appsmith/server/services/TenantServiceImpl.java @@ -1,9 +1,9 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.Setting; -import com.mobtools.server.domains.Tenant; -import com.mobtools.server.domains.TenantSetting; -import com.mobtools.server.repositories.TenantRepository; +import com.appsmith.server.domains.Setting; +import com.appsmith.server.domains.Tenant; +import com.appsmith.server.domains.TenantSetting; +import com.appsmith.server.repositories.TenantRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; diff --git a/app/server/src/main/java/com/mobtools/server/services/UserService.java b/app/server/src/main/java/com/appsmith/server/services/UserService.java similarity index 74% rename from app/server/src/main/java/com/mobtools/server/services/UserService.java rename to app/server/src/main/java/com/appsmith/server/services/UserService.java index 4db2270f43..7560c79605 100644 --- a/app/server/src/main/java/com/mobtools/server/services/UserService.java +++ b/app/server/src/main/java/com/appsmith/server/services/UserService.java @@ -1,6 +1,6 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.User; +import com.appsmith.server.domains.User; import reactor.core.publisher.Mono; public interface UserService extends CrudService { diff --git a/app/server/src/main/java/com/mobtools/server/services/UserServiceImpl.java b/app/server/src/main/java/com/appsmith/server/services/UserServiceImpl.java similarity index 91% rename from app/server/src/main/java/com/mobtools/server/services/UserServiceImpl.java rename to app/server/src/main/java/com/appsmith/server/services/UserServiceImpl.java index 58e81b81c8..e16eef5a3f 100644 --- a/app/server/src/main/java/com/mobtools/server/services/UserServiceImpl.java +++ b/app/server/src/main/java/com/appsmith/server/services/UserServiceImpl.java @@ -1,7 +1,7 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.User; -import com.mobtools.server.repositories.UserRepository; +import com.appsmith.server.domains.User; +import com.appsmith.server.repositories.UserRepository; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.data.mongodb.core.convert.MongoConverter; import org.springframework.security.core.userdetails.UserDetails; diff --git a/app/server/src/main/java/com/mobtools/server/services/WidgetService.java b/app/server/src/main/java/com/appsmith/server/services/WidgetService.java similarity index 65% rename from app/server/src/main/java/com/mobtools/server/services/WidgetService.java rename to app/server/src/main/java/com/appsmith/server/services/WidgetService.java index ff8a0a28db..a0e7b8f1f7 100644 --- a/app/server/src/main/java/com/mobtools/server/services/WidgetService.java +++ b/app/server/src/main/java/com/appsmith/server/services/WidgetService.java @@ -1,6 +1,6 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.Widget; +import com.appsmith.server.domains.Widget; import reactor.core.publisher.Mono; public interface WidgetService extends CrudService { diff --git a/app/server/src/main/java/com/mobtools/server/services/WidgetServiceImpl.java b/app/server/src/main/java/com/appsmith/server/services/WidgetServiceImpl.java similarity index 88% rename from app/server/src/main/java/com/mobtools/server/services/WidgetServiceImpl.java rename to app/server/src/main/java/com/appsmith/server/services/WidgetServiceImpl.java index 730c1406d1..9c5586f3a3 100644 --- a/app/server/src/main/java/com/mobtools/server/services/WidgetServiceImpl.java +++ b/app/server/src/main/java/com/appsmith/server/services/WidgetServiceImpl.java @@ -1,7 +1,7 @@ -package com.mobtools.server.services; +package com.appsmith.server.services; -import com.mobtools.server.domains.Widget; -import com.mobtools.server.repositories.WidgetRepository; +import com.appsmith.server.domains.Widget; +import com.appsmith.server.repositories.WidgetRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; diff --git a/app/server/src/main/java/com/mobtools/server/exceptions/MobtoolsException.java b/app/server/src/main/java/com/mobtools/server/exceptions/MobtoolsException.java deleted file mode 100644 index fd5dacc3d6..0000000000 --- a/app/server/src/main/java/com/mobtools/server/exceptions/MobtoolsException.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.mobtools.server.exceptions; - -public class MobtoolsException extends Exception { - - public MobtoolsException(String msg) { - super(msg); - } -} diff --git a/app/server/src/main/java/com/mobtools/server/services/LayoutService.java b/app/server/src/main/java/com/mobtools/server/services/LayoutService.java deleted file mode 100644 index 878953c15a..0000000000 --- a/app/server/src/main/java/com/mobtools/server/services/LayoutService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.mobtools.server.services; - -import com.mobtools.server.domains.Layout; - -public interface LayoutService extends CrudService { -} diff --git a/app/server/src/main/java/com/mobtools/server/services/ResourceService.java b/app/server/src/main/java/com/mobtools/server/services/ResourceService.java deleted file mode 100644 index e15dd1a97b..0000000000 --- a/app/server/src/main/java/com/mobtools/server/services/ResourceService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.mobtools.server.services; - -import com.mobtools.server.domains.Resource; - -public interface ResourceService extends CrudService { -} diff --git a/app/server/src/main/resources/application-local.properties b/app/server/src/main/resources/application-local.properties index 7bb61fc71f..9b45a53613 100644 --- a/app/server/src/main/resources/application-local.properties +++ b/app/server/src/main/resources/application-local.properties @@ -6,7 +6,7 @@ spring.data.mongodb.port=27017 #spring.data.mongodb.password= logging.level.root=info -logging.level.com.mobtools=debug +logging.level.com.appsmith=debug logging.pattern.console=%X - %m%n # JDBC Postgres properties diff --git a/app/server/src/main/resources/application-staging.properties b/app/server/src/main/resources/application-staging.properties index 24ed53f6dc..2cd971d66a 100644 --- a/app/server/src/main/resources/application-staging.properties +++ b/app/server/src/main/resources/application-staging.properties @@ -4,7 +4,7 @@ spring.data.mongodb.uri=mongodb+srv://admin:Y9PuxM52gcP3Dgfo@mobtools-test-clust spring.data.mongodb.authentication-database=admin logging.level.root=info -logging.level.com.mobtools=debug +logging.level.com.appsmith=debug logging.pattern.console=%X - %m%n # JDBC Postgres properties diff --git a/app/server/src/test/java/com/mobtools/server/ServerApplicationTests.java b/app/server/src/test/java/com/appsmith/server/ServerApplicationTests.java similarity index 91% rename from app/server/src/test/java/com/mobtools/server/ServerApplicationTests.java rename to app/server/src/test/java/com/appsmith/server/ServerApplicationTests.java index bc025ad53e..f44cff85be 100644 --- a/app/server/src/test/java/com/mobtools/server/ServerApplicationTests.java +++ b/app/server/src/test/java/com/appsmith/server/ServerApplicationTests.java @@ -1,4 +1,4 @@ -package com.mobtools.server; +package com.appsmith.server; import org.junit.Test; import org.junit.runner.RunWith;