Merge branch 'dev' into feature-horizontal-list

Author: FalkWolsky

deploy/docker/Dockerfile

@@ -12,8 +12,7 @@ RUN --mount=type=cache,target=/root/.m2 mvn -f pom.xml clean package -DskipTests
 RUN mkdir -p /lowcoder/api-service/config /lowcoder/api-service/logs /lowcoder/plugins
 
 # Copy lowcoder server configuration
-COPY server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml /lowcoder/api-service/config/
-COPY server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml /lowcoder/api-service/config/
+COPY server/api-service/lowcoder-server/src/main/resources/application.yaml /lowcoder/api-service/config/
 
 # Add bootstrapfile
 COPY deploy/docker/api-service/entrypoint.sh /lowcoder/api-service/entrypoint.sh

deploy/docker/api-service/entrypoint.sh

@@ -34,7 +34,7 @@ exec gosu ${USER_ID}:${GROUP_ID} ${JAVA_HOME}/bin/java \
   -Djava.security.egd=file:/dev/./urandom \
   -Dhttps.protocols=TLSv1.1,TLSv1.2 \
   -Dlog4j2.formatMsgNoLookups=true \
-  -Dspring.config.location="file:///lowcoder/api-service/config/application.yml,file:///lowcoder/api-service/config/application-selfhost.yml" \
+  -Dspring.config.location="file:///lowcoder/api-service/config/application.yaml" \
   --add-opens java.base/java.nio=ALL-UNNAMED \
   -cp "${LOWCODER_CLASSPATH:=.}" \
   ${JAVA_OPTS} \

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

@@ -44,7 +44,7 @@
 			<dependency>
 				<groupId>org.projectlombok</groupId>
 				<artifactId>lombok</artifactId>
-				<version>1.18.26</version>
+				<version>1.18.32</version>
 			</dependency>
 
 			<dependency>
@@ -222,7 +222,5 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-
-
 </project>
 

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

@@ -252,18 +252,6 @@
 
     <build>
         <plugins>
-			<plugin>
-	            <groupId>org.apache.maven.plugins</groupId>
-	            <artifactId>maven-compiler-plugin</artifactId>
-	            <configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target> 
-	                <compilerArgs>
-	                    <arg>-parameters</arg>
-	                </compilerArgs>
-	            </configuration>
-	        </plugin>
-			
             <plugin>
                 <groupId>com.mysema.maven</groupId>
                 <artifactId>apt-maven-plugin</artifactId>
@@ -291,8 +279,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <java.version>17</java.version>
     </properties>
 
     <dependencyManagement>

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java

@@ -12,7 +12,10 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
+import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.jackson.Jacksonized;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.lowcoder.domain.query.model.ApplicationQuery;
@@ -30,14 +33,18 @@
 import lombok.Builder;
 
 @Document
+@Jacksonized
+@SuperBuilder
+@NoArgsConstructor
 public class Application extends HasIdAndAuditing {
 
-    private final String organizationId;
-    private final String name;
-    private final Integer applicationType;
-    private final ApplicationStatus applicationStatus;
+    private String organizationId;
+    private String name;
+    private Integer applicationType;
+    private ApplicationStatus applicationStatus;
 
-    private final Map<String, Object> publishedApplicationDSL;
+    private Map<String, Object> publishedApplicationDSL;
+    private Map<String, Object> editingApplicationDSL;
 
     @Setter
     private Boolean publicToAll;
@@ -46,7 +53,27 @@ public class Application extends HasIdAndAuditing {
     @Setter
     private Boolean agencyProfile;
 
-    private Map<String, Object> editingApplicationDSL;
+    public Application(
+            @JsonProperty("orgId") String organizationId,
+            @JsonProperty("name") String name,
+            @JsonProperty("applicationType") Integer applicationType,
+            @JsonProperty("applicationStatus") ApplicationStatus applicationStatus,
+            @JsonProperty("publishedApplicationDSL") Map<String, Object> publishedApplicationDSL,
+            @JsonProperty("editingApplicationDSL") Map<String, Object> editingApplicationDSL,
+            @JsonProperty("publicToAll") Boolean publicToAll,
+            @JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
+            @JsonProperty("agencyProfile") Boolean agencyProfile
+    ) {
+        this.organizationId = organizationId;
+        this.name = name;
+        this.applicationType = applicationType;
+        this.applicationStatus = applicationStatus;
+        this.publishedApplicationDSL = publishedApplicationDSL;
+        this.publicToAll = publicToAll;
+        this.publicToMarketplace = publicToMarketplace;
+        this.agencyProfile = agencyProfile;
+        this.editingApplicationDSL = editingApplicationDSL;
+    }
 
     @Transient
     private final Supplier<Set<ApplicationQuery>> editingQueries =
@@ -73,31 +100,6 @@ public class Application extends HasIdAndAuditing {
         return getContainerSizeFromDSL(getLiveApplicationDsl());
     });
 
-
-    @Builder
-    @JsonCreator
-    public Application(
-            @JsonProperty("orgId") String organizationId,
-            @JsonProperty("name") String name,
-            @JsonProperty("applicationType") Integer applicationType,
-            @JsonProperty("applicationStatus") ApplicationStatus applicationStatus,
-            @JsonProperty("publishedApplicationDSL") Map<String, Object> publishedApplicationDSL,
-            @JsonProperty("editingApplicationDSL") Map<String, Object> editingApplicationDSL,
-            @JsonProperty("publicToAll") Boolean publicToAll,
-            @JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
-            @JsonProperty("agencyProfile") Boolean agencyProfile
-        ) {
-        this.organizationId = organizationId;
-        this.name = name;
-        this.applicationType = applicationType;
-        this.applicationStatus = applicationStatus;
-        this.publishedApplicationDSL = publishedApplicationDSL;
-        this.publicToAll = publicToAll;
-        this.publicToMarketplace = publicToMarketplace;
-        this.agencyProfile = agencyProfile;
-        this.editingApplicationDSL = editingApplicationDSL;
-    }
-
     public Set<ApplicationQuery> getEditingQueries() {
         return editingQueries.get();
     }

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationHistorySnapshot.java

@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import lombok.NoArgsConstructor;
 import org.lowcoder.sdk.models.HasIdAndAuditing;
 import org.springframework.data.mongodb.core.mapping.Document;
 
@@ -13,6 +14,7 @@
 @Document
 @Getter
 @Setter
+@NoArgsConstructor
 public class ApplicationHistorySnapshot extends HasIdAndAuditing {
 
     private String applicationId;

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/UiItem.java

@@ -1,26 +1,29 @@
 package org.lowcoder.domain.asset.model;
 
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.jackson.Jacksonized;
 import org.lowcoder.sdk.models.HasIdAndAuditing;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.http.MediaType;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 @Document
+@Jacksonized
+@SuperBuilder
+@NoArgsConstructor
 public class Asset extends HasIdAndAuditing {
 
-    private final String contentType;
+    private String contentType;
 
-    private final byte[] data;
-
-    @JsonCreator
-    private Asset(String contentType, byte[] data) {
-        this.contentType = contentType;
-        this.data = data;
-    }
+    private byte[] data;
 
     public static Asset from(MediaType mediaType, byte[] data) {
-        return new Asset(mediaType == null ? null : mediaType.toString(), data);
+        return Asset.builder()
+                .contentType(mediaType == null ? null : mediaType.toString())
+                .data(data)
+                .build();
     }
 
     public String getContentType() {

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/model/Asset.java

@@ -11,6 +11,11 @@
 
 import javax.annotation.Nullable;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.jackson.Jacksonized;
 import org.apache.commons.lang3.ObjectUtils;
 import org.lowcoder.domain.plugin.DatasourceMetaInfoConstants;
 import org.lowcoder.domain.plugin.client.dto.DatasourcePluginDefinition;
@@ -28,9 +33,13 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 @Getter
 @Setter
+@SuperBuilder
+@Jacksonized
+@NoArgsConstructor
 public class Datasource extends HasIdAndAuditing {
 
     private static final DatasourceStatus DEFAULT_STATUS = DatasourceStatus.NORMAL;

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

@@ -2,6 +2,11 @@
 
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.jackson.Jacksonized;
 import org.lowcoder.sdk.models.HasIdAndAuditing;
 import org.springframework.data.mongodb.core.mapping.Document;
 
@@ -14,6 +19,10 @@
 @Document(collection = "datasource")
 @Getter
 @Setter
+@Jacksonized
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor(onConstructor_ = { @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)})
 public class DatasourceDO extends HasIdAndAuditing {
 
     private String name;

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

@@ -1,6 +1,7 @@
 package org.lowcoder.domain.datasource.model;
 
 
+import lombok.NoArgsConstructor;
 import org.lowcoder.sdk.models.DatasourceStructure;
 import org.lowcoder.sdk.models.HasIdAndAuditing;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -9,6 +10,7 @@
 
 @QueryExclude
 @Document(collection = "datasourceStructure")
+@NoArgsConstructor
 public class DatasourceStructureDO extends HasIdAndAuditing {
 
     private String datasourceId;

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

@@ -2,6 +2,9 @@
 
 import java.util.Map;
 
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.jackson.Jacksonized;
 import org.lowcoder.sdk.models.HasIdAndAuditing;
 import org.springframework.data.mongodb.core.mapping.Document;
 
@@ -14,6 +17,9 @@
 @Document(collection = "tokenBasedConnection")
 @Getter
 @Setter
+@Jacksonized
+@SuperBuilder
+@NoArgsConstructor
 public class TokenBasedConnectionDO extends HasIdAndAuditing {
 
     private String datasourceId;

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

@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import lombok.RequiredArgsConstructor;
 import org.lowcoder.domain.datasource.model.TokenBasedConnection;
 import org.lowcoder.domain.datasource.model.TokenBasedConnectionDO;
 import org.lowcoder.domain.encryption.EncryptionService;
@@ -16,19 +17,13 @@
 import reactor.core.publisher.Mono;
 
 @Repository
+@RequiredArgsConstructor
 public class TokenBasedConnectionRepository {
 
-    @Autowired
-    private TokenBasedConnectionDORepository tokenBasedConnectionDORepository;
-
-    @Autowired
-    private DatasourceMetaInfoService datasourceMetaInfoService;
-
-    @Autowired
-    private EncryptionService encryptionService;
-
-    @Autowired
-    private MongoUpsertHelper mongoUpsertHelper;
+    private final TokenBasedConnectionDORepository tokenBasedConnectionDORepository;
+    private final DatasourceMetaInfoService datasourceMetaInfoService;
+    private final EncryptionService encryptionService;
+    private final MongoUpsertHelper mongoUpsertHelper;
 
     public Mono<TokenBasedConnection> findByDatasourceId(String datasourceId, String datasourceType) {
         return tokenBasedConnectionDORepository.findByDatasourceId(datasourceId)
@@ -39,14 +34,16 @@ public Mono<Void> saveConnection(TokenBasedConnection tokenBasedConnection, Stri
 
         tokenBasedConnection.getTokenDetail().doEncrypt(encryptionService::encryptString);
 
-        TokenBasedConnectionDO result = new TokenBasedConnectionDO();
-        result.setDatasourceId(tokenBasedConnection.getDatasourceId());
-        result.setTokenDetail(tokenBasedConnection.getTokenDetail().toMap());
-        result.setId(tokenBasedConnection.getId());
-        result.setCreatedAt(tokenBasedConnection.getCreatedAt());
-        result.setUpdatedAt(tokenBasedConnection.getUpdatedAt());
-        result.setCreatedBy(tokenBasedConnection.getCreatedBy());
-        result.setModifiedBy(tokenBasedConnection.getModifiedBy());
+        TokenBasedConnectionDO result = TokenBasedConnectionDO.builder()
+                .datasourceId(tokenBasedConnection.getDatasourceId())
+                .tokenDetail(tokenBasedConnection.getTokenDetail().toMap())
+                .id(tokenBasedConnection.getId())
+                .createdAt(tokenBasedConnection.getCreatedAt())
+                .updatedAt(tokenBasedConnection.getUpdatedAt())
+                .createdBy(tokenBasedConnection.getCreatedBy())
+                .modifiedBy(tokenBasedConnection.getModifiedBy())
+                .build();
+
         return mongoUpsertHelper.upsertWithAuditingParams(result, "datasourceId", datasourceId)
                 .doOnNext(__ -> tokenBasedConnection.getTokenDetail().doDecrypt(encryptionService::decryptString))
                 .then();