dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix vc status api calls

Browse Source
This commit is contained in:
Andrii Shvaika 2022-06-21 17:17:13 +03:00
parent 9a893dd330
commit a4cd4f3351
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
View File

@ -254,6 +254,7 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
@Override @Override
public UUID loadEntitiesVersion(SecurityUser user, VersionLoadRequest request) throws Exception { public UUID loadEntitiesVersion(SecurityUser user, VersionLoadRequest request) throws Exception {
EntitiesImportCtx ctx = new EntitiesImportCtx(UUID.randomUUID(), user, request.getVersionId()); EntitiesImportCtx ctx = new EntitiesImportCtx(UUID.randomUUID(), user, request.getVersionId());
cachePut(ctx.getRequestId(), VersionLoadResult.empty());
switch (request.getType()) { switch (request.getType()) {
case SINGLE_ENTITY: { case SINGLE_ENTITY: {
SingleEntityVersionLoadRequest versionLoadRequest = (SingleEntityVersionLoadRequest) request; SingleEntityVersionLoadRequest versionLoadRequest = (SingleEntityVersionLoadRequest) request;

1
application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitVersionControlQueueService.java
View File

@ -378,6 +378,7 @@ public class DefaultGitVersionControlQueueService implements GitVersionControlQu
commitResult.setAdded(commitResponse.getAdded()); commitResult.setAdded(commitResponse.getAdded());
commitResult.setRemoved(commitResponse.getRemoved()); commitResult.setRemoved(commitResponse.getRemoved());
commitResult.setModified(commitResponse.getModified()); commitResult.setModified(commitResponse.getModified());
commitResult.setDone(true);
((CommitGitRequest) request).getFuture().set(commitResult); ((CommitGitRequest) request).getFuture().set(commitResult);
} else if (vcResponseMsg.hasListBranchesResponse()) { } else if (vcResponseMsg.hasListBranchesResponse()) {
var listBranchesResponse = vcResponseMsg.getListBranchesResponse(); var listBranchesResponse = vcResponseMsg.getListBranchesResponse();

5
common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/VersionLoadResult.java
View File

@ -20,6 +20,7 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Collections;
import java.util.List; import java.util.List;
@Data @Data
@ -33,6 +34,10 @@ public class VersionLoadResult implements Serializable {
private EntityLoadError error; private EntityLoadError error;
private boolean done; private boolean done;
public static VersionLoadResult empty() {
return VersionLoadResult.builder().result(Collections.emptyList()).build();
}
public static VersionLoadResult success(List<EntityTypeLoadResult> result) { public static VersionLoadResult success(List<EntityTypeLoadResult> result) {
return VersionLoadResult.builder().result(result).build(); return VersionLoadResult.builder().result(result).build();
} }