Skip to content

Commit f29ac54

Browse files
FalkWolskyFalkWolsky
authored
Merge branch 'main' into feature/lottie-animation
2 parents 11619ae + 680a9b2 commit f29ac54

File tree

36 files changed

+267
-301
lines changed

36 files changed

+267
-301
lines changed

‎.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
- uses: actions/checkout@v3
2222
with:
2323
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
24+
ref: ${{ github.event.pull_request.head.sha }}
2425
- name: Build Java
2526
run: |
2627
mvn clean compile -DskipTests -f ./server/api-service/pom.xml

‎client/packages/lowcoder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"eslint-plugin-only-ascii": "^0.0.0",
121121
"http-proxy-middleware": "^2.0.6",
122122
"lowcoder-dev-utils": "workspace:^",
123-
"rollup-plugin-visualizer": "^5.8.3",
123+
"rollup-plugin-visualizer": "^5.9.2",
124124
"typescript": "^4.8.4",
125125
"vite": "^4.3.9",
126126
"vite-plugin-checker": "^0.5.1",

‎client/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11521,7 +11521,7 @@ __metadata:
1152111521
rehype-sanitize: ^5.0.1
1152211522
remark-gfm: ^3.0.1
1152311523
resize-observer-polyfill: ^1.5.1
11524-
rollup-plugin-visualizer: ^5.8.3
11524+
rollup-plugin-visualizer: ^5.9.2
1152511525
simplebar-react: 2.3.6
1152611526
sql-formatter: ^8.2.0
1152711527
styled-components: ^5.3.3
@@ -15668,9 +15668,9 @@ __metadata:
1566815668
languageName: node
1566915669
linkType: hard
1567015670

15671-
"rollup-plugin-visualizer@npm:^5.8.3":
15672-
version: 5.9.0
15673-
resolution: "rollup-plugin-visualizer@npm:5.9.0"
15671+
"rollup-plugin-visualizer@npm:^5.9.2":
15672+
version: 5.9.2
15673+
resolution: "rollup-plugin-visualizer@npm:5.9.2"
1567415674
dependencies:
1567515675
open: ^8.4.0
1567615676
picomatch: ^2.3.1
@@ -15683,7 +15683,7 @@ __metadata:
1568315683
optional: true
1568415684
bin:
1568515685
rollup-plugin-visualizer: dist/bin/cli.js
15686-
checksum: 362d4fac0295c14bd205dbc85c20c31f4b6c47604868da21d9565ed47e0333759f08b9fe0acb82f78221f5173ea01e4eb70d47351eb6012216afe71b5492ed5f
15686+
checksum: ab2adf322e3b20bffc94a8dc804f46be8840a9fcbab4f872dcc2dec205cdd7752e4d2d90cfcf00783bfb5209c5a8bb4e591984e8b61bca41fd048fb7deb0ed4e
1568715687
languageName: node
1568815688
linkType: hard
1568915689

‎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

0 commit comments

Comments
 (0)