Skip to content

Commit 85d6e1e

Browse files
ludomikulaludomikula
committed
fix: converst javax to jakarta
1 parent b9f936d commit 85d6e1e

File tree

106 files changed

+1011
-1511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1011
-1511
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@
7373
<version>6.5.0.202303070854-r</version>
7474
</dependency>
7575

76+
<dependency>
77+
<groupId>jakarta.persistence</groupId>
78+
<artifactId>jakarta.persistence-api</artifactId>
79+
<version>3.1.0</version>
80+
</dependency>
81+
7682
<dependency>
7783
<groupId>org.apache.commons</groupId>
7884
<artifactId>commons-collections4</artifactId>
@@ -137,7 +143,22 @@
137143
<dependency>
138144
<groupId>com.querydsl</groupId>
139145
<artifactId>querydsl-apt</artifactId>
146+
<version>5.1.0</version>
147+
<classifier>jakarta</classifier>
148+
</dependency>
149+
150+
<dependency>
151+
<groupId>com.querydsl</groupId>
152+
<artifactId>querydsl-jpa</artifactId>
153+
<version>5.1.0</version>
154+
<classifier>jakarta</classifier>
155+
</dependency>
156+
157+
<dependency>
158+
<groupId>com.querydsl</groupId>
159+
<artifactId>querydsl-mongodb</artifactId>
140160
<version>5.0.0</version>
161+
<classifier>jakarta</classifier>
141162
</dependency>
142163

143164
<dependency>

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

Lines changed: 64 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>lowcoder-root</artifactId>
77
<groupId>org.lowcoder</groupId>
8-
<version>${revision}</version>
8+
<version>${revision}</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -39,6 +39,10 @@
3939
<groupId>org.slf4j</groupId>
4040
<artifactId>slf4j-log4j12</artifactId>
4141
</exclusion>
42+
<exclusion>
43+
<groupId>javax.annotation</groupId>
44+
<artifactId>javax.annotation-api</artifactId>
45+
</exclusion>
4246
</exclusions>
4347
</dependency>
4448

@@ -63,6 +67,10 @@
6367
<groupId>com.google.guava</groupId>
6468
<artifactId>guava</artifactId>
6569
</exclusion>
70+
<exclusion>
71+
<groupId>javax.inject</groupId>
72+
<artifactId>javax.inject</artifactId>
73+
</exclusion>
6674
</exclusions>
6775
</dependency>
6876
<dependency>
@@ -140,6 +148,7 @@
140148
<dependency>
141149
<groupId>com.querydsl</groupId>
142150
<artifactId>querydsl-apt</artifactId>
151+
<classifier>jakarta</classifier>
143152
<exclusions>
144153
<exclusion>
145154
<groupId>com.google.guava</groupId>
@@ -150,6 +159,11 @@
150159
<dependency>
151160
<groupId>com.querydsl</groupId>
152161
<artifactId>querydsl-jpa</artifactId>
162+
<classifier>jakarta</classifier>
163+
</dependency>
164+
<dependency>
165+
<groupId>jakarta.persistence</groupId>
166+
<artifactId>jakarta.persistence-api</artifactId>
153167
</dependency>
154168

155169
<dependency>
@@ -191,11 +205,11 @@
191205
<groupId>es.moki.ratelimitj</groupId>
192206
<artifactId>ratelimitj-redis</artifactId>
193207
<exclusions>
194-
<exclusion>
195-
<groupId>io.lettuce</groupId>
196-
<artifactId>lettuce-core</artifactId>
197-
</exclusion>
198-
</exclusions>
208+
<exclusion>
209+
<groupId>io.lettuce</groupId>
210+
<artifactId>lettuce-core</artifactId>
211+
</exclusion>
212+
</exclusions>
199213
</dependency>
200214

201215
<dependency>
@@ -234,13 +248,13 @@
234248
<scope>test</scope>
235249
</dependency>
236250

237-
<dependency>
238-
<groupId>jakarta.xml.bind</groupId>
239-
<artifactId>jakarta.xml.bind-api</artifactId>
251+
<dependency>
252+
<groupId>jakarta.xml.bind</groupId>
253+
<artifactId>jakarta.xml.bind-api</artifactId>
240254
</dependency>
241-
<dependency>
242-
<groupId>jakarta.activation</groupId>
243-
<artifactId>jakarta.activation-api</artifactId>
255+
<dependency>
256+
<groupId>jakarta.activation</groupId>
257+
<artifactId>jakarta.activation-api</artifactId>
244258
</dependency>
245259
<!-- no more than 2.3.3-->
246260
<dependency>
@@ -262,17 +276,38 @@
262276
<goal>process</goal>
263277
</goals>
264278
<configuration>
265-
<outputDirectory>target/generated-sources/java</outputDirectory>
266-
<processor>
267-
org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor
268-
</processor>
269-
<options>
270-
<querydsl.listAccessors>true</querydsl.listAccessors>
271-
</options>
279+
<outputDirectory>target/generated-sources</outputDirectory>
280+
<processor>org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor</processor>
272281
</configuration>
273282
</execution>
274283
</executions>
275284
</plugin>
285+
<!-- TODO: Use when querydsl-mongodb supports jakarta annotations
286+
<plugin>
287+
<groupId>org.apache.maven.plugins</groupId>
288+
<artifactId>maven-compiler-plugin</artifactId>
289+
<configuration>
290+
<annotationProcessorPaths>
291+
<path>
292+
<groupId>com.querydsl</groupId>
293+
<artifactId>querydsl-apt</artifactId>
294+
<version>5.1.0</version>
295+
<classifier>jakarta</classifier>
296+
</path>
297+
<path>
298+
<groupId>jakarta.persistence</groupId>
299+
<artifactId>jakarta.persistence-api</artifactId>
300+
<version>3.1.0</version>
301+
</path>
302+
<path>
303+
<groupId>org.projectlombok</groupId>
304+
<artifactId>lombok</artifactId>
305+
<version>1.18.32</version>
306+
</path>
307+
</annotationProcessorPaths>
308+
</configuration>
309+
</plugin>
310+
-->
276311
</plugins>
277312
</build>
278313

@@ -282,15 +317,15 @@
282317
</properties>
283318

284319
<dependencyManagement>
285-
<dependencies>
286-
<dependency>
287-
<groupId>org.lowcoder</groupId>
288-
<artifactId>lowcoder-dependencies</artifactId>
289-
<version>${revision}</version>
290-
<type>pom</type>
291-
<scope>import</scope>
292-
</dependency>
293-
</dependencies>
294-
</dependencyManagement>
320+
<dependencies>
321+
<dependency>
322+
<groupId>org.lowcoder</groupId>
323+
<artifactId>lowcoder-dependencies</artifactId>
324+
<version>${revision}</version>
325+
<type>pom</type>
326+
<scope>import</scope>
327+
</dependency>
328+
</dependencies>
329+
</dependencyManagement>
295330

296331
</project>

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
package org.lowcoder.domain.application.repository;
22

33

4-
import java.util.Collection;
5-
6-
import javax.annotation.Nonnull;
7-
4+
import jakarta.annotation.Nonnull;
85
import org.lowcoder.domain.application.model.Application;
96
import org.lowcoder.domain.application.model.ApplicationStatus;
107
import org.springframework.data.mongodb.repository.Query;
118
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
129
import org.springframework.stereotype.Repository;
13-
1410
import reactor.core.publisher.Flux;
1511
import reactor.core.publisher.Mono;
1612

13+
import java.util.Collection;
14+
1715
@Repository
1816
public interface ApplicationRepository extends ReactiveMongoRepository<Application, String>, CustomApplicationRepository {
1917

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/service/AssetServiceImpl.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
package org.lowcoder.domain.asset.service;
22

3-
import java.awt.Color;
4-
import java.awt.Image;
5-
import java.awt.image.BufferedImage;
6-
import java.io.ByteArrayOutputStream;
7-
import java.io.IOException;
8-
import java.util.Set;
9-
10-
import javax.imageio.ImageIO;
11-
3+
import lombok.extern.slf4j.Slf4j;
124
import org.lowcoder.domain.asset.model.Asset;
135
import org.lowcoder.sdk.config.dynamic.Conf;
146
import org.lowcoder.sdk.config.dynamic.ConfigCenter;
@@ -25,11 +17,16 @@
2517
import org.springframework.http.server.reactive.ServerHttpResponse;
2618
import org.springframework.stereotype.Service;
2719
import org.springframework.web.server.ServerWebExchange;
28-
29-
import lombok.extern.slf4j.Slf4j;
3020
import reactor.core.publisher.Flux;
3121
import reactor.core.publisher.Mono;
3222

23+
import javax.imageio.ImageIO;
24+
import java.awt.*;
25+
import java.awt.image.BufferedImage;
26+
import java.io.ByteArrayOutputStream;
27+
import java.io.IOException;
28+
import java.util.Set;
29+
3330
@Slf4j
3431
@Service
3532
public class AssetServiceImpl implements AssetService {

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/FindAuthConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.lowcoder.domain.authentication;
22

3-
import javax.annotation.Nullable;
43

4+
import jakarta.annotation.Nullable;
55
import org.lowcoder.domain.organization.model.Organization;
66
import org.lowcoder.sdk.auth.AbstractAuthConfig;
77

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/context/AuthRequestContext.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package org.lowcoder.domain.authentication.context;
22

3-
import javax.annotation.Nullable;
4-
5-
import org.lowcoder.sdk.auth.AbstractAuthConfig;
63

4+
import jakarta.annotation.Nullable;
75
import lombok.Getter;
86
import lombok.Setter;
7+
import org.lowcoder.sdk.auth.AbstractAuthConfig;
98

109
@Setter
1110
@Getter

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
package org.lowcoder.domain.datasource.model;
22

3-
import static org.lowcoder.domain.datasource.model.DatasourceCreationSource.LEGACY_WORKSPACE_PREDEFINED;
4-
import static org.lowcoder.domain.datasource.model.DatasourceCreationSource.SYSTEM_STATIC;
5-
import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.GRAPHQL_API;
6-
import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.REST_API;
7-
8-
import java.util.Locale;
9-
import java.util.Optional;
10-
import java.util.Set;
11-
12-
import javax.annotation.Nullable;
13-
14-
import com.fasterxml.jackson.annotation.JsonCreator;
15-
import lombok.AllArgsConstructor;
3+
import com.fasterxml.jackson.annotation.JsonIgnore;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import jakarta.annotation.Nullable;
6+
import lombok.Getter;
167
import lombok.NoArgsConstructor;
8+
import lombok.Setter;
179
import lombok.experimental.SuperBuilder;
1810
import lombok.extern.jackson.Jacksonized;
1911
import org.apache.commons.lang3.ObjectUtils;
@@ -28,12 +20,14 @@
2820
import org.lowcoder.sdk.util.LocaleUtils;
2921
import org.springframework.data.annotation.Transient;
3022

31-
import com.fasterxml.jackson.annotation.JsonIgnore;
32-
import com.fasterxml.jackson.annotation.JsonProperty;
23+
import java.util.Locale;
24+
import java.util.Optional;
25+
import java.util.Set;
3326

34-
import lombok.Getter;
35-
import lombok.Setter;
36-
import org.springframework.data.mongodb.core.mapping.Document;
27+
import static org.lowcoder.domain.datasource.model.DatasourceCreationSource.LEGACY_WORKSPACE_PREDEFINED;
28+
import static org.lowcoder.domain.datasource.model.DatasourceCreationSource.SYSTEM_STATIC;
29+
import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.GRAPHQL_API;
30+
import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.REST_API;
3731

3832
@Getter
3933
@Setter

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package org.lowcoder.domain.datasource.service;
22

3-
import javax.annotation.Nullable;
4-
3+
import jakarta.annotation.Nullable;
54
import org.lowcoder.domain.datasource.model.Datasource;
65
import org.lowcoder.domain.datasource.model.DatasourceConnectionHolder;
7-
86
import reactor.core.publisher.Mono;
97

108
public interface DatasourceConnectionPool {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import com.google.common.cache.*;
44
import com.google.common.collect.ImmutableList;
55
import io.micrometer.core.instrument.Tags;
6+
import jakarta.annotation.Nonnull;
7+
import jakarta.annotation.Nullable;
68
import jakarta.annotation.PostConstruct;
79
import lombok.extern.slf4j.Slf4j;
810
import org.apache.commons.lang3.StringUtils;
@@ -22,8 +24,6 @@
2224
import org.springframework.stereotype.Service;
2325
import reactor.core.publisher.Mono;
2426

25-
import javax.annotation.Nonnull;
26-
import javax.annotation.Nullable;
2727
import java.time.Duration;
2828
import java.time.Instant;
2929
import java.util.List;

0 commit comments

Comments
 (0)