Renaming Mobtools to Appsmith everywhere for consistency
This commit is contained in:
parent
2758e26769
commit
06945ff10f
|
|
@ -8,11 +8,11 @@
|
|||
<version>2.1.3.RELEASE</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
<groupId>com.mobtools</groupId>
|
||||
<groupId>com.appsmith</groupId>
|
||||
<artifactId>server</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<name>server</name>
|
||||
<description>This is the API server for the Mobtools project</description>
|
||||
<description>This is the API server for the Appsmith project</description>
|
||||
|
||||
<properties>
|
||||
<java.version>11</java.version>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server;
|
||||
package com.appsmith.server;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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() {
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.constants;
|
||||
package com.appsmith.server.constants;
|
||||
|
||||
public interface Security {
|
||||
String USER_ROLE = "USER_ROLE";
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.constants;
|
||||
package com.appsmith.server.constants;
|
||||
|
||||
public interface Url {
|
||||
String BASE_URL = "/api";
|
||||
|
|
@ -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<S extends CrudService, T extends BaseDomain
|
|||
|
||||
@PostMapping
|
||||
@ResponseStatus(HttpStatus.CREATED)
|
||||
public Mono<ResponseDto<T>> create(@Valid @RequestBody T resource) throws MobtoolsException {
|
||||
public Mono<ResponseDto<T>> 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));
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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.*;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
public enum LoginSource {
|
||||
GOOGLE, FORM
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
public enum PluginType {
|
||||
DB, REST
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
public enum PricingPlan {
|
||||
FREE, STARTUP, BUSINESS, ENTERPRISE
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -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;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
|
||||
import lombok.Getter;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -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;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
public enum UserState {
|
||||
NEW, INVITED, ACTIVATED
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.domains;
|
||||
package com.appsmith.server.domains;
|
||||
|
||||
public enum WidgetType {
|
||||
DB, DISPLAY
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.dtos;
|
||||
package com.appsmith.server.dtos;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.dtos;
|
||||
package com.appsmith.server.dtos;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.dtos;
|
||||
package com.appsmith.server.dtos;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.dtos;
|
||||
package com.appsmith.server.dtos;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.dtos;
|
||||
package com.appsmith.server.dtos;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.dtos;
|
||||
package com.appsmith.server.dtos;
|
||||
|
||||
public enum TenantPluginStatus {
|
||||
FREE, TRIAL, ACTIVATED
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
package com.appsmith.server.exceptions;
|
||||
|
||||
public class AppsmithException extends Exception {
|
||||
|
||||
public AppsmithException(String msg) {
|
||||
super(msg);
|
||||
}
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server.helpers;
|
||||
package com.appsmith.server.helpers;
|
||||
|
||||
import org.slf4j.MDC;
|
||||
import reactor.core.publisher.Signal;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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<R extends BaseRepository, T extends BaseDomain
|
|||
@Override
|
||||
public Mono<T> 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<T> create(T object) throws MobtoolsException {
|
||||
public Mono<T> create(T object) throws AppsmithException {
|
||||
return repository.save(object);
|
||||
}
|
||||
|
||||
|
|
@ -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<T extends BaseDomain, ID> {
|
|||
|
||||
Flux<T> get();
|
||||
|
||||
Mono<T> create(T resource) throws MobtoolsException;
|
||||
Mono<T> create(T resource) throws AppsmithException;
|
||||
|
||||
Mono<T> update(ID id, T resource) throws Exception;
|
||||
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
package com.appsmith.server.services;
|
||||
|
||||
import com.appsmith.server.domains.Layout;
|
||||
|
||||
public interface LayoutService extends CrudService<Layout, String> {
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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<Plugin, String> {
|
||||
|
|
@ -19,7 +19,7 @@ public interface PluginService extends CrudService<Plugin, String> {
|
|||
*/
|
||||
PluginExecutor getPluginExecutor(PluginType pluginType, String className);
|
||||
|
||||
public Mono<Plugin> create(Plugin plugin) throws MobtoolsException;
|
||||
public Mono<Plugin> create(Plugin plugin) throws AppsmithException;
|
||||
|
||||
public Mono<Tenant> installPlugin(PluginTenantDTO plugin);
|
||||
|
||||
|
|
@ -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<PluginRepository, Plugin, Str
|
|||
}
|
||||
|
||||
@Override
|
||||
public Mono<Plugin> create(Plugin plugin) throws MobtoolsException {
|
||||
public Mono<Plugin> 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);
|
||||
|
|
@ -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<Query, String> {
|
||||
|
|
@ -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<QueryRepository, Query, String
|
|||
|
||||
// 1. Fetch the query from the DB to get the type
|
||||
Mono<Query> 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<PluginExecutor> pluginExecutorMono = queryMono.map(queryObj ->
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
package com.appsmith.server.services;
|
||||
|
||||
import com.appsmith.server.domains.Resource;
|
||||
|
||||
public interface ResourceService extends CrudService<Resource, String> {
|
||||
}
|
||||
|
|
@ -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<ResourceRepository, Resourc
|
|||
}
|
||||
|
||||
@Override
|
||||
public Mono<Resource> create(@NotNull Resource resource) throws MobtoolsException {
|
||||
public Mono<Resource> 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<Tenant> tenantMono = tenantService.findById(tenantId);
|
||||
|
|
@ -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<Setting, String> {
|
||||
|
|
@ -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;
|
||||
|
|
@ -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<Tenant, String> {
|
||||
|
|
@ -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;
|
||||
|
|
@ -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<User, String> {
|
||||
|
|
@ -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;
|
||||
|
|
@ -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<Widget, String> {
|
||||
|
|
@ -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;
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
package com.mobtools.server.exceptions;
|
||||
|
||||
public class MobtoolsException extends Exception {
|
||||
|
||||
public MobtoolsException(String msg) {
|
||||
super(msg);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
package com.mobtools.server.services;
|
||||
|
||||
import com.mobtools.server.domains.Layout;
|
||||
|
||||
public interface LayoutService extends CrudService<Layout, String> {
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
package com.mobtools.server.services;
|
||||
|
||||
import com.mobtools.server.domains.Resource;
|
||||
|
||||
public interface ResourceService extends CrudService<Resource, String> {
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mobtools.server;
|
||||
package com.appsmith.server;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
Loading…
Reference in New Issue
Block a user