From e5456eb9d5a81ddf76120b9d82d1870ddebac611 Mon Sep 17 00:00:00 2001 From: Ludo Mikula Date: Sat, 18 May 2024 11:39:41 +0200 Subject: [PATCH 1/2] fix: configure max request body size; organize imports in whole project --- .../AuthenticationServiceImpl.java | 1 - .../domain/configurations/MongoConfig.java | 1 - .../model/OrganizationDomain.java | 14 +++-- .../service/OrgMemberServiceImpl.java | 24 ++++----- .../service/QueryExecutionServiceImpl.java | 1 - .../org/lowcoder/domain/user/model/User.java | 4 +- .../EmailCommunicationServiceImpl.java | 1 - .../lowcoder/infra/birelation/BiRelation.java | 10 +--- .../birelation/BiRelationRepository.java | 5 +- .../birelation/BiRelationServiceImpl.java | 18 +++---- .../ConditionalOnPropertyNotBlank.java | 13 +++-- .../infra/config/AutoReloadConfImpl.java | 6 +-- .../config/AutoReloadConfigInstanceImpl.java | 10 ++-- .../infra/config/ConfigCenterImpl.java | 8 +-- .../infra/config/model/ServerConfig.java | 4 -- .../CustomServerConfigRepository.java | 1 - .../CustomServerConfigRepositoryImpl.java | 1 - .../repository/ServerConfigRepository.java | 4 +- .../lowcoder/infra/event/AbstractEvent.java | 9 ++-- .../infra/event/QueryExecutionEvent.java | 4 +- .../infra/event/SystemCommonEvent.java | 2 - .../event/datasource/DatasourceEvent.java | 3 +- .../datasource/DatasourcePermissionEvent.java | 7 ++- .../infra/event/group/BaseGroupEvent.java | 3 +- .../groupmember/BaseGroupMemberEvent.java | 3 +- .../infra/event/user/UserLoginEvent.java | 3 +- .../infra/event/user/UserLogoutEvent.java | 3 +- .../lowcoder/infra/js/NodeServerHelper.java | 4 +- .../infra/localcache/CaffeineCacheUtils.java | 5 +- .../infra/mongo/MongoUpsertHelper.java | 22 ++++---- .../org/lowcoder/infra/perf/PerfHelper.java | 15 +++--- .../lowcoder/infra/serverlog/ServerLog.java | 10 ++-- .../infra/serverlog/ServerLogServiceImpl.java | 22 ++++---- .../org/lowcoder/infra/util/FluxHelper.java | 1 - .../org/lowcoder/infra/util/LogUtils.java | 13 +++-- .../org/lowcoder/infra/util/MonoUtils.java | 4 +- .../org/lowcoder/infra/util/NetworkUtils.java | 9 ++-- .../org/lowcoder/infra/util/RSAUtils.java | 7 ++- .../lowcoder/infra/util/RateLimitHelper.java | 7 ++- .../org/lowcoder/infra/util/TupleUtils.java | 6 +-- .../clickhouse/ClickHouseQueryExecutor.java | 53 ++++++------------- .../plugin/es/model/EsDatasourceConfig.java | 20 ++++--- .../model/GoogleSheetsDatasourceConfig.java | 25 ++++----- .../mongo/model/MongoDatasourceConfig.java | 36 ++++++------- .../redis/model/RedisDatasourceConfig.java | 25 ++++----- .../plugin/restapi/RestApiEngineTest.java | 34 +++++------- .../plugins/SmtpDatasourceConfig.java | 2 +- .../sdk/auth/Oauth2KeycloakAuthConfig.java | 9 +--- .../sdk/auth/Oauth2SimpleAuthConfig.java | 2 +- .../lowcoder/sdk/config/AuthProperties.java | 16 +++--- .../org/lowcoder/sdk/config/CommonConfig.java | 19 +++---- .../org/lowcoder/sdk/config/JsonViews.java | 9 ++++ .../sdk/config/MaterialProperties.java | 5 +- .../lowcoder/sdk/config/SerializeConfig.java | 39 -------------- .../config/dynamic/ConfigCenterForTest.java | 4 +- .../sdk/destructor/DestructorUtil.java | 7 ++- .../org/lowcoder/sdk/exception/BizError.java | 4 +- .../lowcoder/sdk/exception/BizException.java | 5 +- .../sdk/exception/PluginException.java | 8 ++- .../sdk/exception/ServerException.java | 3 +- .../org/lowcoder/sdk/models/Endpoint.java | 7 +-- .../lowcoder/sdk/models/HasIdAndAuditing.java | 22 +++----- .../models/JsDatasourceConnectionConfig.java | 26 ++++----- .../java/org/lowcoder/sdk/models/Param.java | 4 +- .../org/lowcoder/sdk/models/Property.java | 8 ++- .../sdk/models/QueryExecutionResult.java | 14 +++-- .../sdk/models/RestBodyFormFileData.java | 6 +-- .../models/TokenBasedConnectionDetail.java | 4 +- .../plugin/common/QueryExecutionUtils.java | 9 ++-- .../sdk/plugin/common/QueryExecutor.java | 13 ++--- .../sdk/plugin/common/RestApiUriBuilder.java | 12 ++--- .../plugin/common/sql/ResultSetParser.java | 4 +- .../SqlBasedDatasourceConnectionConfig.java | 26 +++++---- .../sql/SqlBasedQueryExecutionContext.java | 11 ++-- .../plugin/common/sql/StructureParser.java | 10 ++-- .../sdk/plugin/common/ssl/SslHelper.java | 8 +-- .../common/ssl/VerifyCACertSslConfig.java | 1 - .../ssl/VerifySelfSignedCertSslConfig.java | 13 ++--- .../sdk/plugin/http/RawHttpHandlerHelper.java | 14 ++--- .../sdk/plugin/http/RawHttpRequest.java | 15 +++--- .../plugin/mysql/MysqlDatasourceConfig.java | 14 ++--- .../sdk/plugin/restapi/MultipartFormData.java | 3 +- .../plugin/restapi/auth/BasicAuthConfig.java | 2 +- .../plugin/restapi/auth/NoneAuthConfig.java | 1 - .../changeset/SheetBulkObjectChangeSet.java | 11 ++-- .../sheet/changeset/SheetChangeSet.java | 14 ++--- .../changeset/SheetKeyValuePairChangeSet.java | 19 ++++--- .../sheet/changeset/SheetObjectChangeSet.java | 11 ++-- .../sdk/plugin/sqlcommand/GuiSqlCommand.java | 14 ++--- .../changeset/BulkObjectChangeSet.java | 13 +++-- .../sqlcommand/changeset/ChangeSet.java | 14 ++--- .../sqlcommand/changeset/ObjectChangeSet.java | 9 ++-- .../sqlcommand/command/BulkInsertCommand.java | 17 +++--- .../sqlcommand/command/BulkUpdateCommand.java | 21 ++++---- .../sqlcommand/command/DeleteCommand.java | 8 +-- .../sqlcommand/command/UpdateCommand.java | 21 ++++---- ...dateOrDeleteSingleCommandRenderResult.java | 4 +- .../sqlcommand/command/UpsertCommand.java | 7 ++- .../command/mysql/MysqlBulkInsertCommand.java | 10 ++-- .../command/mysql/MysqlBulkUpdateCommand.java | 10 ++-- .../command/mysql/MysqlDeleteCommand.java | 10 ++-- .../command/mysql/MysqlInsertCommand.java | 9 ++-- .../command/mysql/MysqlUpdateCommand.java | 9 ++-- .../command/mysql/MysqlUpsertCommand.java | 21 ++++---- .../postgres/PostgresBulkInsertCommand.java | 12 ++--- .../postgres/PostgresBulkUpdateCommand.java | 14 ++--- .../postgres/PostgresDeleteCommand.java | 14 ++--- .../postgres/PostgresInsertCommand.java | 11 ++-- .../postgres/PostgresUpdateCommand.java | 19 ++++--- .../plugin/sqlcommand/filter/FilterSet.java | 24 ++++----- .../sdk/query/QueryVisitorContext.java | 9 ++-- .../org/lowcoder/sdk/test/JsonFileReader.java | 11 ++-- .../org/lowcoder/sdk/util/CookieHelper.java | 1 - .../org/lowcoder/sdk/util/DateTimeUtils.java | 4 +- .../org/lowcoder/sdk/util/ExceptionUtils.java | 11 ++-- .../org/lowcoder/sdk/util/LocaleUtils.java | 11 ++-- .../org/lowcoder/sdk/util/MustacheHelper.java | 48 +++++++---------- .../org/lowcoder/sdk/util/StreamUtils.java | 4 +- .../sdk/webclient/SafeHostResolverGroup.java | 14 ++--- .../sdk/webclient/WebClientBuildHelper.java | 11 +++- .../sdk/helpers/MustacheHelperTest.java | 20 +++---- .../command/mysql/MysqlGuiCommandTest.java | 20 ++----- .../command/postgres/PostgresCommandTest.java | 18 +++---- .../api/OpenAPIDocsConfiguration.java | 16 +++--- .../org/lowcoder/api/ServerApplication.java | 6 +-- .../AuthenticationEndpoints.java | 24 +++------ .../service/AuthenticationApiServiceImpl.java | 3 -- .../lowcoder/api/config/ConfigController.java | 5 +- .../lowcoder/api/config/ConfigEndpoints.java | 16 ++---- .../api/datasource/DatasourceEndpoints.java | 26 +++------ .../ApplicationConfiguration.java | 3 +- ...t.java => CustomWebFluxConfiguration.java} | 23 ++++++-- .../plugin/PathBasedPluginLoader.java | 19 ++++--- .../api/framework/warmup/WarmupHelper.java | 1 - .../api/home/SessionUserServiceImpl.java | 21 ++++---- .../api/material/MaterialApiServiceImpl.java | 15 +++--- .../api/query/LibraryQueryApiServiceImpl.java | 26 ++++----- .../api/usermanagement/OrgApiServiceImpl.java | 29 +++++----- .../api/usermanagement/UserController.java | 14 ++--- .../migrations/job/AddSuperAdminUserImpl.java | 1 - .../job/MigrateAuthConfigJobImpl.java | 4 +- .../configuration/CommonConfigTest.java | 4 +- 142 files changed, 671 insertions(+), 973 deletions(-) create mode 100644 server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/JsonViews.java delete mode 100644 server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/SerializeConfig.java rename server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/{CustomWebFluxConfigurationSupport.java => CustomWebFluxConfiguration.java} (53%) diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java index 79be4a4d5..65fdeb8b2 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java @@ -10,7 +10,6 @@ import org.lowcoder.sdk.config.CommonConfig; import org.lowcoder.sdk.constants.AuthSourceConstants; import org.lowcoder.sdk.constants.WorkspaceMode; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/MongoConfig.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/MongoConfig.java index 263e3a9bb..b3adbcbfb 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/MongoConfig.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/MongoConfig.java @@ -12,7 +12,6 @@ import org.lowcoder.domain.user.model.User; import org.lowcoder.sdk.config.MaterialProperties; import org.lowcoder.sdk.models.HasIdAndAuditing; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrganizationDomain.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrganizationDomain.java index 1a49f1355..65663808f 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrganizationDomain.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrganizationDomain.java @@ -1,18 +1,16 @@ package org.lowcoder.domain.organization.model; -import java.util.ArrayList; -import java.util.List; - +import com.fasterxml.jackson.core.type.TypeReference; +import lombok.Getter; +import lombok.Setter; import org.lowcoder.domain.mongodb.MongodbInterceptorContext; import org.lowcoder.sdk.auth.AbstractAuthConfig; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.config.JsonViews; import org.lowcoder.sdk.util.JsonUtils; import org.springframework.data.annotation.Transient; -import com.fasterxml.jackson.core.type.TypeReference; - -import lombok.Getter; -import lombok.Setter; +import java.util.ArrayList; +import java.util.List; public class OrganizationDomain implements EnterpriseConnectionConfig { diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java index 819635d8c..523e2f3bd 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java @@ -1,23 +1,13 @@ package org.lowcoder.domain.organization.service; -import static org.lowcoder.infra.birelation.BiRelationBizType.ORG_MEMBER; - -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Map; - import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.bson.Document; import org.lowcoder.domain.group.model.GroupMember; import org.lowcoder.domain.group.service.GroupMemberService; import org.lowcoder.domain.group.service.GroupService; -import org.lowcoder.domain.organization.model.MemberRole; -import org.lowcoder.domain.organization.model.OrgMember; -import org.lowcoder.domain.organization.model.OrgMemberState; -import org.lowcoder.domain.organization.model.Organization; -import org.lowcoder.domain.organization.model.OrganizationState; +import org.lowcoder.domain.organization.model.*; import org.lowcoder.infra.annotation.PossibleEmptyMono; import org.lowcoder.infra.birelation.BiRelation; import org.lowcoder.infra.birelation.BiRelationService; @@ -26,15 +16,19 @@ import org.lowcoder.sdk.config.CommonConfig; import org.lowcoder.sdk.config.CommonConfig.Workspace; import org.lowcoder.sdk.constants.WorkspaceMode; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; - -import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +import static org.lowcoder.infra.birelation.BiRelationBizType.ORG_MEMBER; + @Slf4j @Service @RequiredArgsConstructor diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionServiceImpl.java index 6807ebc32..db303a0cf 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionServiceImpl.java @@ -16,7 +16,6 @@ import org.lowcoder.sdk.models.QueryExecutionResult; import org.lowcoder.sdk.query.QueryExecutionContext; import org.lowcoder.sdk.query.QueryVisitorContext; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import reactor.core.publisher.Mono; diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java index 9b516065a..04762de62 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java @@ -13,7 +13,7 @@ import org.lowcoder.domain.mongodb.AfterMongodbRead; import org.lowcoder.domain.mongodb.BeforeMongodbWrite; import org.lowcoder.domain.mongodb.MongodbInterceptorContext; -import org.lowcoder.sdk.config.SerializeConfig; +import org.lowcoder.sdk.config.JsonViews; import org.lowcoder.sdk.constants.UiConstants; import org.lowcoder.sdk.models.HasIdAndAuditing; import org.lowcoder.sdk.util.JsonUtils; @@ -143,7 +143,7 @@ public void markAsDeleted() { public void beforeMongodbWrite(MongodbInterceptorContext context) { if (CollectionUtils.isNotEmpty(this.apiKeysList)) { this.apiKeysList.forEach(apiKey -> apiKey.doEncrypt(s -> context.encryptionService().encryptString(s))); - apiKeys = JsonUtils.fromJsonSafely(JsonUtils.toJsonSafely(apiKeysList, SerializeConfig.JsonViews.Internal.class), new TypeReference<>() { + apiKeys = JsonUtils.fromJsonSafely(JsonUtils.toJsonSafely(apiKeysList, JsonViews.Internal.class), new TypeReference<>() { }, new ArrayList<>()); } } diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationServiceImpl.java index 5dd80dade..bad37e5ac 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationServiceImpl.java @@ -4,7 +4,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.lowcoder.sdk.config.CommonConfig; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelation.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelation.java index 5edea78bf..472681c7e 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelation.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelation.java @@ -1,20 +1,14 @@ package org.lowcoder.infra.birelation; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.google.common.base.MoreObjects; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.google.common.base.MoreObjects; - -import lombok.Builder; - @SuperBuilder @Jacksonized @Document diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationRepository.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationRepository.java index 65eb27074..4a579552e 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationRepository.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationRepository.java @@ -1,13 +1,12 @@ package org.lowcoder.infra.birelation; -import java.util.Collection; - import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.util.Collection; + public interface BiRelationRepository extends ReactiveMongoRepository { Flux findByBizTypeAndSourceId(BiRelationBizType bizType, String sourceId); diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationServiceImpl.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationServiceImpl.java index dfffa8877..0edbfa25d 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationServiceImpl.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationServiceImpl.java @@ -1,24 +1,22 @@ package org.lowcoder.infra.birelation; -import static com.google.common.base.Strings.nullToEmpty; -import static org.apache.commons.lang3.StringUtils.isNotBlank; -import static org.springframework.data.mongodb.core.query.Criteria.where; - -import java.util.Collection; -import java.util.List; - +import com.google.common.base.Preconditions; import lombok.RequiredArgsConstructor; import org.lowcoder.infra.mongo.MongoUpsertHelper; import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; - -import com.google.common.base.Preconditions; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.util.Collection; +import java.util.List; + +import static com.google.common.base.Strings.nullToEmpty; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.springframework.data.mongodb.core.query.Criteria.where; + @Service @RequiredArgsConstructor public class BiRelationServiceImpl implements BiRelationService { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/conditional/ConditionalOnPropertyNotBlank.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/conditional/ConditionalOnPropertyNotBlank.java index 0e698a68b..3e29c4d41 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/conditional/ConditionalOnPropertyNotBlank.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/conditional/ConditionalOnPropertyNotBlank.java @@ -1,14 +1,7 @@ package org.lowcoder.infra.conditional; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.Map; - import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotBlank; - import org.apache.commons.lang3.StringUtils; import org.lowcoder.infra.conditional.ConditionalOnPropertyNotBlank.OnPropertyNotBlankCondition; import org.springframework.context.annotation.Condition; @@ -16,6 +9,12 @@ import org.springframework.context.annotation.Conditional; import org.springframework.core.type.AnnotatedTypeMetadata; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.Map; + @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Conditional(OnPropertyNotBlankCondition.class) diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfImpl.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfImpl.java index 9c48ada4c..40d6dda37 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfImpl.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfImpl.java @@ -1,11 +1,11 @@ package org.lowcoder.infra.config; -import static org.apache.commons.lang3.ObjectUtils.firstNonNull; +import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.config.dynamic.Conf; import java.util.function.Function; -import org.apache.commons.lang3.StringUtils; -import org.lowcoder.sdk.config.dynamic.Conf; +import static org.apache.commons.lang3.ObjectUtils.firstNonNull; class AutoReloadConfImpl implements Conf { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImpl.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImpl.java index 73e8f1ec4..2c2832fc6 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImpl.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImpl.java @@ -1,16 +1,16 @@ package org.lowcoder.infra.config; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; - import org.lowcoder.sdk.config.dynamic.Conf; import org.lowcoder.sdk.config.dynamic.ConfigInstance; import org.lowcoder.sdk.util.JsonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; + @Component @SuppressWarnings("unchecked") public class AutoReloadConfigInstanceImpl implements ConfigInstance { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/ConfigCenterImpl.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/ConfigCenterImpl.java index f79d65ad7..fbd87c085 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/ConfigCenterImpl.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/ConfigCenterImpl.java @@ -1,15 +1,15 @@ package org.lowcoder.infra.config; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - import org.lowcoder.sdk.config.dynamic.Conf; import org.lowcoder.sdk.config.dynamic.ConfigCenter; import org.lowcoder.sdk.config.dynamic.ConfigInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + @Component public class ConfigCenterImpl implements ConfigCenter { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/model/ServerConfig.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/model/ServerConfig.java index 256ebbdad..c813ad30a 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/model/ServerConfig.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/model/ServerConfig.java @@ -7,10 +7,6 @@ import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; -import com.fasterxml.jackson.annotation.JsonCreator; - -import lombok.Builder; - @SuperBuilder @Jacksonized @Document diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepository.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepository.java index 75c4ea5cc..008c1aad6 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepository.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepository.java @@ -1,7 +1,6 @@ package org.lowcoder.infra.config.repository; import org.lowcoder.infra.config.model.ServerConfig; - import reactor.core.publisher.Mono; interface CustomServerConfigRepository { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepositoryImpl.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepositoryImpl.java index 930963292..c15323aff 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepositoryImpl.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepositoryImpl.java @@ -4,7 +4,6 @@ import org.lowcoder.infra.mongo.MongoUpsertHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; - import reactor.core.publisher.Mono; @Repository diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/ServerConfigRepository.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/ServerConfigRepository.java index e1bafda2c..101ce875c 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/ServerConfigRepository.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/ServerConfigRepository.java @@ -1,10 +1,8 @@ package org.lowcoder.infra.config.repository; +import com.google.common.annotations.VisibleForTesting; import org.lowcoder.infra.config.model.ServerConfig; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; - -import com.google.common.annotations.VisibleForTesting; - import reactor.core.publisher.Mono; @VisibleForTesting diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java index c11381cd2..44b1ded98 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java @@ -1,14 +1,13 @@ package org.lowcoder.infra.event; +import lombok.Getter; +import lombok.experimental.SuperBuilder; +import org.lowcoder.plugin.api.event.LowcoderEvent; + import java.lang.reflect.Field; import java.util.HashMap; import java.util.Map; -import org.lowcoder.plugin.api.event.LowcoderEvent; - -import lombok.Getter; -import lombok.experimental.SuperBuilder; - @Getter @SuperBuilder public abstract class AbstractEvent implements LowcoderEvent diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/QueryExecutionEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/QueryExecutionEvent.java index bc1b7f4a8..05f97ae2f 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/QueryExecutionEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/QueryExecutionEvent.java @@ -1,10 +1,10 @@ package org.lowcoder.infra.event; -import java.util.Map; - import lombok.Getter; import lombok.experimental.SuperBuilder; +import java.util.Map; + @Getter @SuperBuilder public class QueryExecutionEvent extends AbstractEvent { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/SystemCommonEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/SystemCommonEvent.java index 5ddacf5c1..302b72772 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/SystemCommonEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/SystemCommonEvent.java @@ -1,7 +1,5 @@ package org.lowcoder.infra.event; -import org.checkerframework.checker.units.qual.C; - import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourceEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourceEvent.java index 4c5471d68..2332806ef 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourceEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourceEvent.java @@ -1,9 +1,8 @@ package org.lowcoder.infra.event.datasource; -import org.lowcoder.infra.event.AbstractEvent; - import lombok.Getter; import lombok.experimental.SuperBuilder; +import org.lowcoder.infra.event.AbstractEvent; @Getter @SuperBuilder diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourcePermissionEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourcePermissionEvent.java index 99d2703cb..d7dfd563b 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourcePermissionEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourcePermissionEvent.java @@ -1,11 +1,10 @@ package org.lowcoder.infra.event.datasource; -import java.util.Collection; - -import org.lowcoder.infra.event.AbstractEvent; - import lombok.Getter; import lombok.experimental.SuperBuilder; +import org.lowcoder.infra.event.AbstractEvent; + +import java.util.Collection; @Getter @SuperBuilder diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/BaseGroupEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/BaseGroupEvent.java index 069e97838..7ffd5e087 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/BaseGroupEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/BaseGroupEvent.java @@ -1,9 +1,8 @@ package org.lowcoder.infra.event.group; -import org.lowcoder.infra.event.AbstractEvent; - import lombok.Getter; import lombok.experimental.SuperBuilder; +import org.lowcoder.infra.event.AbstractEvent; @Getter @SuperBuilder diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/BaseGroupMemberEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/BaseGroupMemberEvent.java index 65b46dda9..26c5f1c52 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/BaseGroupMemberEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/BaseGroupMemberEvent.java @@ -1,9 +1,8 @@ package org.lowcoder.infra.event.groupmember; -import org.lowcoder.infra.event.AbstractEvent; - import lombok.Getter; import lombok.experimental.SuperBuilder; +import org.lowcoder.infra.event.AbstractEvent; @Getter @SuperBuilder diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLoginEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLoginEvent.java index aa840de74..0ec3088c2 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLoginEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLoginEvent.java @@ -1,9 +1,8 @@ package org.lowcoder.infra.event.user; -import org.lowcoder.infra.event.AbstractEvent; - import lombok.Getter; import lombok.experimental.SuperBuilder; +import org.lowcoder.infra.event.AbstractEvent; @Getter @SuperBuilder diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLogoutEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLogoutEvent.java index cf2fdd714..ad69fa913 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLogoutEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLogoutEvent.java @@ -1,8 +1,7 @@ package org.lowcoder.infra.event.user; -import org.lowcoder.infra.event.AbstractEvent; - import lombok.experimental.SuperBuilder; +import org.lowcoder.infra.event.AbstractEvent; @SuperBuilder public class UserLogoutEvent extends AbstractEvent { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/js/NodeServerHelper.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/js/NodeServerHelper.java index be4eb8c74..7bdee644c 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/js/NodeServerHelper.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/js/NodeServerHelper.java @@ -1,12 +1,12 @@ package org.lowcoder.infra.js; -import java.net.URI; - import org.lowcoder.sdk.config.CommonConfigHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.util.UriComponentsBuilder; +import java.net.URI; + @Component public class NodeServerHelper { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/localcache/CaffeineCacheUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/localcache/CaffeineCacheUtils.java index d3b4e9a10..12101a89a 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/localcache/CaffeineCacheUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/localcache/CaffeineCacheUtils.java @@ -1,11 +1,10 @@ package org.lowcoder.infra.localcache; -import java.util.function.Supplier; - import com.github.benmanes.caffeine.cache.Cache; - import reactor.core.publisher.Mono; +import java.util.function.Supplier; + public class CaffeineCacheUtils { /** diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/mongo/MongoUpsertHelper.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/mongo/MongoUpsertHelper.java index e10755b59..b3d4cf553 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/mongo/MongoUpsertHelper.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/mongo/MongoUpsertHelper.java @@ -1,12 +1,12 @@ package org.lowcoder.infra.mongo; -import java.time.Instant; -import java.util.Collection; -import java.util.Map; - +import com.mongodb.BasicDBObject; +import com.mongodb.DBObject; +import com.mongodb.client.model.DeleteOneModel; +import com.mongodb.client.model.UpdateOneModel; +import com.mongodb.client.model.UpdateOptions; import org.apache.commons.collections4.CollectionUtils; import org.bson.Document; -import org.bson.conversions.Bson; import org.bson.types.ObjectId; import org.lowcoder.sdk.constants.FieldName; import org.lowcoder.sdk.constants.GlobalContext; @@ -20,16 +20,12 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Component; - -import com.mongodb.BasicDBObject; -import com.mongodb.DBObject; -import com.mongodb.bulk.BulkWriteResult; -import com.mongodb.client.model.DeleteOneModel; -import com.mongodb.client.model.UpdateOneModel; -import com.mongodb.client.model.UpdateOptions; - import reactor.core.publisher.Mono; +import java.time.Instant; +import java.util.Collection; +import java.util.Map; + @Component public class MongoUpsertHelper { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/perf/PerfHelper.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/perf/PerfHelper.java index 6871587f9..f01b4df76 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/perf/PerfHelper.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/perf/PerfHelper.java @@ -1,18 +1,17 @@ package org.lowcoder.infra.perf; -import java.time.Duration; -import java.util.concurrent.Callable; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.ToDoubleFunction; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tag; import io.micrometer.core.instrument.Timer; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.time.Duration; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.ToDoubleFunction; @Slf4j @Component diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLog.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLog.java index 1b40ca266..b9fbe97a0 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLog.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLog.java @@ -1,15 +1,11 @@ package org.lowcoder.infra.serverlog; -import java.util.Map; - -import lombok.NoArgsConstructor; +import lombok.Builder; +import lombok.Getter; import lombok.extern.jackson.Jacksonized; import org.springframework.data.mongodb.core.mapping.Document; -import com.fasterxml.jackson.annotation.JsonCreator; - -import lombok.Builder; -import lombok.Getter; +import java.util.Map; @Document diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLogServiceImpl.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLogServiceImpl.java index 7c13cbb1f..aa80b9c59 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLogServiceImpl.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLogServiceImpl.java @@ -1,26 +1,24 @@ package org.lowcoder.infra.serverlog; -import static org.lowcoder.infra.perf.PerfEvent.SERVER_LOG_BATCH_INSERT; - -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.time.temporal.TemporalAdjusters; -import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.TimeUnit; - +import io.micrometer.core.instrument.Tags; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.lowcoder.infra.event.SystemCommonEvent; import org.lowcoder.infra.perf.PerfHelper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; - -import io.micrometer.core.instrument.Tags; import reactor.core.publisher.Mono; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.temporal.TemporalAdjusters; +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.TimeUnit; + +import static org.lowcoder.infra.perf.PerfEvent.SERVER_LOG_BATCH_INSERT; + @RequiredArgsConstructor @Service public class ServerLogServiceImpl implements ServerLogService { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/FluxHelper.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/FluxHelper.java index 2c3fb1f00..ad393418b 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/FluxHelper.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/FluxHelper.java @@ -1,7 +1,6 @@ package org.lowcoder.infra.util; import org.springframework.data.domain.Pageable; - import reactor.core.publisher.Flux; public class FluxHelper { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/LogUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/LogUtils.java index 0be6ebb56..013f992cf 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/LogUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/LogUtils.java @@ -1,18 +1,17 @@ package org.lowcoder.infra.util; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.function.Consumer; -import java.util.function.Function; - import org.slf4j.MDC; - import reactor.core.publisher.Signal; import reactor.core.publisher.SignalType; import reactor.util.context.Context; import reactor.util.context.ContextView; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.Function; + public class LogUtils { public static final String CONTEXT_MAP = "context-map"; diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/MonoUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/MonoUtils.java index 21b831b1b..538c05b38 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/MonoUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/MonoUtils.java @@ -1,9 +1,9 @@ package org.lowcoder.infra.util; -import java.util.List; - import reactor.core.publisher.Mono; +import java.util.List; + public class MonoUtils { public static Mono> emptyMonoIfEmptyList(Mono> mono) { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/NetworkUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/NetworkUtils.java index 966e42149..1721cb755 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/NetworkUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/NetworkUtils.java @@ -1,16 +1,15 @@ package org.lowcoder.infra.util; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.util.Optional; - +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.lowcoder.sdk.util.JsonUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.server.ServerWebExchange; -import lombok.extern.slf4j.Slf4j; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.util.Optional; @Slf4j public class NetworkUtils { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RSAUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RSAUtils.java index 979e01a9e..4a012e5f4 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RSAUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RSAUtils.java @@ -1,5 +1,8 @@ package org.lowcoder.infra.util; +import lombok.extern.slf4j.Slf4j; + +import javax.crypto.Cipher; import java.security.Key; import java.security.KeyFactory; import java.security.PrivateKey; @@ -7,10 +10,6 @@ import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; -import javax.crypto.Cipher; - -import lombok.extern.slf4j.Slf4j; - @Slf4j public class RSAUtils { diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RateLimitHelper.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RateLimitHelper.java index 15f9531bc..ba6f76fab 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RateLimitHelper.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RateLimitHelper.java @@ -1,12 +1,11 @@ package org.lowcoder.infra.util; -import java.time.Duration; -import java.util.Set; - import com.google.common.collect.Sets; - import es.moki.ratelimitj.core.limiter.request.RequestLimitRule; +import java.time.Duration; +import java.util.Set; + public class RateLimitHelper { // 1 request per 10 minutes, per phone diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/TupleUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/TupleUtils.java index 11457f1cf..5e250c20f 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/TupleUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/TupleUtils.java @@ -1,10 +1,6 @@ package org.lowcoder.infra.util; -import reactor.util.function.Tuple2; -import reactor.util.function.Tuple3; -import reactor.util.function.Tuple4; -import reactor.util.function.Tuple5; -import reactor.util.function.Tuples; +import reactor.util.function.*; public class TupleUtils { diff --git a/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHouseQueryExecutor.java b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHouseQueryExecutor.java index 86164c014..6ff6cfe0a 100644 --- a/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHouseQueryExecutor.java +++ b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHouseQueryExecutor.java @@ -1,37 +1,7 @@ package org.lowcoder.plugin.clickhouse; -import static com.google.common.collect.Maps.newLinkedHashMap; -import static org.lowcoder.sdk.exception.PluginCommonError.CONNECTION_ERROR; -import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; -import static org.lowcoder.sdk.exception.PluginCommonError.PREPARED_STATEMENT_BIND_PARAMETERS_ERROR; -import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getIdenticalColumns; -import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; -import static org.lowcoder.sdk.plugin.common.sql.ResultSetParser.parseColumns; -import static org.lowcoder.sdk.plugin.common.sql.ResultSetParser.parseRows; -import static org.lowcoder.sdk.util.JsonUtils.toJson; -import static org.lowcoder.sdk.util.MustacheHelper.doPrepareStatement; -import static org.lowcoder.sdk.util.MustacheHelper.extractMustacheKeysInOrder; -import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; - -import java.math.BigDecimal; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Types; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; - +import com.zaxxer.hikari.HikariDataSource; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.lowcoder.plugin.clickhouse.model.ClickHouseDatasourceConfig; @@ -41,19 +11,30 @@ import org.lowcoder.sdk.exception.InvalidHikariDatasourceException; import org.lowcoder.sdk.exception.PluginException; import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.DatasourceStructure.Table; import org.lowcoder.sdk.models.LocaleMessage; import org.lowcoder.sdk.models.QueryExecutionResult; -import org.lowcoder.sdk.models.DatasourceStructure.Table; import org.lowcoder.sdk.plugin.common.QueryExecutor; import org.lowcoder.sdk.plugin.common.SqlQueryUtils; import org.lowcoder.sdk.plugin.common.sql.SqlBasedQueryExecutionContext; import org.lowcoder.sdk.query.QueryVisitorContext; import org.pf4j.Extension; +import reactor.core.publisher.Mono; -import com.zaxxer.hikari.HikariDataSource; +import java.math.BigDecimal; +import java.sql.*; +import java.time.Duration; +import java.util.*; +import java.util.function.Supplier; -import lombok.extern.slf4j.Slf4j; -import reactor.core.publisher.Mono; +import static com.google.common.collect.Maps.newLinkedHashMap; +import static org.lowcoder.sdk.exception.PluginCommonError.*; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getIdenticalColumns; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; +import static org.lowcoder.sdk.plugin.common.sql.ResultSetParser.parseColumns; +import static org.lowcoder.sdk.plugin.common.sql.ResultSetParser.parseRows; +import static org.lowcoder.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.MustacheHelper.*; @Slf4j @Extension diff --git a/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsDatasourceConfig.java b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsDatasourceConfig.java index 628467365..14553ca6b 100644 --- a/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsDatasourceConfig.java @@ -1,21 +1,19 @@ package org.lowcoder.plugin.es.model; -import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static org.lowcoder.sdk.util.ExceptionUtils.ofException; - -import java.util.function.Function; - -import lombok.extern.jackson.Jacksonized; -import org.apache.commons.lang3.ObjectUtils; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; -import org.lowcoder.sdk.models.DatasourceConnectionConfig; - import com.fasterxml.jackson.annotation.JsonView; - import lombok.Builder; import lombok.Getter; import lombok.Setter; +import lombok.extern.jackson.Jacksonized; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; +import org.lowcoder.sdk.config.JsonViews; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; + +import java.util.function.Function; + +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; @Slf4j @Setter diff --git a/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsDatasourceConfig.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsDatasourceConfig.java index d8277ceea..787b43199 100644 --- a/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsDatasourceConfig.java @@ -1,24 +1,21 @@ package org.lowcoder.plugin.googlesheets.model; -import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; -import static org.lowcoder.sdk.util.JsonUtils.fromJson; -import static org.lowcoder.sdk.util.JsonUtils.toJson; - -import java.util.Map; -import java.util.function.Function; - -import lombok.extern.jackson.Jacksonized; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; -import org.lowcoder.sdk.exception.PluginCommonError; -import org.lowcoder.sdk.models.DatasourceConnectionConfig; - -import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonView; import com.google.common.base.MoreObjects; - import lombok.Builder; import lombok.Getter; +import lombok.extern.jackson.Jacksonized; import lombok.extern.slf4j.Slf4j; +import org.lowcoder.sdk.config.JsonViews; +import org.lowcoder.sdk.exception.PluginCommonError; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; + +import java.util.Map; +import java.util.function.Function; + +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; @Slf4j @Getter diff --git a/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoDatasourceConfig.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoDatasourceConfig.java index fab9fb8d2..0935f17d2 100644 --- a/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoDatasourceConfig.java @@ -1,32 +1,30 @@ package org.lowcoder.plugin.mongo.model; -import static org.apache.commons.lang3.ObjectUtils.firstNonNull; -import static org.lowcoder.plugin.mongo.model.MongoConnectionUriParser.parseDatabaseFrom; -import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static org.lowcoder.sdk.util.ExceptionUtils.ofException; -import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; -import static org.lowcoder.sdk.util.JsonUtils.fromJson; -import static org.lowcoder.sdk.util.JsonUtils.toJson; - -import java.util.List; -import java.util.Map; -import java.util.function.Function; - +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonView; +import com.google.common.annotations.VisibleForTesting; +import lombok.Builder; +import lombok.Getter; import lombok.extern.jackson.Jacksonized; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.config.JsonViews; import org.lowcoder.sdk.exception.PluginCommonError; import org.lowcoder.sdk.models.DatasourceConnectionConfig; import org.lowcoder.sdk.models.Endpoint; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonView; -import com.google.common.annotations.VisibleForTesting; +import java.util.List; +import java.util.Map; +import java.util.function.Function; -import lombok.Builder; -import lombok.Getter; +import static org.apache.commons.lang3.ObjectUtils.firstNonNull; +import static org.lowcoder.plugin.mongo.model.MongoConnectionUriParser.parseDatabaseFrom; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; @Getter @Builder diff --git a/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/model/RedisDatasourceConfig.java b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/model/RedisDatasourceConfig.java index 4b30350ab..a51ad8d58 100644 --- a/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/model/RedisDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/model/RedisDatasourceConfig.java @@ -1,5 +1,16 @@ package org.lowcoder.plugin.redis.model; +import com.fasterxml.jackson.annotation.JsonView; +import lombok.Builder; +import lombok.Getter; +import lombok.extern.jackson.Jacksonized; +import lombok.extern.slf4j.Slf4j; +import org.lowcoder.sdk.config.JsonViews; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; + +import java.util.Map; +import java.util.function.Function; + import static org.apache.commons.lang3.ObjectUtils.firstNonNull; import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; @@ -8,20 +19,6 @@ import static org.lowcoder.sdk.util.JsonUtils.fromJson; import static org.lowcoder.sdk.util.JsonUtils.toJson; -import java.util.Map; -import java.util.function.Function; - -import lombok.extern.jackson.Jacksonized; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; -import org.lowcoder.sdk.models.DatasourceConnectionConfig; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonView; - -import lombok.Builder; -import lombok.Getter; -import lombok.extern.slf4j.Slf4j; - @Slf4j @Getter @Builder diff --git a/server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/RestApiEngineTest.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/RestApiEngineTest.java index a3a59f539..65ac6ad52 100644 --- a/server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/RestApiEngineTest.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/RestApiEngineTest.java @@ -1,21 +1,11 @@ package org.lowcoder.plugin.restapi; -import static java.util.Collections.emptyList; -import static java.util.Collections.emptyMap; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.BASIC_AUTH; -import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH; - -import java.net.URI; -import java.util.List; -import java.util.Map; - +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; +import com.google.common.collect.ImmutableMap; import org.junit.Assert; import org.junit.Test; -import org.lowcoder.plugin.restapi.RestApiConnector; -import org.lowcoder.plugin.restapi.RestApiExecutor; import org.lowcoder.plugin.restapi.model.RestApiQueryExecutionContext; import org.lowcoder.sdk.config.CommonConfig; import org.lowcoder.sdk.models.Property; @@ -25,15 +15,19 @@ import org.lowcoder.sdk.plugin.restapi.auth.BasicAuthConfig; import org.lowcoder.sdk.query.QueryExecutionContext; import org.lowcoder.sdk.query.QueryVisitorContext; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.node.TextNode; -import com.google.common.collect.ImmutableMap; - import reactor.core.publisher.Mono; import reactor.test.StepVerifier; +import java.net.URI; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.emptyList; +import static java.util.Collections.emptyMap; +import static org.junit.Assert.*; +import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.BASIC_AUTH; +import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH; + public class RestApiEngineTest { private final RestApiExecutor executor = new RestApiExecutor(new CommonConfig()); diff --git a/server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpDatasourceConfig.java b/server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpDatasourceConfig.java index 57d5eb2f8..94f8d271a 100644 --- a/server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpDatasourceConfig.java @@ -4,7 +4,7 @@ import jakarta.annotation.Nullable; import lombok.Builder; import lombok.Getter; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.config.JsonViews; import org.lowcoder.sdk.models.DatasourceConnectionConfig; import java.util.function.Function; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2KeycloakAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2KeycloakAuthConfig.java index a11f033d7..c760b815a 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2KeycloakAuthConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2KeycloakAuthConfig.java @@ -1,16 +1,11 @@ package org.lowcoder.sdk.auth; -import static org.lowcoder.sdk.auth.constants.Oauth2Constants.BASE_URL_PLACEHOLDER; -import static org.lowcoder.sdk.auth.constants.Oauth2Constants.REALM_PLACEHOLDER; -import static org.lowcoder.sdk.auth.constants.Oauth2Constants.SCOPE_PLACEHOLDER; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - import lombok.Getter; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; +import static org.lowcoder.sdk.auth.constants.Oauth2Constants.*; + /** * * Keycloak OAuth configuration. diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2SimpleAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2SimpleAuthConfig.java index 9c64c6be5..515e4d886 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2SimpleAuthConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2SimpleAuthConfig.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.StringUtils; import org.lowcoder.sdk.auth.constants.AuthTypeConstants; import org.lowcoder.sdk.auth.constants.Oauth2Constants; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.config.JsonViews; import java.util.function.Function; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/AuthProperties.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/AuthProperties.java index 4a0f2fca6..e55d43d46 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/AuthProperties.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/AuthProperties.java @@ -1,13 +1,7 @@ package org.lowcoder.sdk.config; -import static org.lowcoder.sdk.constants.AuthSourceConstants.GITHUB; -import static org.lowcoder.sdk.constants.AuthSourceConstants.GITHUB_NAME; -import static org.lowcoder.sdk.constants.AuthSourceConstants.GOOGLE; -import static org.lowcoder.sdk.constants.AuthSourceConstants.GOOGLE_NAME; - -import java.util.ArrayList; -import java.util.List; - +import lombok.Getter; +import lombok.Setter; import org.lowcoder.sdk.auth.AbstractAuthConfig; import org.lowcoder.sdk.auth.EmailAuthConfig; import org.lowcoder.sdk.auth.Oauth2SimpleAuthConfig; @@ -15,8 +9,10 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; -import lombok.Getter; -import lombok.Setter; +import java.util.ArrayList; +import java.util.List; + +import static org.lowcoder.sdk.constants.AuthSourceConstants.*; @Getter @Setter diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java index bc49625c7..d59edf1ad 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java @@ -1,14 +1,8 @@ package org.lowcoder.sdk.config; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - +import lombok.Data; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; @@ -17,9 +11,10 @@ import org.springframework.http.HttpMethod; import org.springframework.stereotype.Component; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; +import java.time.Duration; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; @Getter @Setter diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/JsonViews.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/JsonViews.java new file mode 100644 index 000000000..43a433e42 --- /dev/null +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/JsonViews.java @@ -0,0 +1,9 @@ +package org.lowcoder.sdk.config; + +public class JsonViews { + public static class Public { + } + + public static class Internal { + } +} diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/MaterialProperties.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/MaterialProperties.java index c3aaf598d..41a0f96e8 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/MaterialProperties.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/MaterialProperties.java @@ -1,11 +1,10 @@ package org.lowcoder.sdk.config; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - import lombok.Data; import lombok.Getter; import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; @Getter @Setter diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/SerializeConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/SerializeConfig.java deleted file mode 100644 index aae4019ea..000000000 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/SerializeConfig.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.lowcoder.sdk.config; - -import org.lowcoder.sdk.util.JsonUtils; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.http.codec.ServerCodecConfigurer; -import org.springframework.http.codec.json.Jackson2JsonDecoder; -import org.springframework.http.codec.json.Jackson2JsonEncoder; -import org.springframework.web.reactive.config.DelegatingWebFluxConfiguration; - -@Configuration -public class SerializeConfig extends DelegatingWebFluxConfiguration { - - @Bean - public ObjectMapper objectMapper() { - return JsonUtils.getObjectMapper(); - } - - @Override - protected void configureHttpMessageCodecs(ServerCodecConfigurer configurer) { - configurer.defaultCodecs().jackson2JsonEncoder( - new Jackson2JsonEncoder(objectMapper()) - ); - - configurer.defaultCodecs().jackson2JsonDecoder( - new Jackson2JsonDecoder(objectMapper()) - ); - } - - public static class JsonViews { - public static class Public { - } - - public static class Internal { - } - } -} diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigCenterForTest.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigCenterForTest.java index 269be85bd..dc981ed0c 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigCenterForTest.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigCenterForTest.java @@ -1,10 +1,10 @@ package org.lowcoder.sdk.config.dynamic; +import com.google.common.annotations.VisibleForTesting; + import java.util.Collections; import java.util.Map; -import com.google.common.annotations.VisibleForTesting; - @VisibleForTesting public class ConfigCenterForTest implements ConfigCenter { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/destructor/DestructorUtil.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/destructor/DestructorUtil.java index 7429b17b5..1895284a6 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/destructor/DestructorUtil.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/destructor/DestructorUtil.java @@ -1,11 +1,10 @@ package org.lowcoder.sdk.destructor; -import java.util.Queue; -import java.util.concurrent.LinkedBlockingQueue; - +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.Pair; -import lombok.extern.slf4j.Slf4j; +import java.util.Queue; +import java.util.concurrent.LinkedBlockingQueue; @Slf4j public class DestructorUtil { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java index d653407ea..345b94dc7 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java @@ -1,11 +1,11 @@ package org.lowcoder.sdk.exception; +import lombok.Getter; + import static org.lowcoder.sdk.exception.ErrorLogType.SIMPLE; import static org.lowcoder.sdk.exception.ErrorLogType.VERBOSE; import static org.lowcoder.sdk.util.EnumUtils.checkDuplicates; -import lombok.Getter; - @Getter public enum BizError { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizException.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizException.java index 1f440e4d3..6a893d3c9 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizException.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizException.java @@ -1,10 +1,9 @@ package org.lowcoder.sdk.exception; -import java.util.Locale; - +import lombok.Getter; import org.lowcoder.sdk.util.LocaleUtils; -import lombok.Getter; +import java.util.Locale; @Getter public class BizException extends BaseException { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginException.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginException.java index c9a99260a..5594230ff 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginException.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginException.java @@ -1,12 +1,10 @@ package org.lowcoder.sdk.exception; -import java.util.Locale; - -import org.lowcoder.sdk.util.LocaleUtils; - import com.google.common.base.Preconditions; - import lombok.Getter; +import org.lowcoder.sdk.util.LocaleUtils; + +import java.util.Locale; @Getter public class PluginException extends BaseException { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/ServerException.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/ServerException.java index d56cef2bb..820e75efc 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/ServerException.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/ServerException.java @@ -1,8 +1,7 @@ package org.lowcoder.sdk.exception; -import org.slf4j.helpers.MessageFormatter; - import lombok.extern.slf4j.Slf4j; +import org.slf4j.helpers.MessageFormatter; @Slf4j public class ServerException extends BaseException { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Endpoint.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Endpoint.java index 8bf74092a..8160cdc6f 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Endpoint.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Endpoint.java @@ -1,13 +1,10 @@ package org.lowcoder.sdk.models; import lombok.Builder; -import lombok.extern.jackson.Jacksonized; -import org.apache.commons.lang3.StringUtils; - -import com.fasterxml.jackson.annotation.JsonCreator; - import lombok.EqualsAndHashCode; import lombok.ToString; +import lombok.extern.jackson.Jacksonized; +import org.apache.commons.lang3.StringUtils; @ToString @EqualsAndHashCode diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/HasIdAndAuditing.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/HasIdAndAuditing.java index ed773241a..27fc802e6 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/HasIdAndAuditing.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/HasIdAndAuditing.java @@ -1,25 +1,19 @@ package org.lowcoder.sdk.models; -import java.io.Serializable; -import java.time.Instant; - -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -import org.springframework.data.annotation.CreatedBy; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.annotation.Id; -import org.springframework.data.annotation.LastModifiedBy; -import org.springframework.data.annotation.LastModifiedDate; -import org.springframework.data.domain.Persistable; -import org.springframework.data.mongodb.core.index.Indexed; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; - import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; +import lombok.experimental.SuperBuilder; +import org.springframework.data.annotation.*; +import org.springframework.data.domain.Persistable; +import org.springframework.data.mongodb.core.index.Indexed; + +import java.io.Serializable; +import java.time.Instant; /** * diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/JsDatasourceConnectionConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/JsDatasourceConnectionConfig.java index 752e89d11..b7b2026b1 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/JsDatasourceConnectionConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/JsDatasourceConnectionConfig.java @@ -1,27 +1,19 @@ package org.lowcoder.sdk.models; -import static org.apache.commons.lang3.ObjectUtils.firstNonNull; -import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static org.lowcoder.sdk.util.ExceptionUtils.ofException; - -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.function.Function; - +import lombok.Getter; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.ObjectUtils; import org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType; import org.springframework.data.annotation.Transient; -import lombok.Getter; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; +import java.util.*; +import java.util.function.Function; + +import static org.apache.commons.lang3.ObjectUtils.firstNonNull; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; @Slf4j @Getter diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Param.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Param.java index 8052c6b91..0c609fe4d 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Param.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Param.java @@ -1,12 +1,12 @@ package org.lowcoder.sdk.models; -import java.io.Serializable; - import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; +import java.io.Serializable; + @Getter @Setter @ToString diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Property.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Property.java index d202ffe5d..ef64ba437 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Property.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Property.java @@ -1,13 +1,11 @@ package org.lowcoder.sdk.models; -import lombok.Builder; -import lombok.extern.jackson.Jacksonized; -import org.lowcoder.sdk.plugin.restapi.DataUtils.MultipartFormDataType; - import com.fasterxml.jackson.annotation.JsonCreator; - +import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.ToString; +import lombok.extern.jackson.Jacksonized; +import org.lowcoder.sdk.plugin.restapi.DataUtils.MultipartFormDataType; @ToString @EqualsAndHashCode diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/QueryExecutionResult.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/QueryExecutionResult.java index 12351f06b..c532222e3 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/QueryExecutionResult.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/QueryExecutionResult.java @@ -1,18 +1,16 @@ package org.lowcoder.sdk.models; -import java.util.ArrayList; -import java.util.List; - +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.JsonNode; +import lombok.Getter; import org.apache.commons.lang3.StringUtils; import org.lowcoder.sdk.exception.PluginError; import org.lowcoder.sdk.exception.PluginException; import org.springframework.http.HttpStatus; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.JsonNode; - -import lombok.Getter; +import java.util.ArrayList; +import java.util.List; @JsonInclude(JsonInclude.Include.NON_NULL) @Getter diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/RestBodyFormFileData.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/RestBodyFormFileData.java index ade3366ab..8e23c96d0 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/RestBodyFormFileData.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/RestBodyFormFileData.java @@ -1,9 +1,9 @@ package org.lowcoder.sdk.models; -import java.util.List; - -import org.lowcoder.sdk.plugin.restapi.MultipartFormData; import org.lowcoder.sdk.plugin.restapi.DataUtils.MultipartFormDataType; +import org.lowcoder.sdk.plugin.restapi.MultipartFormData; + +import java.util.List; public class RestBodyFormFileData extends Property { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/TokenBasedConnectionDetail.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/TokenBasedConnectionDetail.java index 1ae0317e6..4d5d5ee9d 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/TokenBasedConnectionDetail.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/TokenBasedConnectionDetail.java @@ -1,9 +1,9 @@ package org.lowcoder.sdk.models; -import java.util.Map; - import org.springframework.data.annotation.Transient; +import java.util.Map; + public interface TokenBasedConnectionDetail extends Encrypt { @Transient diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutionUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutionUtils.java index ef61791c0..5c58581cd 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutionUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutionUtils.java @@ -1,5 +1,9 @@ package org.lowcoder.sdk.plugin.common; +import org.apache.commons.collections4.MapUtils; +import reactor.core.scheduler.Scheduler; +import reactor.core.scheduler.Schedulers; + import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -8,11 +12,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.commons.collections4.MapUtils; - -import reactor.core.scheduler.Scheduler; -import reactor.core.scheduler.Schedulers; - public class QueryExecutionUtils { private static final Scheduler SHARED_SCHEDULER = Schedulers.newBoundedElastic(100, diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutor.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutor.java index 84cfda16c..da55bb657 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutor.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutor.java @@ -1,12 +1,5 @@ package org.lowcoder.sdk.plugin.common; -import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginError; -import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; -import static org.lowcoder.sdk.util.ExceptionUtils.propagateError; - -import java.util.Map; - import org.lowcoder.sdk.exception.BizException; import org.lowcoder.sdk.exception.PluginCommonError; import org.lowcoder.sdk.exception.PluginException; @@ -17,9 +10,13 @@ import org.lowcoder.sdk.query.QueryVisitorContext; import org.lowcoder.sdk.util.ExceptionUtils; import org.pf4j.ExtensionPoint; - import reactor.core.publisher.Mono; +import java.util.Map; + +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.util.ExceptionUtils.*; + /** * will be set to an abstract class later */ diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/RestApiUriBuilder.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/RestApiUriBuilder.java index 90ac5d4d9..5905fdbcf 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/RestApiUriBuilder.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/RestApiUriBuilder.java @@ -1,16 +1,16 @@ package org.lowcoder.sdk.plugin.common; -import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static org.lowcoder.sdk.util.ExceptionUtils.wrapException; -import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; +import org.apache.commons.lang3.StringUtils; +import org.apache.http.client.utils.URIBuilder; +import org.lowcoder.sdk.exception.PluginException; import java.net.URI; import java.net.URISyntaxException; import java.util.Map; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.client.utils.URIBuilder; -import org.lowcoder.sdk.exception.PluginException; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.ExceptionUtils.wrapException; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; public final class RestApiUriBuilder { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/ResultSetParser.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/ResultSetParser.java index 32f8d3cd3..3c2fdb3c7 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/ResultSetParser.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/ResultSetParser.java @@ -1,6 +1,6 @@ package org.lowcoder.sdk.plugin.common.sql; -import static org.lowcoder.sdk.util.DateTimeUtils.DATE_TIME_FORMAT; +import org.jetbrains.annotations.Nullable; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -14,7 +14,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.jetbrains.annotations.Nullable; +import static org.lowcoder.sdk.util.DateTimeUtils.DATE_TIME_FORMAT; /** * sql result parser diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedDatasourceConnectionConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedDatasourceConnectionConfig.java index 6f8dfd292..d381cdcc1 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedDatasourceConnectionConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedDatasourceConnectionConfig.java @@ -1,25 +1,23 @@ package org.lowcoder.sdk.plugin.common.sql; -import static org.apache.commons.collections4.MapUtils.emptyIfNull; -import static org.apache.commons.lang3.ObjectUtils.firstNonNull; -import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static org.lowcoder.sdk.util.ExceptionUtils.ofException; +import com.fasterxml.jackson.annotation.JsonView; +import lombok.Getter; +import lombok.experimental.SuperBuilder; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.config.JsonViews; +import org.lowcoder.sdk.exception.ServerException; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Map; import java.util.function.Function; -import org.apache.commons.lang3.StringUtils; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; -import org.lowcoder.sdk.exception.ServerException; -import org.lowcoder.sdk.models.DatasourceConnectionConfig; - -import com.fasterxml.jackson.annotation.JsonView; - -import lombok.Getter; -import lombok.experimental.SuperBuilder; -import lombok.extern.slf4j.Slf4j; +import static org.apache.commons.collections4.MapUtils.emptyIfNull; +import static org.apache.commons.lang3.ObjectUtils.firstNonNull; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; @Slf4j @Getter diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedQueryExecutionContext.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedQueryExecutionContext.java index 413f51304..cb78674f9 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedQueryExecutionContext.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedQueryExecutionContext.java @@ -1,14 +1,13 @@ package org.lowcoder.sdk.plugin.common.sql; -import static org.apache.commons.collections4.MapUtils.emptyIfNull; - -import java.util.Map; - +import lombok.Builder; +import lombok.Getter; import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.lowcoder.sdk.query.QueryExecutionContext; -import lombok.Builder; -import lombok.Getter; +import java.util.Map; + +import static org.apache.commons.collections4.MapUtils.emptyIfNull; @Getter public class SqlBasedQueryExecutionContext extends QueryExecutionContext { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/StructureParser.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/StructureParser.java index 175c7db63..bb11daa3b 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/StructureParser.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/StructureParser.java @@ -1,7 +1,8 @@ package org.lowcoder.sdk.plugin.common.sql; -import static java.util.Collections.emptyList; -import static org.apache.commons.collections4.MapUtils.getString; +import org.lowcoder.sdk.models.DatasourceStructure.Column; +import org.lowcoder.sdk.models.DatasourceStructure.Table; +import org.lowcoder.sdk.models.DatasourceStructure.TableType; import java.sql.ResultSet; import java.sql.SQLException; @@ -10,9 +11,8 @@ import java.util.List; import java.util.Map; -import org.lowcoder.sdk.models.DatasourceStructure.Column; -import org.lowcoder.sdk.models.DatasourceStructure.Table; -import org.lowcoder.sdk.models.DatasourceStructure.TableType; +import static java.util.Collections.emptyList; +import static org.apache.commons.collections4.MapUtils.getString; public class StructureParser { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslHelper.java index 478be03c5..d7b4ce909 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslHelper.java @@ -1,15 +1,15 @@ package org.lowcoder.sdk.plugin.common.ssl; +import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; + import java.io.ByteArrayInputStream; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.util.Base64; -import org.apache.commons.lang3.StringUtils; -import org.lowcoder.sdk.exception.BizError; -import org.lowcoder.sdk.exception.BizException; - public class SslHelper { private static final String BEGIN_CERT = "-----BEGIN CERTIFICATE-----"; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifyCACertSslConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifyCACertSslConfig.java index 5c4bf3671..453e7aaeb 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifyCACertSslConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifyCACertSslConfig.java @@ -1,7 +1,6 @@ package org.lowcoder.sdk.plugin.common.ssl; import com.fasterxml.jackson.annotation.JsonCreator; -import lombok.Builder; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifySelfSignedCertSslConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifySelfSignedCertSslConfig.java index 703ba2a33..a9e58f4a0 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifySelfSignedCertSslConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifySelfSignedCertSslConfig.java @@ -1,18 +1,15 @@ package org.lowcoder.sdk.plugin.common.ssl; -import static org.apache.commons.lang3.ObjectUtils.firstNonNull; - -import java.util.function.Function; - +import com.fasterxml.jackson.annotation.JsonView; +import lombok.Getter; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; import org.jetbrains.annotations.Nullable; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.config.JsonViews; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonView; +import java.util.function.Function; -import lombok.Getter; +import static org.apache.commons.lang3.ObjectUtils.firstNonNull; @Getter @SuperBuilder diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpHandlerHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpHandlerHelper.java index c1c2ba7e7..cf47d077b 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpHandlerHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpHandlerHelper.java @@ -1,12 +1,5 @@ package org.lowcoder.sdk.plugin.http; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.stream.Collectors; - import org.apache.commons.lang3.StringUtils; import org.lowcoder.sdk.models.Property; import org.lowcoder.sdk.plugin.restapi.DataUtils; @@ -19,6 +12,13 @@ import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.util.UriComponentsBuilder; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.stream.Collectors; + public class RawHttpHandlerHelper { private static final DataUtils DATA_UTILS = DataUtils.getInstance(); diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpRequest.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpRequest.java index 620dc7e03..d4beb65b5 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpRequest.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpRequest.java @@ -1,18 +1,17 @@ package org.lowcoder.sdk.plugin.http; -import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJsonString; -import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; - -import java.util.List; -import java.util.Map; - +import lombok.Getter; +import lombok.Setter; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.lowcoder.sdk.models.Property; import org.springframework.http.HttpMethod; -import lombok.Getter; -import lombok.Setter; +import java.util.List; +import java.util.Map; + +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJsonString; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; @Setter @Getter diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/mysql/MysqlDatasourceConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/mysql/MysqlDatasourceConfig.java index ca00fd32d..9ea3e414a 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/mysql/MysqlDatasourceConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/mysql/MysqlDatasourceConfig.java @@ -1,20 +1,16 @@ package org.lowcoder.sdk.plugin.mysql; -import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; -import static org.lowcoder.sdk.util.JsonUtils.fromJson; -import static org.lowcoder.sdk.util.JsonUtils.toJson; - -import java.util.Map; - import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; +import lombok.extern.slf4j.Slf4j; import org.lowcoder.sdk.exception.PluginCommonError; import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; -import com.google.common.annotations.VisibleForTesting; +import java.util.Map; -import lombok.Builder; -import lombok.extern.slf4j.Slf4j; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; @Slf4j @SuperBuilder diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/MultipartFormData.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/MultipartFormData.java index 1ce42ec35..69fb512a9 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/MultipartFormData.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/MultipartFormData.java @@ -1,8 +1,9 @@ package org.lowcoder.sdk.plugin.restapi; -import static com.google.common.base.Strings.nullToEmpty; import lombok.Setter; +import static com.google.common.base.Strings.nullToEmpty; + @Setter public class MultipartFormData { private String name; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/BasicAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/BasicAuthConfig.java index 3f5ce2587..b371c20d8 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/BasicAuthConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/BasicAuthConfig.java @@ -6,7 +6,7 @@ import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; import org.apache.commons.lang3.ObjectUtils; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.config.JsonViews; import java.util.function.Function; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/NoneAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/NoneAuthConfig.java index b52596d96..d95981e14 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/NoneAuthConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/NoneAuthConfig.java @@ -1,7 +1,6 @@ package org.lowcoder.sdk.plugin.restapi.auth; import com.fasterxml.jackson.annotation.JsonCreator; -import jakarta.validation.constraints.Size; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetBulkObjectChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetBulkObjectChangeSet.java index 4907e02db..249f09d7c 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetBulkObjectChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetBulkObjectChangeSet.java @@ -1,14 +1,13 @@ package org.lowcoder.sdk.plugin.sheet.changeset; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static org.lowcoder.sdk.plugin.common.constant.Constants.RECORD_FORM_KEY; - -import java.util.Map; - +import com.fasterxml.jackson.databind.JsonNode; import org.lowcoder.sdk.exception.PluginException; import org.lowcoder.sdk.util.MustacheHelper; -import com.fasterxml.jackson.databind.JsonNode; +import java.util.Map; + +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.RECORD_FORM_KEY; public class SheetBulkObjectChangeSet { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSet.java index 43c582102..3bbdfc32f 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSet.java @@ -1,18 +1,14 @@ package org.lowcoder.sdk.plugin.sheet.changeset; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_FORM_KEY; -import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_KEY_VALUE_PAIRS; -import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_OBJECT; -import static org.lowcoder.sdk.plugin.common.constant.Constants.COMP_KEY; -import static org.lowcoder.sdk.plugin.common.constant.Constants.COMP_TYPE_KEY; - -import java.util.Map; - import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.lowcoder.sdk.exception.PluginException; +import java.util.Map; + +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.*; + public abstract class SheetChangeSet { public abstract SheetChangeSetRow render(Map requestMap); diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java index 8d1b803e3..be3893500 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java @@ -1,21 +1,20 @@ package org.lowcoder.sdk.plugin.sheet.changeset; -import static java.util.Collections.emptyMap; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJson; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.lowcoder.sdk.exception.PluginException; import org.lowcoder.sdk.util.JsonUtils; -import lombok.extern.slf4j.Slf4j; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import static java.util.Collections.emptyMap; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJson; @Slf4j public class SheetKeyValuePairChangeSet extends SheetChangeSet { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetObjectChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetObjectChangeSet.java index 7713479ed..a51defdc7 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetObjectChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetObjectChangeSet.java @@ -1,15 +1,14 @@ package org.lowcoder.sdk.plugin.sheet.changeset; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static org.lowcoder.sdk.plugin.sheet.changeset.SheetChangeSetRow.fromJsonNode; - -import java.util.Map; - +import com.fasterxml.jackson.databind.JsonNode; import org.lowcoder.sdk.exception.PluginException; import org.lowcoder.sdk.util.MustacheHelper; -import com.fasterxml.jackson.databind.JsonNode; +import java.util.Map; + +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.sheet.changeset.SheetChangeSetRow.fromJsonNode; public class SheetObjectChangeSet extends SheetChangeSet { private final String str; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/GuiSqlCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/GuiSqlCommand.java index ab54898b6..f1690bae1 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/GuiSqlCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/GuiSqlCommand.java @@ -1,17 +1,17 @@ package org.lowcoder.sdk.plugin.sqlcommand; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static org.lowcoder.sdk.plugin.common.constant.Constants.ALLOW_MULTI_MODIFY_KEY; -import static org.lowcoder.sdk.plugin.common.constant.Constants.TABLE_KEY; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.MapUtils; -import org.apache.commons.lang3.StringUtils; -import org.lowcoder.sdk.exception.PluginException; -import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.ALLOW_MULTI_MODIFY_KEY; +import static org.lowcoder.sdk.plugin.common.constant.Constants.TABLE_KEY; public interface GuiSqlCommand { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/BulkObjectChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/BulkObjectChangeSet.java index ed281a102..00508a691 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/BulkObjectChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/BulkObjectChangeSet.java @@ -1,16 +1,15 @@ package org.lowcoder.sdk.plugin.sqlcommand.changeset; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static org.lowcoder.sdk.plugin.common.constant.Constants.PRIMARY_KEY_FORM_KEY; -import static org.lowcoder.sdk.plugin.common.constant.Constants.RECORD_FORM_KEY; +import com.fasterxml.jackson.databind.JsonNode; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.MustacheHelper; import java.util.Map; import java.util.Set; -import org.lowcoder.sdk.exception.PluginException; -import org.lowcoder.sdk.util.MustacheHelper; - -import com.fasterxml.jackson.databind.JsonNode; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.PRIMARY_KEY_FORM_KEY; +import static org.lowcoder.sdk.plugin.common.constant.Constants.RECORD_FORM_KEY; public class BulkObjectChangeSet { private final String str; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSet.java index 52e9b9c3e..bcc352a0d 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSet.java @@ -1,18 +1,14 @@ package org.lowcoder.sdk.plugin.sqlcommand.changeset; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_FORM_KEY; -import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_KEY_VALUE_PAIRS; -import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_OBJECT; -import static org.lowcoder.sdk.plugin.common.constant.Constants.COMP_KEY; -import static org.lowcoder.sdk.plugin.common.constant.Constants.COMP_TYPE_KEY; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.exception.PluginException; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.MapUtils; -import org.apache.commons.lang3.StringUtils; -import org.lowcoder.sdk.exception.PluginException; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.*; public abstract class ChangeSet { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ObjectChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ObjectChangeSet.java index d24e2d22d..f79a102e5 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ObjectChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ObjectChangeSet.java @@ -1,14 +1,13 @@ package org.lowcoder.sdk.plugin.sqlcommand.changeset; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import com.fasterxml.jackson.databind.JsonNode; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.MustacheHelper; import java.util.Map; import java.util.Set; -import org.lowcoder.sdk.exception.PluginException; -import org.lowcoder.sdk.util.MustacheHelper; - -import com.fasterxml.jackson.databind.JsonNode; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; public class ObjectChangeSet extends ChangeSet { private final String str; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkInsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkInsertCommand.java index f1b2ceed4..8bbcc139b 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkInsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkInsertCommand.java @@ -1,13 +1,6 @@ package org.lowcoder.sdk.plugin.sqlcommand.command; -import static com.google.common.collect.Lists.newArrayList; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_INSERT_COMMAND; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import com.google.common.base.Joiner; import org.lowcoder.sdk.exception.PluginException; import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; @@ -16,7 +9,13 @@ import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRows; import org.lowcoder.sdk.util.MustacheHelper; -import com.google.common.base.Joiner; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static com.google.common.collect.Lists.newArrayList; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_INSERT_COMMAND; public class BulkInsertCommand implements GuiSqlCommand { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkUpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkUpdateCommand.java index 0b96f9d1d..6c8954447 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkUpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkUpdateCommand.java @@ -1,14 +1,7 @@ package org.lowcoder.sdk.plugin.sqlcommand.command; -import static com.google.common.collect.Lists.newArrayList; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_INSERT_COMMAND; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - +import com.google.common.base.Joiner; +import com.google.common.collect.ArrayListMultimap; import org.apache.commons.lang3.tuple.Pair; import org.lowcoder.sdk.exception.PluginException; import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; @@ -17,8 +10,14 @@ import org.lowcoder.sdk.util.MustacheHelper; import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue; -import com.google.common.base.Joiner; -import com.google.common.collect.ArrayListMultimap; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import static com.google.common.collect.Lists.newArrayList; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_INSERT_COMMAND; public class BulkUpdateCommand implements GuiSqlCommand { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/DeleteCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/DeleteCommand.java index 2a7f7fefc..9383dc834 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/DeleteCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/DeleteCommand.java @@ -1,13 +1,13 @@ package org.lowcoder.sdk.plugin.sqlcommand.command; -import java.util.Collections; -import java.util.Map; -import java.util.Set; - import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; import org.lowcoder.sdk.util.MustacheHelper; +import java.util.Collections; +import java.util.Map; +import java.util.Set; + public class DeleteCommand implements GuiSqlCommand { protected final String table; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateCommand.java index 6262342ac..aa78a0d5f 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateCommand.java @@ -1,22 +1,21 @@ package org.lowcoder.sdk.plugin.sqlcommand.command; -import static com.google.common.collect.Lists.newArrayList; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_UPDATE_COMMAND; -import static org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet.parseChangeSet; -import static org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; -import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; - -import java.util.List; -import java.util.Map; -import java.util.Set; - +import com.google.common.collect.Sets; import org.lowcoder.sdk.exception.PluginException; import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRow; import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; -import com.google.common.collect.Sets; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static com.google.common.collect.Lists.newArrayList; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_UPDATE_COMMAND; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet.parseChangeSet; +import static org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; @SuppressWarnings("DuplicatedCode") public class UpdateCommand implements GuiSqlCommand { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateOrDeleteSingleCommandRenderResult.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateOrDeleteSingleCommandRenderResult.java index 410d3706a..38143fb2a 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateOrDeleteSingleCommandRenderResult.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateOrDeleteSingleCommandRenderResult.java @@ -1,9 +1,9 @@ package org.lowcoder.sdk.plugin.sqlcommand.command; -import java.util.List; - import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand.GuiSqlCommandRenderResult; +import java.util.List; + public class UpdateOrDeleteSingleCommandRenderResult extends GuiSqlCommandRenderResult { private final String selectQuery; private final List selectBindParams; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpsertCommand.java index 893d7253e..33f48f32e 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpsertCommand.java @@ -1,15 +1,14 @@ package org.lowcoder.sdk.plugin.sqlcommand.command; -import java.util.List; -import java.util.Set; - +import com.google.common.collect.Sets; import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetItem; import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRow; import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; -import com.google.common.collect.Sets; +import java.util.List; +import java.util.Set; public abstract class UpsertCommand implements GuiSqlCommand { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkInsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkInsertCommand.java index c71047b3f..0f938a463 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkInsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkInsertCommand.java @@ -1,14 +1,14 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; -import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; - -import java.util.Map; - import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.command.BulkInsertCommand; +import java.util.Map; + +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; + public class MysqlBulkInsertCommand extends BulkInsertCommand { protected MysqlBulkInsertCommand(String table, BulkObjectChangeSet bulkObjectChangeSet) { super(table, bulkObjectChangeSet, MYSQL_COLUMN_DELIMITER, MYSQL_COLUMN_DELIMITER); diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkUpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkUpdateCommand.java index df747cc68..963613801 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkUpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkUpdateCommand.java @@ -1,15 +1,15 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.BulkUpdateCommand; + +import java.util.Map; + import static org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand.parseTable; import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parsePrimaryKey; import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; -import java.util.Map; - -import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import org.lowcoder.sdk.plugin.sqlcommand.command.BulkUpdateCommand; - public class MysqlBulkUpdateCommand extends BulkUpdateCommand { protected MysqlBulkUpdateCommand(String table, BulkObjectChangeSet bulkObjectChangeSet, diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlDeleteCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlDeleteCommand.java index cb2add94c..a3d5a3fcd 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlDeleteCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlDeleteCommand.java @@ -1,14 +1,14 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; -import static org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; - -import java.util.Map; - import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.lowcoder.sdk.plugin.sqlcommand.command.DeleteCommand; import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; +import java.util.Map; + +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; +import static org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; + public class MysqlDeleteCommand extends DeleteCommand { protected MysqlDeleteCommand(String table, FilterSet filterSet, boolean allowMultiModify) { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlInsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlInsertCommand.java index 7bc670886..f0a249b9d 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlInsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlInsertCommand.java @@ -1,13 +1,12 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; - -import java.util.Map; - +import com.google.common.annotations.VisibleForTesting; import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.command.InsertCommand; -import com.google.common.annotations.VisibleForTesting; +import java.util.Map; + +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; public class MysqlInsertCommand extends InsertCommand { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpdateCommand.java index 6af4dc893..e4534e15c 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpdateCommand.java @@ -1,14 +1,13 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; - -import java.util.Map; - +import com.google.common.annotations.VisibleForTesting; import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.command.UpdateCommand; import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; -import com.google.common.annotations.VisibleForTesting; +import java.util.Map; + +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; public class MysqlUpdateCommand extends UpdateCommand { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpsertCommand.java index 764684484..a1799c8d8 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpsertCommand.java @@ -1,15 +1,6 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static com.google.common.collect.Lists.newArrayList; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_UPSERT_COMMAND; -import static org.lowcoder.sdk.plugin.common.constant.Constants.INSERT_CHANGE_SET_FORM_KEY; -import static org.lowcoder.sdk.plugin.common.constant.Constants.UPDATE_CHANGE_SET_FORM_KEY; -import static org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet.parseChangeSet; -import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; - -import java.util.List; -import java.util.Map; - +import com.google.common.annotations.VisibleForTesting; import org.lowcoder.sdk.exception.PluginException; import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; @@ -18,7 +9,15 @@ import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; import org.lowcoder.sdk.util.MustacheHelper; -import com.google.common.annotations.VisibleForTesting; +import java.util.List; +import java.util.Map; + +import static com.google.common.collect.Lists.newArrayList; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_UPSERT_COMMAND; +import static org.lowcoder.sdk.plugin.common.constant.Constants.INSERT_CHANGE_SET_FORM_KEY; +import static org.lowcoder.sdk.plugin.common.constant.Constants.UPDATE_CHANGE_SET_FORM_KEY; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet.parseChangeSet; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; public class MysqlUpsertCommand extends UpsertCommand { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkInsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkInsertCommand.java index 1b5ba651d..b724e64ec 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkInsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkInsertCommand.java @@ -1,16 +1,16 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; -import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; -import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; -import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; - -import java.util.Map; - import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.command.BulkInsertCommand; import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; +import java.util.Map; + +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; +import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; + public class PostgresBulkInsertCommand extends BulkInsertCommand { protected PostgresBulkInsertCommand(String table, BulkObjectChangeSet bulkObjectChangeSet) { super(table, bulkObjectChangeSet, POSTGRES_COLUMN_DELIMITER, POSTGRES_COLUMN_DELIMITER); diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkUpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkUpdateCommand.java index 43e00031c..3c3d08177 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkUpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkUpdateCommand.java @@ -1,17 +1,17 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; -import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; -import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parsePrimaryKey; -import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; -import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; - -import java.util.Map; - import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.command.BulkUpdateCommand; import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; +import java.util.Map; + +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parsePrimaryKey; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; +import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; + public class PostgresBulkUpdateCommand extends BulkUpdateCommand { protected PostgresBulkUpdateCommand(String table, BulkObjectChangeSet bulkObjectChangeSet, diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresDeleteCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresDeleteCommand.java index 875a675a3..aaf2bf657 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresDeleteCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresDeleteCommand.java @@ -1,12 +1,5 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; -import static java.util.Collections.emptyList; -import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; -import static org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; -import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; - -import java.util.Map; - import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.lowcoder.sdk.plugin.sqlcommand.command.DeleteCommand; import org.lowcoder.sdk.plugin.sqlcommand.command.UpdateOrDeleteSingleCommandRenderResult; @@ -14,6 +7,13 @@ import org.lowcoder.sdk.util.MustacheHelper; import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; +import java.util.Map; + +import static java.util.Collections.emptyList; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; +import static org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; +import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; + public class PostgresDeleteCommand extends DeleteCommand { protected PostgresDeleteCommand(String table, FilterSet filterSet, boolean allowMultiModify) { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresInsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresInsertCommand.java index 413fe169d..50c64e95f 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresInsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresInsertCommand.java @@ -1,15 +1,14 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; -import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; -import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; - -import java.util.Map; - +import com.google.common.annotations.VisibleForTesting; import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.command.InsertCommand; import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; -import com.google.common.annotations.VisibleForTesting; +import java.util.Map; + +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; +import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; public class PostgresInsertCommand extends InsertCommand { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresUpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresUpdateCommand.java index e028a2759..21236be89 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresUpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresUpdateCommand.java @@ -1,14 +1,6 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; -import static com.google.common.collect.Lists.newArrayList; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_UPDATE_COMMAND; -import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; -import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; -import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; - -import java.util.List; -import java.util.Map; - +import com.google.common.annotations.VisibleForTesting; import org.lowcoder.sdk.exception.PluginException; import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRow; @@ -17,7 +9,14 @@ import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; -import com.google.common.annotations.VisibleForTesting; +import java.util.List; +import java.util.Map; + +import static com.google.common.collect.Lists.newArrayList; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_UPDATE_COMMAND; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; public class PostgresUpdateCommand extends UpdateCommand { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/filter/FilterSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/filter/FilterSet.java index 61279ce2a..44f1833f2 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/filter/FilterSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/filter/FilterSet.java @@ -1,18 +1,7 @@ package org.lowcoder.sdk.plugin.sqlcommand.filter; -import static com.google.common.collect.Lists.newArrayList; -import static java.util.Collections.emptyList; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_IN_OPERATOR_SETTINGS; -import static org.lowcoder.sdk.util.JsonUtils.toJson; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - +import com.google.common.collect.ForwardingList; +import lombok.Getter; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.lowcoder.sdk.exception.PluginException; @@ -23,9 +12,14 @@ import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue; import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; -import com.google.common.collect.ForwardingList; +import java.util.*; +import java.util.stream.Collectors; -import lombok.Getter; +import static com.google.common.collect.Lists.newArrayList; +import static java.util.Collections.emptyList; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_IN_OPERATOR_SETTINGS; +import static org.lowcoder.sdk.util.JsonUtils.toJson; public class FilterSet extends ForwardingList { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/query/QueryVisitorContext.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/query/QueryVisitorContext.java index 129238f5a..e56091abc 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/query/QueryVisitorContext.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/query/QueryVisitorContext.java @@ -1,15 +1,14 @@ package org.lowcoder.sdk.query; -import java.util.List; -import java.util.Set; - +import lombok.Getter; import org.lowcoder.sdk.models.Property; import org.springframework.http.HttpCookie; import org.springframework.util.MultiValueMap; - -import lombok.Getter; import reactor.core.publisher.Mono; +import java.util.List; +import java.util.Set; + @Getter public class QueryVisitorContext { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/test/JsonFileReader.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/test/JsonFileReader.java index 0f0e2cbbc..ab0a790e5 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/test/JsonFileReader.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/test/JsonFileReader.java @@ -1,16 +1,15 @@ package org.lowcoder.sdk.test; +import com.google.common.annotations.VisibleForTesting; +import com.jayway.jsonpath.JsonPath; +import org.apache.commons.io.IOUtils; +import org.lowcoder.sdk.util.JsonUtils; + import java.io.FileReader; import java.io.IOException; import java.util.List; import java.util.Map; -import org.apache.commons.io.IOUtils; -import org.lowcoder.sdk.util.JsonUtils; - -import com.google.common.annotations.VisibleForTesting; -import com.jayway.jsonpath.JsonPath; - @SuppressWarnings({"unused"}) @VisibleForTesting public class JsonFileReader { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/CookieHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/CookieHelper.java index 614d440b4..54a64657b 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/CookieHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/CookieHelper.java @@ -4,7 +4,6 @@ import lombok.extern.slf4j.Slf4j; import org.lowcoder.sdk.config.CommonConfig; import org.lowcoder.sdk.config.CommonConfig.Cookie; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpCookie; import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseCookie.ResponseCookieBuilder; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/DateTimeUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/DateTimeUtils.java index 80230c75c..85f3b6837 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/DateTimeUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/DateTimeUtils.java @@ -1,11 +1,11 @@ package org.lowcoder.sdk.util; +import org.apache.commons.lang3.time.DateFormatUtils; + import java.time.Instant; import java.time.format.DateTimeFormatter; import java.util.Date; -import org.apache.commons.lang3.time.DateFormatUtils; - public class DateTimeUtils { public static final DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/ExceptionUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/ExceptionUtils.java index b9f26194d..74517586a 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/ExceptionUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/ExceptionUtils.java @@ -1,15 +1,10 @@ package org.lowcoder.sdk.util; -import static reactor.core.Exceptions.throwIfFatal; - -import org.lowcoder.sdk.exception.BaseException; -import org.lowcoder.sdk.exception.BizError; -import org.lowcoder.sdk.exception.BizException; -import org.lowcoder.sdk.exception.PluginError; -import org.lowcoder.sdk.exception.PluginException; - +import org.lowcoder.sdk.exception.*; import reactor.core.publisher.Mono; +import static reactor.core.Exceptions.throwIfFatal; + public final class ExceptionUtils { private ExceptionUtils() { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/LocaleUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/LocaleUtils.java index eaa41117e..4b8663977 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/LocaleUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/LocaleUtils.java @@ -1,16 +1,15 @@ package org.lowcoder.sdk.util; -import java.text.MessageFormat; -import java.util.Locale; -import java.util.ResourceBundle; - +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.lowcoder.sdk.constants.GlobalContext; import org.lowcoder.sdk.models.LocaleMessage; - -import lombok.extern.slf4j.Slf4j; import reactor.util.context.ContextView; +import java.text.MessageFormat; +import java.util.Locale; +import java.util.ResourceBundle; + @Slf4j public final class LocaleUtils { private LocaleUtils() { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MustacheHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MustacheHelper.java index c1e65c6b7..25cc917a3 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MustacheHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MustacheHelper.java @@ -19,44 +19,32 @@ package org.lowcoder.sdk.util; -import static com.google.common.collect.Lists.newArrayList; -import static org.apache.commons.lang3.ObjectUtils.firstNonNull; -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.substring; -import static org.lowcoder.sdk.exception.PluginCommonError.SQL_IN_OPERATOR_PARSE_ERROR; -import static org.lowcoder.sdk.util.JsonUtils.toJson; -import static org.lowcoder.sdk.util.StreamUtils.collectMap; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - +import com.fasterxml.jackson.databind.JsonNode; +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Iterables; import jakarta.annotation.Nonnull; import jakarta.validation.constraints.NotNull; - +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.Range; import org.apache.commons.text.StringEscapeUtils; import org.lowcoder.sdk.exception.PluginException; -import com.fasterxml.jackson.databind.JsonNode; -import com.github.benmanes.caffeine.cache.Cache; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Iterables; +import java.time.Duration; +import java.util.*; +import java.util.function.Function; +import java.util.regex.Pattern; +import java.util.stream.Collectors; -import lombok.extern.slf4j.Slf4j; +import static com.google.common.collect.Lists.newArrayList; +import static org.apache.commons.lang3.ObjectUtils.firstNonNull; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.substring; +import static org.lowcoder.sdk.exception.PluginCommonError.SQL_IN_OPERATOR_PARSE_ERROR; +import static org.lowcoder.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.StreamUtils.collectMap; @Slf4j public final class MustacheHelper { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/StreamUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/StreamUtils.java index 8a9254273..827cc2ffc 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/StreamUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/StreamUtils.java @@ -1,7 +1,5 @@ package org.lowcoder.sdk.util; -import static java.util.function.Function.identity; - import java.util.Collection; import java.util.List; import java.util.Map; @@ -14,6 +12,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.util.function.Function.identity; + public class StreamUtils { public static Set collectSet(Collection collection, Function mapper) { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/SafeHostResolverGroup.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/SafeHostResolverGroup.java index ec0a9aa6d..bbea9e297 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/SafeHostResolverGroup.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/SafeHostResolverGroup.java @@ -1,12 +1,5 @@ package org.lowcoder.sdk.webclient; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.UnknownHostException; -import java.util.Arrays; -import java.util.List; -import java.util.Set; - import io.netty.resolver.AddressResolver; import io.netty.resolver.AddressResolverGroup; import io.netty.resolver.InetNameResolver; @@ -15,6 +8,13 @@ import io.netty.util.concurrent.Promise; import io.netty.util.internal.SocketUtils; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; +import java.util.Arrays; +import java.util.List; +import java.util.Set; + public class SafeHostResolverGroup extends AddressResolverGroup { private final Set disallowedHosts; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClientBuildHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClientBuildHelper.java index a121a065e..0610b6927 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClientBuildHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClientBuildHelper.java @@ -34,6 +34,8 @@ public class WebClientBuildHelper { private boolean systemProxy; private Long timeoutMs; + private int maxInMemorySize = 20 * 1024 * 1024; + static { proxyHost = System.getProperty("http.proxyHost"); proxyPortStr = System.getProperty("http.proxyPort"); @@ -64,7 +66,12 @@ public WebClientBuildHelper systemProxy() { public WebClientBuildHelper timeoutMs(long milliseconds) { this.timeoutMs = milliseconds; return this; - } + } + + public WebClientBuildHelper maxInMemorySize(int maxInMemorySize) { + this.maxInMemorySize = maxInMemorySize; + return this; + } public WebClient build() { return toWebClientBuilder().build(); @@ -96,7 +103,7 @@ public Builder toWebClientBuilder() { return WebClient.builder() .codecs(codecs -> codecs .defaultCodecs() - .maxInMemorySize(20 * 1024 * 1024)) + .maxInMemorySize(maxInMemorySize)) .clientConnector(new ReactorClientHttpConnector(httpClient)); } diff --git a/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/helpers/MustacheHelperTest.java b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/helpers/MustacheHelperTest.java index 45e7718ba..45a4128ff 100644 --- a/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/helpers/MustacheHelperTest.java +++ b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/helpers/MustacheHelperTest.java @@ -1,24 +1,16 @@ package org.lowcoder.sdk.helpers; -import static org.assertj.core.api.Assertions.assertThat; -import static org.lowcoder.sdk.util.MustacheHelper.extractMustacheKeys; -import static org.lowcoder.sdk.util.MustacheHelper.extractMustacheKeysInOrder; -import static org.lowcoder.sdk.util.MustacheHelper.tokenize; - -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Test; import org.lowcoder.sdk.util.JsonUtils; import org.lowcoder.sdk.util.MustacheHelper; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; +import java.util.*; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.lowcoder.sdk.util.MustacheHelper.*; @SuppressWarnings( // Disabling this so we may use `Arrays.asList` with single argument, which is easier to refactor, just for tests. diff --git a/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlGuiCommandTest.java b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlGuiCommandTest.java index 9d831d260..5ee0d32d6 100644 --- a/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlGuiCommandTest.java +++ b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlGuiCommandTest.java @@ -1,26 +1,16 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static org.assertj.core.api.Assertions.assertThat; -import static org.lowcoder.sdk.util.JsonUtils.toJson; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.junit.Assert; import org.junit.Test; import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.changeset.KeyValuePairChangeSet; -import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlBulkInsertCommand; -import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlBulkUpdateCommand; -import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlDeleteCommand; -import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlInsertCommand; -import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlUpdateCommand; -import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlUpsertCommand; import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; +import java.util.*; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.lowcoder.sdk.util.JsonUtils.toJson; + public class MysqlGuiCommandTest { @Test diff --git a/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresCommandTest.java b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresCommandTest.java index 6ce987004..63562e013 100644 --- a/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresCommandTest.java +++ b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresCommandTest.java @@ -1,11 +1,6 @@ package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; -import static org.lowcoder.sdk.util.JsonUtils.toJson; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - +import com.google.common.collect.ImmutableMap; import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; @@ -13,15 +8,14 @@ import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.changeset.KeyValuePairChangeSet; import org.lowcoder.sdk.plugin.sqlcommand.command.UpdateOrDeleteSingleCommandRenderResult; -import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresBulkInsertCommand; -import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresBulkUpdateCommand; -import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresDeleteCommand; -import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresInsertCommand; -import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresUpdateCommand; import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; -import com.google.common.collect.ImmutableMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import static org.lowcoder.sdk.util.JsonUtils.toJson; public class PostgresCommandTest { diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/OpenAPIDocsConfiguration.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/OpenAPIDocsConfiguration.java index 95f563771..ef41ebd50 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/OpenAPIDocsConfiguration.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/OpenAPIDocsConfiguration.java @@ -1,14 +1,5 @@ package org.lowcoder.api; -import java.util.Arrays; - -import org.lowcoder.sdk.config.CommonConfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; @@ -17,6 +8,13 @@ import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.ServerVariable; import io.swagger.v3.oas.models.servers.ServerVariables; +import org.lowcoder.sdk.config.CommonConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Arrays; @Configuration public class OpenAPIDocsConfiguration { diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/ServerApplication.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/ServerApplication.java index 09c94ee06..2710f0d3d 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/ServerApplication.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/ServerApplication.java @@ -1,7 +1,8 @@ package org.lowcoder.api; +import io.swagger.v3.oas.annotations.OpenAPIDefinition; import jakarta.annotation.PostConstruct; - +import lombok.extern.slf4j.Slf4j; import org.lowcoder.sdk.config.CommonConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.Banner; @@ -10,9 +11,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; - -import io.swagger.v3.oas.annotations.OpenAPIDefinition; -import lombok.extern.slf4j.Slf4j; import reactor.blockhound.BlockHound; import reactor.core.publisher.Hooks; import reactor.core.scheduler.Schedulers; diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationEndpoints.java index 3a00320cd..7ab28ba20 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationEndpoints.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationEndpoints.java @@ -1,8 +1,7 @@ package org.lowcoder.api.authentication; -import java.util.List; -import java.util.Map; - +import com.fasterxml.jackson.annotation.JsonView; +import io.swagger.v3.oas.annotations.Operation; import org.lowcoder.api.authentication.dto.APIKeyRequest; import org.lowcoder.api.authentication.dto.AuthConfigRequest; import org.lowcoder.api.framework.view.ResponseView; @@ -12,25 +11,14 @@ import org.lowcoder.domain.user.model.APIKey; import org.lowcoder.infra.constant.NewUrl; import org.lowcoder.sdk.auth.AbstractAuthConfig; -import org.lowcoder.sdk.auth.Oauth2GenericAuthConfig; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.config.JsonViews; import org.lowcoder.sdk.constants.AuthSourceConstants; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ServerWebExchange; - -import com.fasterxml.jackson.annotation.JsonView; - -import io.swagger.v3.oas.annotations.Operation; import reactor.core.publisher.Mono; +import java.util.List; + @RestController @RequestMapping(value = {NewUrl.CUSTOM_AUTH}) public interface AuthenticationEndpoints diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java index 2679b3418..4a319e53d 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java @@ -31,13 +31,10 @@ import org.lowcoder.domain.user.model.*; import org.lowcoder.domain.user.service.UserService; import org.lowcoder.sdk.auth.AbstractAuthConfig; -import org.lowcoder.sdk.auth.Oauth2GenericAuthConfig; -import org.lowcoder.sdk.auth.constants.AuthTypeConstants; import org.lowcoder.sdk.config.AuthProperties; import org.lowcoder.sdk.exception.BizError; import org.lowcoder.sdk.exception.BizException; import org.lowcoder.sdk.util.CookieHelper; -import org.lowcoder.sdk.webclient.WebClientBuildHelper; import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.stereotype.Service; import org.springframework.web.server.ServerWebExchange; diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigController.java index 8a0de6e2d..e362ddc8a 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigController.java @@ -1,5 +1,7 @@ package org.lowcoder.api.config; +import jakarta.annotation.PostConstruct; +import lombok.RequiredArgsConstructor; import org.lowcoder.api.framework.view.ResponseView; import org.lowcoder.api.usermanagement.OrgApiService; import org.lowcoder.infra.config.model.ServerConfig; @@ -11,9 +13,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; - -import jakarta.annotation.PostConstruct; -import lombok.RequiredArgsConstructor; import reactor.core.publisher.Mono; @RequiredArgsConstructor diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigEndpoints.java index 31431044e..5ffe02379 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigEndpoints.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigEndpoints.java @@ -1,22 +1,14 @@ package org.lowcoder.api.config; +import com.fasterxml.jackson.annotation.JsonView; +import io.swagger.v3.oas.annotations.Operation; import org.lowcoder.api.framework.view.ResponseView; import org.lowcoder.infra.config.model.ServerConfig; import org.lowcoder.infra.constant.NewUrl; import org.lowcoder.infra.constant.Url; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.lowcoder.sdk.config.JsonViews; +import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ServerWebExchange; - -import com.fasterxml.jackson.annotation.JsonView; - -import io.swagger.v3.oas.annotations.Operation; import reactor.core.publisher.Mono; @RestController diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceEndpoints.java index 69a7968fe..ec9c8512c 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceEndpoints.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceEndpoints.java @@ -1,11 +1,9 @@ package org.lowcoder.api.datasource; -import java.util.List; -import java.util.Set; - +import com.fasterxml.jackson.annotation.JsonView; +import io.swagger.v3.oas.annotations.Operation; import jakarta.annotation.Nullable; import jakarta.validation.Valid; - import org.lowcoder.api.framework.view.ResponseView; import org.lowcoder.api.permission.view.CommonPermissionView; import org.lowcoder.domain.datasource.model.Datasource; @@ -13,25 +11,15 @@ import org.lowcoder.domain.plugin.client.dto.GetPluginDynamicConfigRequestDTO; import org.lowcoder.infra.constant.NewUrl; import org.lowcoder.infra.constant.Url; -import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.config.JsonViews; import org.lowcoder.sdk.models.DatasourceStructure; import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; - -import com.fasterxml.jackson.annotation.JsonView; - -import io.swagger.v3.oas.annotations.Operation; +import org.springframework.web.bind.annotation.*; import reactor.core.publisher.Mono; +import java.util.List; +import java.util.Set; + @RestController @RequestMapping(value = {Url.DATASOURCE_URL, NewUrl.DATASOURCE_URL}) public interface DatasourceEndpoints diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/ApplicationConfiguration.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/ApplicationConfiguration.java index 763dccd7c..21f6e2169 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/ApplicationConfiguration.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/ApplicationConfiguration.java @@ -1,5 +1,6 @@ package org.lowcoder.api.framework.configuration; +import jakarta.servlet.MultipartConfigElement; import org.lowcoder.api.ServerApplication; import org.lowcoder.sdk.config.CommonConfig; import org.pf4j.spring.SpringPluginManager; @@ -10,8 +11,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.util.unit.DataSize; -import jakarta.servlet.MultipartConfigElement; - @Configuration public class ApplicationConfiguration { diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfigurationSupport.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfiguration.java similarity index 53% rename from server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfigurationSupport.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfiguration.java index 6a4d418fc..5124d2d10 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfigurationSupport.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfiguration.java @@ -3,18 +3,28 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; import org.lowcoder.api.framework.plugin.endpoint.ReloadableRouterFunctionMapping; +import org.lowcoder.sdk.util.JsonUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.codec.ServerCodecConfigurer; import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.http.codec.json.Jackson2JsonEncoder; -import org.springframework.web.reactive.config.WebFluxConfigurationSupport; +import org.springframework.util.unit.DataSize; +import org.springframework.web.reactive.config.DelegatingWebFluxConfiguration; import org.springframework.web.reactive.function.server.support.RouterFunctionMapping; @RequiredArgsConstructor @Configuration -public class CustomWebFluxConfigurationSupport extends WebFluxConfigurationSupport +public class CustomWebFluxConfiguration extends DelegatingWebFluxConfiguration { - private final ObjectMapper objectMapper; + @Value("${spring.codec.max-in-memory-size:20MB}") + private String codecMaxInMemorySize = "20MB"; + + @Bean + public ObjectMapper objectMapper() { + return JsonUtils.getObjectMapper(); + } @Override protected RouterFunctionMapping createRouterFunctionMapping() @@ -26,8 +36,11 @@ protected RouterFunctionMapping createRouterFunctionMapping() @Override protected void configureHttpMessageCodecs(ServerCodecConfigurer configurer) { configurer.defaultCodecs() - .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper)); + .maxInMemorySize((int)DataSize.parse(codecMaxInMemorySize).toBytes()); configurer.defaultCodecs() - .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper)); + .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper())); + configurer.defaultCodecs() + .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper())); } + } diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/plugin/PathBasedPluginLoader.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/plugin/PathBasedPluginLoader.java index ddd66ba3f..11f5bd953 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/plugin/PathBasedPluginLoader.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/plugin/PathBasedPluginLoader.java @@ -1,13 +1,7 @@ package org.lowcoder.api.framework.plugin; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.ServiceLoader; - +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.lowcoder.plugin.api.LowcoderPlugin; @@ -15,8 +9,13 @@ import org.springframework.boot.system.ApplicationHome; import org.springframework.stereotype.Component; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.ServiceLoader; @Slf4j @RequiredArgsConstructor diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/warmup/WarmupHelper.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/warmup/WarmupHelper.java index 305fc6c9e..572d05950 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/warmup/WarmupHelper.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/warmup/WarmupHelper.java @@ -5,7 +5,6 @@ import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.data.redis.core.ReactiveRedisTemplate; import org.springframework.stereotype.Component; - import reactor.core.publisher.Mono; @Component diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/SessionUserServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/SessionUserServiceImpl.java index eb23baea0..d4aadefd8 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/SessionUserServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/SessionUserServiceImpl.java @@ -1,15 +1,7 @@ package org.lowcoder.api.home; -import static org.lowcoder.sdk.constants.GlobalContext.CURRENT_ORG_MEMBER; -import static org.lowcoder.sdk.constants.GlobalContext.VISITOR_TOKEN; -import static org.lowcoder.sdk.exception.BizError.UNABLE_TO_FIND_VALID_ORG; -import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; -import static org.lowcoder.sdk.util.JsonUtils.fromJsonQuietly; - -import java.time.Duration; -import java.util.Objects; - import io.jsonwebtoken.Claims; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.lowcoder.api.usermanagement.UserApiService; import org.lowcoder.domain.organization.model.OrgMember; @@ -23,10 +15,17 @@ import org.springframework.data.redis.core.ReactiveValueOperations; import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.stereotype.Service; - -import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; +import java.time.Duration; +import java.util.Objects; + +import static org.lowcoder.sdk.constants.GlobalContext.CURRENT_ORG_MEMBER; +import static org.lowcoder.sdk.constants.GlobalContext.VISITOR_TOKEN; +import static org.lowcoder.sdk.exception.BizError.UNABLE_TO_FIND_VALID_ORG; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.JsonUtils.fromJsonQuietly; + @Slf4j @Service public class SessionUserServiceImpl implements SessionUserService { diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialApiServiceImpl.java index d24698091..2454469e7 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialApiServiceImpl.java @@ -1,12 +1,6 @@ package org.lowcoder.api.material; -import static org.apache.commons.io.FileUtils.ONE_GB; -import static org.apache.commons.io.FileUtils.ONE_MB; -import static org.apache.commons.io.FileUtils.byteCountToDisplaySize; - -import java.util.Base64; -import java.util.List; - +import jakarta.annotation.PostConstruct; import org.lowcoder.api.home.SessionUserService; import org.lowcoder.api.material.MaterialEndpoints.MaterialView; import org.lowcoder.api.usermanagement.OrgDevChecker; @@ -24,10 +18,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.stereotype.Service; - -import jakarta.annotation.PostConstruct; import reactor.core.publisher.Mono; +import java.util.Base64; +import java.util.List; + +import static org.apache.commons.io.FileUtils.*; + @Service public class MaterialApiServiceImpl implements MaterialApiService { diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java index afdead31c..57505fca0 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java @@ -1,24 +1,10 @@ package org.lowcoder.api.query; -import static org.apache.commons.lang3.StringUtils.firstNonBlank; -import static org.lowcoder.domain.organization.model.OrgMember.NOT_EXIST; -import static org.lowcoder.sdk.exception.BizError.LIBRARY_QUERY_AND_ORG_NOT_MATCH; -import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; -import static org.lowcoder.sdk.util.ExceptionUtils.ofError; - -import java.util.*; - import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.lowcoder.api.home.SessionUserService; -import org.lowcoder.api.query.view.LibraryQueryAggregateView; -import org.lowcoder.api.query.view.LibraryQueryPublishRequest; -import org.lowcoder.api.query.view.LibraryQueryRecordMetaView; -import org.lowcoder.api.query.view.LibraryQueryRequestFromJs; -import org.lowcoder.api.query.view.LibraryQueryView; -import org.lowcoder.api.query.view.QueryExecutionRequest; -import org.lowcoder.api.query.view.UpsertLibraryQueryRequest; +import org.lowcoder.api.query.view.*; import org.lowcoder.api.usermanagement.OrgDevChecker; import org.lowcoder.api.util.BusinessEventPublisher; import org.lowcoder.api.util.ViewBuilder; @@ -48,17 +34,23 @@ import org.lowcoder.sdk.plugin.restapi.RestApiDatasourceConfig; import org.lowcoder.sdk.plugin.restapi.auth.OAuthInheritAuthConfig; import org.lowcoder.sdk.query.QueryVisitorContext; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpCookie; import org.springframework.stereotype.Service; import org.springframework.util.MultiValueMap; import org.springframework.web.server.ServerWebExchange; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.Timed; +import java.util.*; + +import static org.apache.commons.lang3.StringUtils.firstNonBlank; +import static org.lowcoder.domain.organization.model.OrgMember.NOT_EXIST; +import static org.lowcoder.sdk.exception.BizError.LIBRARY_QUERY_AND_ORG_NOT_MATCH; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; + @RequiredArgsConstructor @Service public class LibraryQueryApiServiceImpl implements LibraryQueryApiService { diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java index ac3023f74..507c6effd 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java @@ -1,18 +1,6 @@ package org.lowcoder.api.usermanagement; -import static org.lowcoder.sdk.exception.BizError.LAST_ADMIN_CANNOT_LEAVE_ORG; -import static org.lowcoder.sdk.exception.BizError.UNSUPPORTED_OPERATION; -import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; -import static org.lowcoder.sdk.util.ExceptionUtils.ofError; -import static org.lowcoder.sdk.util.StreamUtils.collectSet; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; - +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.SetUtils; import org.apache.commons.lang3.StringUtils; import org.lowcoder.api.authentication.dto.OrganizationDomainCheckResult; @@ -20,10 +8,10 @@ import org.lowcoder.api.config.ConfigView; import org.lowcoder.api.home.SessionUserService; import org.lowcoder.api.usermanagement.view.OrgMemberListView; +import org.lowcoder.api.usermanagement.view.OrgMemberListView.OrgMemberView; import org.lowcoder.api.usermanagement.view.OrgView; import org.lowcoder.api.usermanagement.view.UpdateOrgRequest; import org.lowcoder.api.usermanagement.view.UpdateRoleRequest; -import org.lowcoder.api.usermanagement.view.OrgMemberListView.OrgMemberView; import org.lowcoder.domain.authentication.AuthenticationService; import org.lowcoder.domain.authentication.FindAuthConfig; import org.lowcoder.domain.group.service.GroupService; @@ -31,8 +19,8 @@ import org.lowcoder.domain.organization.model.MemberRole; import org.lowcoder.domain.organization.model.OrgMember; import org.lowcoder.domain.organization.model.Organization; -import org.lowcoder.domain.organization.model.OrganizationDomain; import org.lowcoder.domain.organization.model.Organization.OrganizationCommonSettings; +import org.lowcoder.domain.organization.model.OrganizationDomain; import org.lowcoder.domain.organization.service.OrgMemberService; import org.lowcoder.domain.organization.service.OrganizationService; import org.lowcoder.domain.user.model.Connection; @@ -50,10 +38,17 @@ import org.springframework.context.ApplicationContext; import org.springframework.http.codec.multipart.Part; import org.springframework.stereotype.Service; - -import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; +import java.util.*; +import java.util.stream.Collectors; + +import static org.lowcoder.sdk.exception.BizError.LAST_ADMIN_CANNOT_LEAVE_ORG; +import static org.lowcoder.sdk.exception.BizError.UNSUPPORTED_OPERATION; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.StreamUtils.collectSet; + @Slf4j @Service public class OrgApiServiceImpl implements OrgApiService { diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java index 11a60c413..8fe6ef8d9 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java @@ -1,8 +1,5 @@ package org.lowcoder.api.usermanagement; -import static org.lowcoder.sdk.exception.BizError.INVALID_USER_STATUS; -import static org.lowcoder.sdk.util.ExceptionUtils.ofError; - import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.lowcoder.api.authentication.dto.OrganizationDomainCheckResult; @@ -18,18 +15,15 @@ import org.lowcoder.domain.user.service.UserStatusService; import org.lowcoder.sdk.config.CommonConfig; import org.lowcoder.sdk.exception.BizError; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.codec.multipart.Part; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ServerWebExchange; - import reactor.core.publisher.Mono; +import static org.lowcoder.sdk.exception.BizError.INVALID_USER_STATUS; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; + @RequiredArgsConstructor @RestController public class UserController implements UserEndpoints diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java index 8011aa16b..ceeabbf2b 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java @@ -9,7 +9,6 @@ import org.lowcoder.domain.authentication.context.FormAuthRequestContext; import org.lowcoder.domain.user.model.AuthUser; import org.lowcoder.sdk.config.CommonConfig; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import reactor.core.publisher.Mono; diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/MigrateAuthConfigJobImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/MigrateAuthConfigJobImpl.java index ab729e2e7..d86615959 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/MigrateAuthConfigJobImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/MigrateAuthConfigJobImpl.java @@ -1,7 +1,5 @@ package org.lowcoder.runner.migrations.job; -import java.util.List; - import org.apache.commons.collections4.CollectionUtils; import org.lowcoder.domain.organization.model.Organization; import org.lowcoder.domain.organization.model.OrganizationDomain; @@ -15,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.List; + @Component public class MigrateAuthConfigJobImpl implements MigrateAuthConfigJob { diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/framework/configuration/CommonConfigTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/framework/configuration/CommonConfigTest.java index 83ffbb979..1bb6439ef 100644 --- a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/framework/configuration/CommonConfigTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/framework/configuration/CommonConfigTest.java @@ -1,10 +1,10 @@ package org.lowcoder.api.framework.configuration; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.Test; import org.lowcoder.sdk.config.CommonConfig; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CommonConfigTest { From 42c894ec5a46def2fbdc7098ede0c868bed151a5 Mon Sep 17 00:00:00 2001 From: Ludo Mikula Date: Sat, 18 May 2024 11:46:57 +0200 Subject: [PATCH 2/2] fix: add openapi descriptions for lost password endpoints --- .../lowcoder/api/usermanagement/UserEndpoints.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserEndpoints.java index 196925134..c58116272 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserEndpoints.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserEndpoints.java @@ -121,9 +121,21 @@ public interface UserEndpoints @PostMapping("/reset-password") public Mono> resetPassword(@RequestBody ResetPasswordRequest request); + @Operation( + tags = TAG_USER_PASSWORD_MANAGEMENT, + operationId = "lostPassword", + summary = "Lost User Password", + description = "Initiate a Lost Password recovery process." + ) @PostMapping("/lost-password") public Mono> lostPassword(@RequestBody LostPasswordRequest request); + @Operation( + tags = TAG_USER_PASSWORD_MANAGEMENT, + operationId = "resetLostPassword", + summary = "Reset Lost User Password", + description = "Resets lost password based on the token from lost password email." + ) @PostMapping("/reset-lost-password") public Mono> resetLostPassword(@RequestBody ResetLostPasswordRequest request);