Skip to content

Commit 680a9b2

Browse files
FalkWolskyFalkWolsky
authored
Merge pull request #272 from aq-ikhwa-tech/fix-build-failures
Fix Build Failures For Lowcoder-Root Module ( API Service )
2 parents a463d13 + 7ae95c1 commit 680a9b2

File tree

32 files changed

+258
-293
lines changed

32 files changed

+258
-293
lines changed

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/MongoConfig.java‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package org.lowcoder.domain.configurations;
22

3-
import java.util.List;
4-
5-
import javax.annotation.PostConstruct;
6-
3+
import com.github.cloudyrock.mongock.driver.mongodb.springdata.v3.SpringDataMongoV3Driver;
4+
import com.github.cloudyrock.spring.v5.MongockSpring5;
5+
import com.mongodb.ReadConcern;
6+
import com.mongodb.ReadPreference;
7+
import com.mongodb.WriteConcern;
8+
import jakarta.annotation.PostConstruct;
9+
import lombok.extern.slf4j.Slf4j;
710
import org.lowcoder.domain.user.model.User;
811
import org.lowcoder.sdk.config.MaterialProperties;
912
import org.lowcoder.sdk.models.HasIdAndAuditing;
@@ -23,13 +26,7 @@
2326
import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories;
2427
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
2528

26-
import com.github.cloudyrock.mongock.driver.mongodb.springdata.v3.SpringDataMongoV3Driver;
27-
import com.github.cloudyrock.spring.v5.MongockSpring5;
28-
import com.mongodb.ReadConcern;
29-
import com.mongodb.ReadPreference;
30-
import com.mongodb.WriteConcern;
31-
32-
import lombok.extern.slf4j.Slf4j;
29+
import java.util.List;
3330

3431
@Slf4j
3532
@Configuration

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/ClientBasedConnectionPool.java‎

Lines changed: 19 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,10 @@
11
package org.lowcoder.domain.datasource.service.impl;
22

3-
import static org.lowcoder.infra.perf.PerfEvent.CLIENT_BASED_CONNECTION_CREATE;
4-
import static org.lowcoder.infra.perf.PerfEvent.CLIENT_BASED_CONNECTION_REMOVE;
5-
import static org.lowcoder.infra.perf.PerfEvent.CLIENT_BASED_CONNECTION_SIZE;
6-
import static org.lowcoder.infra.perf.PerfEvent.HIKARI_POOL_ACTIVE_CONNECTIONS;
7-
import static org.lowcoder.infra.perf.PerfEvent.HIKARI_POOL_IDLE_CONNECTIONS;
8-
import static org.lowcoder.infra.perf.PerfEvent.HIKARI_POOL_TOTAL_CONNECTIONS;
9-
import static org.lowcoder.infra.perf.PerfEvent.HIKARI_POOL_WAITING_CONNECTIONS;
10-
import static org.lowcoder.sdk.exception.BizError.PLUGIN_CREATE_CONNECTION_FAILED;
11-
import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler;
12-
13-
import java.time.Duration;
14-
import java.time.Instant;
15-
import java.util.List;
16-
import java.util.Map;
17-
import java.util.Map.Entry;
18-
import java.util.Objects;
19-
import java.util.concurrent.ConcurrentHashMap;
20-
import java.util.stream.Collectors;
21-
22-
import javax.annotation.Nonnull;
23-
import javax.annotation.Nullable;
24-
import javax.annotation.PostConstruct;
25-
3+
import com.google.common.cache.*;
4+
import com.google.common.collect.ImmutableList;
5+
import io.micrometer.core.instrument.Tags;
6+
import jakarta.annotation.PostConstruct;
7+
import lombok.extern.slf4j.Slf4j;
268
import org.apache.commons.lang3.StringUtils;
279
import org.lowcoder.domain.datasource.model.ClientBasedDatasourceConnectionHolder;
2810
import org.lowcoder.domain.datasource.model.Datasource;
@@ -38,17 +20,22 @@
3820
import org.lowcoder.sdk.plugin.common.sql.HikariPerfWrapper;
3921
import org.springframework.beans.factory.annotation.Autowired;
4022
import org.springframework.stereotype.Service;
23+
import reactor.core.publisher.Mono;
4124

42-
import com.google.common.cache.CacheBuilder;
43-
import com.google.common.cache.CacheLoader;
44-
import com.google.common.cache.LoadingCache;
45-
import com.google.common.cache.RemovalListener;
46-
import com.google.common.cache.RemovalNotification;
47-
import com.google.common.collect.ImmutableList;
25+
import javax.annotation.Nonnull;
26+
import javax.annotation.Nullable;
27+
import java.time.Duration;
28+
import java.time.Instant;
29+
import java.util.List;
30+
import java.util.Map;
31+
import java.util.Map.Entry;
32+
import java.util.Objects;
33+
import java.util.concurrent.ConcurrentHashMap;
34+
import java.util.stream.Collectors;
4835

49-
import io.micrometer.core.instrument.Tags;
50-
import lombok.extern.slf4j.Slf4j;
51-
import reactor.core.publisher.Mono;
36+
import static org.lowcoder.infra.perf.PerfEvent.*;
37+
import static org.lowcoder.sdk.exception.BizError.PLUGIN_CREATE_CONNECTION_FAILED;
38+
import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler;
5239

5340
/**
5441
* for hikari pool/redis client/es client/..., these clients has taken over underlying connections

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/DatasourceConnectionPoolFacade.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
package org.lowcoder.domain.datasource.service.impl;
22

3-
import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.REST_API;
4-
5-
import java.util.List;
6-
import java.util.Map;
7-
import java.util.function.Function;
8-
import java.util.stream.Collectors;
9-
10-
import javax.annotation.PostConstruct;
11-
3+
import jakarta.annotation.PostConstruct;
4+
import lombok.extern.slf4j.Slf4j;
125
import org.lowcoder.domain.datasource.model.Datasource;
136
import org.lowcoder.domain.datasource.model.DatasourceConnectionHolder;
147
import org.lowcoder.domain.datasource.service.DatasourceConnectionPool;
@@ -22,10 +15,15 @@
2215
import org.springframework.beans.factory.annotation.Autowired;
2316
import org.springframework.context.annotation.Primary;
2417
import org.springframework.stereotype.Service;
25-
26-
import lombok.extern.slf4j.Slf4j;
2718
import reactor.core.publisher.Mono;
2819

20+
import java.util.List;
21+
import java.util.Map;
22+
import java.util.function.Function;
23+
import java.util.stream.Collectors;
24+
25+
import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.REST_API;
26+
2927
@Primary
3028
@Service
3129
@Slf4j

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java‎

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,8 @@
11
package org.lowcoder.domain.user.service;
22

33

4-
import static com.google.common.collect.Sets.newHashSet;
5-
import static org.lowcoder.domain.user.model.UserDetail.ANONYMOUS_CURRENT_USER;
6-
import static org.lowcoder.sdk.constants.GlobalContext.CLIENT_IP;
7-
import static org.lowcoder.sdk.util.ExceptionUtils.ofError;
8-
import static org.lowcoder.sdk.util.ExceptionUtils.ofException;
9-
10-
import java.security.SecureRandom;
11-
import java.util.Collection;
12-
import java.util.List;
13-
import java.util.Locale;
14-
import java.util.Map;
15-
import java.util.Objects;
16-
import java.util.Optional;
17-
import java.util.Set;
18-
import java.util.function.Function;
19-
import java.util.stream.Collectors;
20-
21-
import javax.annotation.Nonnull;
22-
import javax.annotation.PostConstruct;
23-
4+
import jakarta.annotation.PostConstruct;
5+
import lombok.extern.slf4j.Slf4j;
246
import org.apache.commons.lang3.ObjectUtils;
257
import org.apache.commons.lang3.RandomStringUtils;
268
import org.apache.commons.lang3.StringUtils;
@@ -34,11 +16,7 @@
3416
import org.lowcoder.domain.group.service.GroupService;
3517
import org.lowcoder.domain.organization.model.OrgMember;
3618
import org.lowcoder.domain.organization.service.OrgMemberService;
37-
import org.lowcoder.domain.user.model.AuthUser;
38-
import org.lowcoder.domain.user.model.Connection;
39-
import org.lowcoder.domain.user.model.User;
40-
import org.lowcoder.domain.user.model.UserDetail;
41-
import org.lowcoder.domain.user.model.UserState;
19+
import org.lowcoder.domain.user.model.*;
4220
import org.lowcoder.domain.user.model.User.TransformedUserInfo;
4321
import org.lowcoder.domain.user.repository.UserRepository;
4422
import org.lowcoder.infra.mongo.MongoUpsertHelper;
@@ -57,11 +35,21 @@
5735
import org.springframework.http.codec.multipart.Part;
5836
import org.springframework.stereotype.Service;
5937
import org.springframework.web.server.ServerWebExchange;
60-
61-
import lombok.extern.slf4j.Slf4j;
6238
import reactor.core.publisher.Flux;
6339
import reactor.core.publisher.Mono;
6440

41+
import javax.annotation.Nonnull;
42+
import java.security.SecureRandom;
43+
import java.util.*;
44+
import java.util.function.Function;
45+
import java.util.stream.Collectors;
46+
47+
import static com.google.common.collect.Sets.newHashSet;
48+
import static org.lowcoder.domain.user.model.UserDetail.ANONYMOUS_CURRENT_USER;
49+
import static org.lowcoder.sdk.constants.GlobalContext.CLIENT_IP;
50+
import static org.lowcoder.sdk.util.ExceptionUtils.ofError;
51+
import static org.lowcoder.sdk.util.ExceptionUtils.ofException;
52+
6553
@Slf4j
6654
@Service
6755
public class UserServiceImpl implements UserService {

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfigFactory.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
package org.lowcoder.infra.config;
22

3-
import static java.util.Collections.emptyMap;
4-
import static java.util.stream.Collectors.toUnmodifiableMap;
5-
import static org.lowcoder.sdk.util.JsonUtils.toJson;
6-
7-
import java.time.Duration;
8-
import java.util.Map;
9-
10-
import javax.annotation.Nullable;
11-
import javax.annotation.PostConstruct;
12-
3+
import jakarta.annotation.PostConstruct;
4+
import lombok.extern.slf4j.Slf4j;
135
import org.lowcoder.infra.config.model.ServerConfig;
146
import org.lowcoder.infra.config.repository.ServerConfigRepository;
157
import org.lowcoder.infra.localcache.ReloadableCache;
168
import org.springframework.beans.factory.annotation.Autowired;
179
import org.springframework.stereotype.Component;
1810

19-
import lombok.extern.slf4j.Slf4j;
11+
import javax.annotation.Nullable;
12+
import java.time.Duration;
13+
import java.util.Map;
14+
15+
import static java.util.Collections.emptyMap;
16+
import static java.util.stream.Collectors.toUnmodifiableMap;
17+
import static org.lowcoder.sdk.util.JsonUtils.toJson;
2018

2119
@Slf4j
2220
@Component

‎server/api-service/lowcoder-plugins/graphqlPlugin/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@
127127
<artifactId>netty-http-authenticator</artifactId>
128128
<version>1.5</version>
129129
</dependency>
130+
<dependency>
131+
<groupId>org.mongodb</groupId>
132+
<artifactId>mongo-java-driver</artifactId>
133+
</dependency>
130134
</dependencies>
131135

132136
<build>

‎server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLExecutor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ private QueryExecutionResult convertToQueryExecutionResult(ResponseEntity<byte[]
377377
HttpHeaders headers = stringResponseEntity.getHeaders();
378378
MediaType contentType = firstNonNull(headers.getContentType(), MediaType.TEXT_PLAIN); // text type if null
379379
byte[] body = stringResponseEntity.getBody();
380-
HttpStatus statusCode = stringResponseEntity.getStatusCode();
380+
HttpStatus statusCode = HttpStatus.resolve(stringResponseEntity.getStatusCode().value());
381381
JsonNode resultHeaders = parseExecuteResultHeaders(headers);
382382

383383
if (body == null) {

‎server/api-service/lowcoder-plugins/restApiPlugin/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@
9696
<artifactId>spring-test</artifactId>
9797
<scope>test</scope>
9898
</dependency>
99+
<dependency>
100+
<groupId>org.mongodb</groupId>
101+
<artifactId>mongo-java-driver</artifactId>
102+
</dependency>
99103

100104
</dependencies>
101105

‎server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiExecutor.java‎

Lines changed: 34 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -19,46 +19,12 @@
1919

2020
package org.lowcoder.plugin.restapi;
2121

22-
import static com.google.common.base.MoreObjects.firstNonNull;
23-
import static org.apache.commons.collections4.MapUtils.emptyIfNull;
24-
import static org.apache.commons.lang3.StringUtils.trimToEmpty;
25-
import static org.lowcoder.plugin.restapi.RestApiError.REST_API_EXECUTION_ERROR;
26-
import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.isBinary;
27-
import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.isJson;
28-
import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.isJsonContentType;
29-
import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.isPicture;
30-
import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.isValidContentType;
31-
import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.parseContentType;
32-
import static org.lowcoder.sdk.exception.PluginCommonError.JSON_PARSE_ERROR;
33-
import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR;
34-
import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR;
35-
import static org.lowcoder.sdk.plugin.restapi.DataUtils.convertToMultiformFileValue;
36-
import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH;
37-
import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.OAUTH2_INHERIT_FROM_LOGIN;
38-
import static org.lowcoder.sdk.util.ExceptionUtils.propagateError;
39-
import static org.lowcoder.sdk.util.JsonUtils.readTree;
40-
import static org.lowcoder.sdk.util.JsonUtils.toJsonThrows;
41-
import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJson;
42-
import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString;
43-
import static org.lowcoder.sdk.util.StreamUtils.collectList;
44-
45-
import java.io.IOException;
46-
import java.net.URI;
47-
import java.net.URISyntaxException;
48-
import java.nio.charset.StandardCharsets;
49-
import java.text.ParseException;
50-
import java.util.ArrayList;
51-
import java.util.HashMap;
52-
import java.util.HashSet;
53-
import java.util.List;
54-
import java.util.Map;
55-
import java.util.Set;
56-
import java.util.function.Consumer;
57-
import java.util.stream.Collectors;
58-
import java.util.stream.Stream;
59-
60-
import javax.annotation.Nullable;
61-
22+
import com.fasterxml.jackson.core.JsonProcessingException;
23+
import com.fasterxml.jackson.databind.JsonNode;
24+
import com.fasterxml.jackson.databind.node.ObjectNode;
25+
import com.google.common.collect.ImmutableMap;
26+
import lombok.Builder;
27+
import lombok.Getter;
6228
import org.apache.commons.collections4.CollectionUtils;
6329
import org.apache.commons.lang3.ObjectUtils;
6430
import org.apache.commons.lang3.StringUtils;
@@ -86,27 +52,41 @@
8652
import org.lowcoder.sdk.query.QueryVisitorContext;
8753
import org.lowcoder.sdk.webclient.WebClientBuildHelper;
8854
import org.pf4j.Extension;
89-
import org.springframework.http.HttpCookie;
90-
import org.springframework.http.HttpHeaders;
91-
import org.springframework.http.HttpMethod;
92-
import org.springframework.http.HttpStatus;
93-
import org.springframework.http.MediaType;
94-
import org.springframework.http.ResponseEntity;
55+
import org.springframework.http.*;
9556
import org.springframework.http.client.reactive.ClientHttpRequest;
9657
import org.springframework.util.MultiValueMap;
9758
import org.springframework.web.reactive.function.BodyInserter;
9859
import org.springframework.web.reactive.function.BodyInserters;
9960
import org.springframework.web.reactive.function.client.ExchangeStrategies;
10061
import org.springframework.web.reactive.function.client.WebClient;
62+
import reactor.core.publisher.Mono;
10163

102-
import com.fasterxml.jackson.core.JsonProcessingException;
103-
import com.fasterxml.jackson.databind.JsonNode;
104-
import com.fasterxml.jackson.databind.node.ObjectNode;
105-
import com.google.common.collect.ImmutableMap;
64+
import javax.annotation.Nullable;
65+
import java.io.IOException;
66+
import java.net.URI;
67+
import java.net.URISyntaxException;
68+
import java.nio.charset.StandardCharsets;
69+
import java.text.ParseException;
70+
import java.util.*;
71+
import java.util.function.Consumer;
72+
import java.util.stream.Collectors;
73+
import java.util.stream.Stream;
10674

107-
import lombok.Builder;
108-
import lombok.Getter;
109-
import reactor.core.publisher.Mono;
75+
import static com.google.common.base.MoreObjects.firstNonNull;
76+
import static org.apache.commons.collections4.MapUtils.emptyIfNull;
77+
import static org.apache.commons.lang3.StringUtils.trimToEmpty;
78+
import static org.lowcoder.plugin.restapi.RestApiError.REST_API_EXECUTION_ERROR;
79+
import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.*;
80+
import static org.lowcoder.sdk.exception.PluginCommonError.*;
81+
import static org.lowcoder.sdk.plugin.restapi.DataUtils.convertToMultiformFileValue;
82+
import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH;
83+
import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.OAUTH2_INHERIT_FROM_LOGIN;
84+
import static org.lowcoder.sdk.util.ExceptionUtils.propagateError;
85+
import static org.lowcoder.sdk.util.JsonUtils.readTree;
86+
import static org.lowcoder.sdk.util.JsonUtils.toJsonThrows;
87+
import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJson;
88+
import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString;
89+
import static org.lowcoder.sdk.util.StreamUtils.collectList;
11090

11191
@Extension
11292
public class RestApiExecutor implements QueryExecutor<RestApiDatasourceConfig, Object, RestApiQueryExecutionContext> {
@@ -382,7 +362,7 @@ private QueryExecutionResult convertToQueryExecutionResult(ResponseEntity<byte[]
382362
HttpHeaders headers = responseEntity.getHeaders();
383363
MediaType contentType = firstNonNull(headers.getContentType(), MediaType.TEXT_PLAIN); // text type if null
384364
byte[] body = responseEntity.getBody();
385-
HttpStatus statusCode = responseEntity.getStatusCode();
365+
HttpStatus statusCode = HttpStatus.resolve(responseEntity.getStatusCode().value());
386366
JsonNode resultHeaders = parseExecuteResultHeaders(headers);
387367

388368
if (body == null) {

‎server/api-service/lowcoder-sdk/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,5 +167,9 @@
167167
<groupId>jakarta.annotation</groupId>
168168
<artifactId>jakarta.annotation-api</artifactId>
169169
</dependency>
170+
<dependency>
171+
<groupId>javax.validation</groupId>
172+
<artifactId>validation-api</artifactId>
173+
</dependency>
170174
</dependencies>
171175
</project>

0 commit comments

Comments
 (0)