Skip to content

WIP: Rebrand to Lowcoder #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
May 16, 2023
Merged

WIP: Rebrand to Lowcoder #134

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8f02a47
rebrand API server
ludomikula May 10, 2023
ea88857
refactor: rename openlocks-core to lowcoder-core
falnyr May 11, 2023
6d89a13
refactor: rename openblocks-dev-utils to lowcoder-dev-utils
falnyr May 11, 2023
e0ecb33
refactor: rename openblocks-design to lowcoder-design
falnyr May 11, 2023
0c119ad
refactor: rename openblocks-comps to lowcoder-comps
falnyr May 11, 2023
cf0a870
refactor: rename openblocks-sdk to lowcoder-sdk
falnyr May 11, 2023
dec2350
refactor: rename openblocks-ee to lowcoder-sdk
falnyr May 11, 2023
18aaffc
refactor: rename openblocks- lowcoder-
falnyr May 11, 2023
b04b0ff
refactor: rename /openblocks to /lowcoder
falnyr May 11, 2023
f75715f
refactor: rename openblocks. to lowcoder.
falnyr May 11, 2023
c1a25c5
refactor: rename openblocks to lowcoder
falnyr May 11, 2023
2f5a085
refactor: rename Openblocks to Lowcoder
falnyr May 11, 2023
7130095
refactor: rename OpenBlocks to Lowcoder
falnyr May 11, 2023
c6f85fc
refactor: rename openBlocks to lowcoder
falnyr May 11, 2023
3a58d5f
refactor: renamed folders
falnyr May 11, 2023
a1c5c16
refactor: renamed folders and files
falnyr May 13, 2023
54dd179
Merge branch 'main' into feat/rebrand
falnyr May 13, 2023
30adab5
refactor: replaced openblocks references with lowcoder
falnyr May 13, 2023
ee73078
refactor: renamed folders for sonarcloud
falnyr May 13, 2023
dc9b82c
chore: bumped versions and pushed to npm registry
falnyr May 13, 2023
784c8e0
refactor: updated dependencies, switched to lowcoder folder
falnyr May 16, 2023
9a62020
Downgraded reactor-core version.
ludomikula May 16, 2023
980b84f
Merge branch 'main' into feat/rebrand
ludomikula May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Next Next commit
rebrand API server
  • Loading branch information
@ludomikula
ludomikula committed May 10, 2023
commit 8f02a476da08a5513f4e91761c4409e5d020ec49
8 changes: 4 additions & 4 deletions deploy/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ RUN --mount=type=cache,target=/root/.m2 mvn -f pom.xml clean package -DskipTests
RUN mkdir -p /lowcoder/api-service/plugins /lowcoder/api-service/config /lowcoder/api-service/logs

# Define lowcoder main jar and plugin jars
ARG JAR_FILE=/lowcoder-server/openblocks-server/target/openblocks-server-1.0-SNAPSHOT.jar
ARG PLUGIN_JARS=/lowcoder-server/openblocks-plugins/*/target/*.jar
ARG JAR_FILE=/lowcoder-server/lowcoder-server/target/lowcoder-server-1.0-SNAPSHOT.jar
ARG PLUGIN_JARS=/lowcoder-server/lowcoder-plugins/*/target/*.jar

# Copy Java runtime for running server
COPY --from=jre-build /build/jre /lowcoder/api-service/jre
Expand All @@ -31,8 +31,8 @@ RUN cp ${JAR_FILE} /lowcoder/api-service/server.jar \
&& cp ${PLUGIN_JARS} /lowcoder/api-service/plugins/

# Copy lowcoder server configuration
COPY server/api-service/openblocks-server/src/main/resources/selfhost/ce/application.yml /lowcoder/api-service/config/
COPY server/api-service/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml /lowcoder/api-service/config/
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/

# Add bootstrapfile
COPY deploy/docker/api-service/entrypoint.sh /lowcoder/api-service/entrypoint.sh
Expand Down
41 changes: 11 additions & 30 deletions server/api-service/openblocks-domain/pom.xml → server/api-service/lowcoder-domain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>openblocks-root</artifactId>
<groupId>com.openblocks</groupId>
<artifactId>lowcoder-root</artifactId>
<groupId>org.lowcoder</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>openblocks-domain</artifactId>
<artifactId>lowcoder-domain</artifactId>
<version>1.0-SNAPSHOT</version>
<name>openblocks-domain</name>
<name>lowcoder-domain</name>

<dependencies>
<dependency>
<groupId>com.openblocks</groupId>
<artifactId>openblocks-ee</artifactId>
<groupId>org.lowcoder</groupId>
<artifactId>lowcoder-ee</artifactId>
<type>pom</type>
<version>1.0-SNAPSHOT</version>
</dependency>
Expand Down Expand Up @@ -50,13 +50,13 @@
</dependency>

<dependency>
<groupId>com.openblocks</groupId>
<artifactId>openblocks-sdk</artifactId>
<groupId>org.lowcoder</groupId>
<artifactId>lowcoder-sdk</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.openblocks</groupId>
<artifactId>openblocks-infra</artifactId>
<groupId>org.lowcoder</groupId>
<artifactId>lowcoder-infra</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>

Expand Down Expand Up @@ -271,30 +271,11 @@
</plugins>
</build>

<profiles>
<profile>
<id>selfhost-openblocks</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/*MajiangVersion.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>

</project>
</project>
2 changes: 1 addition & 1 deletion ...s/domain/application/ApplicationUtil.java → ...r/domain/application/ApplicationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.openblocks.domain.application;
package org.lowcoder.domain.application;

import java.util.Collections;
import java.util.List;
Expand Down
16 changes: 8 additions & 8 deletions ...domain/application/model/Application.java → ...domain/application/model/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.openblocks.domain.application.model;
package org.lowcoder.domain.application.model;


import static com.google.common.base.Suppliers.memoize;
import static com.openblocks.domain.application.ApplicationUtil.getContainerSizeFromDSL;
import static com.openblocks.domain.application.ApplicationUtil.getDependentModulesFromDsl;
import static java.util.Optional.ofNullable;
import static org.lowcoder.domain.application.ApplicationUtil.getContainerSizeFromDSL;
import static org.lowcoder.domain.application.ApplicationUtil.getDependentModulesFromDsl;

import java.util.Collections;
import java.util.Map;
Expand All @@ -14,17 +14,17 @@

import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.lowcoder.domain.query.model.ApplicationQuery;
import org.lowcoder.sdk.exception.BizError;
import org.lowcoder.sdk.exception.BizException;
import org.lowcoder.sdk.models.HasIdAndAuditing;
import org.lowcoder.sdk.util.JsonUtils;
import org.springframework.data.annotation.Transient;
import org.springframework.data.mongodb.core.mapping.Document;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.openblocks.domain.query.model.ApplicationQuery;
import com.openblocks.sdk.exception.BizError;
import com.openblocks.sdk.exception.BizException;
import com.openblocks.sdk.models.HasIdAndAuditing;
import com.openblocks.sdk.util.JsonUtils;

import lombok.Builder;

Expand Down
5 changes: 2 additions & 3 deletions ...ion/model/ApplicationHistorySnapshot.java → ...ion/model/ApplicationHistorySnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.openblocks.domain.application.model;
package org.lowcoder.domain.application.model;

import java.util.Map;

import org.lowcoder.sdk.models.HasIdAndAuditing;
import org.springframework.data.mongodb.core.mapping.Document;

import com.openblocks.sdk.models.HasIdAndAuditing;

import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
Expand Down
2 changes: 1 addition & 1 deletion .../application/model/ApplicationStatus.java → .../application/model/ApplicationStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.openblocks.domain.application.model;
package org.lowcoder.domain.application.model;

public enum ApplicationStatus {

Expand Down
2 changes: 1 addition & 1 deletion ...in/application/model/ApplicationType.java → ...in/application/model/ApplicationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.openblocks.domain.application.model;
package org.lowcoder.domain.application.model;

import java.util.Arrays;

Expand Down
2 changes: 1 addition & 1 deletion ...ocks/domain/application/model/UiItem.java → ...oder/domain/application/model/UiItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.openblocks.domain.application.model;
package org.lowcoder.domain.application.model;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
5 changes: 2 additions & 3 deletions ...ApplicationHistorySnapshotRepository.java → ...ApplicationHistorySnapshotRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.openblocks.domain.application.repository;
package org.lowcoder.domain.application.repository;

import org.lowcoder.domain.application.model.ApplicationHistorySnapshot;
import org.springframework.data.domain.Pageable;
import org.springframework.data.mongodb.repository.Query;
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
import org.springframework.stereotype.Repository;

import com.openblocks.domain.application.model.ApplicationHistorySnapshot;

import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

Expand Down
7 changes: 3 additions & 4 deletions ...ion/repository/ApplicationRepository.java → ...ion/repository/ApplicationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
package com.openblocks.domain.application.repository;
package org.lowcoder.domain.application.repository;


import java.util.Collection;
import java.util.List;

import javax.annotation.Nonnull;

import org.lowcoder.domain.application.model.Application;
import org.lowcoder.domain.application.model.ApplicationStatus;
import org.springframework.data.mongodb.repository.Query;
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
import org.springframework.stereotype.Repository;

import com.openblocks.domain.application.model.Application;
import com.openblocks.domain.application.model.ApplicationStatus;

import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

Expand Down
4 changes: 2 additions & 2 deletions ...pository/CustomApplicationRepository.java → ...pository/CustomApplicationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.openblocks.domain.application.repository;
package org.lowcoder.domain.application.repository;

import com.openblocks.domain.application.model.Application;
import org.lowcoder.domain.application.model.Application;

import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
Expand Down
5 changes: 2 additions & 3 deletions ...tory/CustomApplicationRepositoryImpl.java → ...tory/CustomApplicationRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.openblocks.domain.application.repository;
package org.lowcoder.domain.application.repository;

import org.lowcoder.domain.application.model.Application;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Repository;

import com.openblocks.domain.application.model.Application;

import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

Expand Down
5 changes: 2 additions & 3 deletions ...ce/ApplicationHistorySnapshotService.java → ...ce/ApplicationHistorySnapshotService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.openblocks.domain.application.service;
package org.lowcoder.domain.application.service;

import java.util.List;
import java.util.Map;

import org.lowcoder.domain.application.model.ApplicationHistorySnapshot;
import org.springframework.data.domain.PageRequest;

import com.openblocks.domain.application.model.ApplicationHistorySnapshot;

import reactor.core.publisher.Mono;

public interface ApplicationHistorySnapshotService {
Expand Down
26 changes: 13 additions & 13 deletions ...plication/service/ApplicationService.java → ...plication/service/ApplicationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
package com.openblocks.domain.application.service;
package org.lowcoder.domain.application.service;


import static com.openblocks.domain.application.ApplicationUtil.getDependentModulesFromDsl;
import static org.lowcoder.domain.application.ApplicationUtil.getDependentModulesFromDsl;

import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import org.lowcoder.domain.application.model.Application;
import org.lowcoder.domain.application.model.ApplicationStatus;
import org.lowcoder.domain.application.repository.ApplicationRepository;
import org.lowcoder.domain.permission.model.ResourceRole;
import org.lowcoder.domain.permission.service.ResourcePermissionService;
import org.lowcoder.infra.annotation.NonEmptyMono;
import org.lowcoder.infra.mongo.MongoUpsertHelper;
import org.lowcoder.sdk.constants.FieldName;
import org.lowcoder.sdk.exception.BizError;
import org.lowcoder.sdk.exception.BizException;
import org.lowcoder.sdk.models.HasIdAndAuditing;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.openblocks.domain.application.model.Application;
import com.openblocks.domain.application.model.ApplicationStatus;
import com.openblocks.domain.application.repository.ApplicationRepository;
import com.openblocks.domain.permission.model.ResourceRole;
import com.openblocks.domain.permission.service.ResourcePermissionService;
import com.openblocks.infra.annotation.NonEmptyMono;
import com.openblocks.infra.mongo.MongoUpsertHelper;
import com.openblocks.sdk.constants.FieldName;
import com.openblocks.sdk.exception.BizError;
import com.openblocks.sdk.exception.BizException;
import com.openblocks.sdk.models.HasIdAndAuditing;

import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Flux;
Expand Down
17 changes: 8 additions & 9 deletions ...pplicationHistorySnapshotServiceImpl.java → ...pplicationHistorySnapshotServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
package com.openblocks.domain.application.service.impl;
package org.lowcoder.domain.application.service.impl;

import static com.openblocks.sdk.exception.BizError.INVALID_HISTORY_SNAPSHOT;
import static com.openblocks.sdk.util.ExceptionUtils.deferredError;
import static com.openblocks.sdk.util.ExceptionUtils.ofException;
import static org.lowcoder.sdk.exception.BizError.INVALID_HISTORY_SNAPSHOT;
import static org.lowcoder.sdk.util.ExceptionUtils.deferredError;
import static org.lowcoder.sdk.util.ExceptionUtils.ofException;

import java.util.List;
import java.util.Map;

import org.lowcoder.domain.application.model.ApplicationHistorySnapshot;
import org.lowcoder.domain.application.repository.ApplicationHistorySnapshotRepository;
import org.lowcoder.domain.application.service.ApplicationHistorySnapshotService;
import org.lowcoder.sdk.exception.BizError;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.stereotype.Service;

import com.openblocks.domain.application.model.ApplicationHistorySnapshot;
import com.openblocks.domain.application.repository.ApplicationHistorySnapshotRepository;
import com.openblocks.domain.application.service.ApplicationHistorySnapshotService;
import com.openblocks.sdk.exception.BizError;

import reactor.core.publisher.Mono;

@Lazy
Expand Down
4 changes: 2 additions & 2 deletions .../openblocks/domain/asset/model/Asset.java → ...rg/lowcoder/domain/asset/model/Asset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.openblocks.domain.asset.model;
package org.lowcoder.domain.asset.model;

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;
import com.openblocks.sdk.models.HasIdAndAuditing;

@Document
public class Asset extends HasIdAndAuditing {
Expand Down
5 changes: 2 additions & 3 deletions ...domain/asset/service/AssetRepository.java → ...domain/asset/service/AssetRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.openblocks.domain.asset.service;
package org.lowcoder.domain.asset.service;

import org.lowcoder.domain.asset.model.Asset;
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;

import com.openblocks.domain.asset.model.Asset;

public interface AssetRepository extends ReactiveMongoRepository<Asset, String> {
}
5 changes: 2 additions & 3 deletions ...ks/domain/asset/service/AssetService.java → ...er/domain/asset/service/AssetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package com.openblocks.domain.asset.service;
package org.lowcoder.domain.asset.service;

import org.lowcoder.domain.asset.model.Asset;
import org.springframework.http.codec.multipart.Part;
import org.springframework.web.server.ServerWebExchange;

import com.openblocks.domain.asset.model.Asset;

import reactor.core.publisher.Mono;

public interface AssetService {
Expand Down
13 changes: 6 additions & 7 deletions ...omain/asset/service/AssetServiceImpl.java → ...omain/asset/service/AssetServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.openblocks.domain.asset.service;
package org.lowcoder.domain.asset.service;

import java.awt.Color;
import java.awt.Image;
Expand All @@ -9,6 +9,11 @@

import javax.imageio.ImageIO;

import org.lowcoder.domain.asset.model.Asset;
import org.lowcoder.sdk.config.dynamic.Conf;
import org.lowcoder.sdk.config.dynamic.ConfigCenter;
import org.lowcoder.sdk.exception.BizError;
import org.lowcoder.sdk.exception.BizException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferUtils;
Expand All @@ -21,12 +26,6 @@
import org.springframework.stereotype.Service;
import org.springframework.web.server.ServerWebExchange;

import com.openblocks.domain.asset.model.Asset;
import com.openblocks.sdk.config.dynamic.Conf;
import com.openblocks.sdk.config.dynamic.ConfigCenter;
import com.openblocks.sdk.exception.BizError;
import com.openblocks.sdk.exception.BizException;

import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
Expand Down
Loading