added move action into asset workspace
This commit is contained in:
@@ -15,5 +15,7 @@ public interface PackerWorkspaceService {
|
||||
|
||||
RegisterAssetResult registerAsset(RegisterAssetRequest request);
|
||||
|
||||
MoveAssetResult moveAsset(MoveAssetRequest request);
|
||||
|
||||
DeleteAssetResult deleteAsset(DeleteAssetRequest request);
|
||||
}
|
||||
|
||||
+11
@@ -49,4 +49,15 @@ public record AssetReference(String value) {
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (!(o instanceof AssetReference(String v1))) return false;
|
||||
return value.equals(v1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return value.hashCode();
|
||||
}
|
||||
}
|
||||
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
package p.packer.messages;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public record MoveAssetRequest(
|
||||
PackerProjectContext project,
|
||||
AssetReference assetReference,
|
||||
String targetRoot) {
|
||||
|
||||
public MoveAssetRequest {
|
||||
Objects.requireNonNull(project, "project");
|
||||
Objects.requireNonNull(assetReference, "assetReference");
|
||||
targetRoot = Objects.requireNonNull(targetRoot, "targetRoot").trim();
|
||||
if (targetRoot.isBlank()) {
|
||||
throw new IllegalArgumentException("targetRoot must not be blank");
|
||||
}
|
||||
}
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package p.packer.messages;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.Objects;
|
||||
|
||||
public record MoveAssetResult(
|
||||
PackerOperationStatus status,
|
||||
String summary,
|
||||
AssetReference assetReference,
|
||||
Path assetRoot,
|
||||
Path manifestPath) {
|
||||
|
||||
public MoveAssetResult {
|
||||
Objects.requireNonNull(status, "status");
|
||||
summary = Objects.requireNonNull(summary, "summary").trim();
|
||||
if (summary.isBlank()) {
|
||||
throw new IllegalArgumentException("summary must not be blank");
|
||||
}
|
||||
if (assetRoot != null) {
|
||||
assetRoot = assetRoot.toAbsolutePath().normalize();
|
||||
}
|
||||
if (manifestPath != null) {
|
||||
manifestPath = manifestPath.toAbsolutePath().normalize();
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
@@ -2,5 +2,6 @@ package p.packer.messages.assets;
|
||||
|
||||
public enum AssetAction {
|
||||
REGISTER,
|
||||
MOVE,
|
||||
DELETE
|
||||
}
|
||||
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
package p.packer.models;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
|
||||
public record PackerMoveAssetEvaluation(
|
||||
PackerResolvedAssetReference resolved,
|
||||
List<PackerDiagnostic> diagnostics,
|
||||
boolean canMove,
|
||||
String reason,
|
||||
Optional<String> targetRelativeRoot,
|
||||
Optional<Path> targetRoot,
|
||||
Optional<Path> targetManifestPath) {
|
||||
|
||||
public PackerMoveAssetEvaluation {
|
||||
Objects.requireNonNull(resolved, "resolved");
|
||||
diagnostics = List.copyOf(Objects.requireNonNull(diagnostics, "diagnostics"));
|
||||
reason = reason == null ? null : reason.trim();
|
||||
if (reason != null && reason.isBlank()) {
|
||||
reason = null;
|
||||
}
|
||||
targetRelativeRoot = Objects.requireNonNull(targetRelativeRoot, "targetRelativeRoot");
|
||||
targetRoot = Objects.requireNonNull(targetRoot, "targetRoot");
|
||||
targetManifestPath = Objects.requireNonNull(targetManifestPath, "targetManifestPath");
|
||||
}
|
||||
}
|
||||
+99
@@ -7,6 +7,8 @@ import p.packer.messages.assets.AssetFamilyCatalog;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.packer.messages.GetAssetActionsRequest;
|
||||
import p.packer.messages.GetAssetActionsResult;
|
||||
import p.packer.messages.MoveAssetRequest;
|
||||
import p.packer.messages.MoveAssetResult;
|
||||
import p.packer.messages.assets.OutputFormatCatalog;
|
||||
import p.packer.messages.assets.PackerAssetState;
|
||||
import p.packer.messages.assets.PackerBuildParticipation;
|
||||
@@ -31,6 +33,7 @@ import p.packer.PackerWorkspaceService;
|
||||
import p.packer.models.PackerAssetDeclarationParseResult;
|
||||
import p.packer.models.PackerDeleteAssetEvaluation;
|
||||
import p.packer.models.PackerAssetIdentity;
|
||||
import p.packer.models.PackerMoveAssetEvaluation;
|
||||
import p.packer.models.PackerRegisterAssetEvaluation;
|
||||
import p.packer.models.PackerAssetSummary;
|
||||
import p.packer.models.PackerDiagnostic;
|
||||
@@ -171,6 +174,14 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
return writeCoordinator.execute(project, () -> registerAssetInWriteLane(safeRequest, events));
|
||||
}
|
||||
|
||||
@Override
|
||||
public MoveAssetResult moveAsset(MoveAssetRequest request) {
|
||||
final MoveAssetRequest safeRequest = Objects.requireNonNull(request, "request");
|
||||
final PackerProjectContext project = safeRequest.project();
|
||||
final PackerOperationEventEmitter events = new PackerOperationEventEmitter(project, eventSink);
|
||||
return writeCoordinator.execute(project, () -> moveAssetInWriteLane(safeRequest, events));
|
||||
}
|
||||
|
||||
@Override
|
||||
public DeleteAssetResult deleteAsset(DeleteAssetRequest request) {
|
||||
final DeleteAssetRequest safeRequest = Objects.requireNonNull(request, "request");
|
||||
@@ -352,6 +363,69 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
}
|
||||
}
|
||||
|
||||
private MoveAssetResult moveAssetInWriteLane(
|
||||
MoveAssetRequest request,
|
||||
PackerOperationEventEmitter events) {
|
||||
final PackerProjectContext project = request.project();
|
||||
workspaceFoundation.initWorkspace(new InitWorkspaceRequest(project));
|
||||
final PackerRuntimeSnapshot snapshot = runtimeRegistry.getOrLoad(project).snapshot();
|
||||
final PackerMoveAssetEvaluation evaluation = actionReadService.evaluateMove(snapshot, project, request.assetReference(), request.targetRoot());
|
||||
if (!evaluation.canMove()) {
|
||||
return moveFailureResult(
|
||||
events,
|
||||
Objects.requireNonNullElse(evaluation.reason(), "Asset cannot be moved."),
|
||||
evaluation.resolved().assetRoot(),
|
||||
evaluation.resolved().assetRoot().resolve("asset.json"),
|
||||
List.of(relativeAssetRoot(project, evaluation.resolved().assetRoot())));
|
||||
}
|
||||
|
||||
final Path sourceRoot = evaluation.resolved().assetRoot();
|
||||
final Path targetRoot = evaluation.targetRoot().orElseThrow();
|
||||
final Path targetManifestPath = evaluation.targetManifestPath().orElseThrow();
|
||||
final String sourceRelativeRoot = relativeAssetRoot(project, sourceRoot);
|
||||
final String targetRelativeRoot = evaluation.targetRelativeRoot().orElseThrow();
|
||||
try {
|
||||
Files.createDirectories(targetRoot.getParent());
|
||||
Files.move(sourceRoot, targetRoot);
|
||||
|
||||
final PackerRegistryState registry = workspaceFoundation.loadRegistry(project);
|
||||
final Optional<PackerRegistryEntry> updatedEntry = evaluation.resolved().registryEntry()
|
||||
.map(entry -> new PackerRegistryEntry(entry.assetId(), entry.assetUuid(), targetRelativeRoot, entry.includedInBuild()));
|
||||
final PackerRegistryState updatedRegistry = updatedEntry
|
||||
.map(entry -> replaceRegistryEntryRoot(registry, entry))
|
||||
.orElse(registry);
|
||||
if (!updatedRegistry.equals(registry)) {
|
||||
workspaceFoundation.saveRegistry(project, updatedRegistry);
|
||||
}
|
||||
runtimeRegistry.update(project, (currentSnapshot, generation) -> runtimePatchService.afterMoveAsset(
|
||||
currentSnapshot,
|
||||
generation,
|
||||
updatedRegistry,
|
||||
updatedEntry,
|
||||
sourceRoot,
|
||||
targetRoot,
|
||||
targetManifestPath));
|
||||
final AssetReference canonicalReference = updatedEntry.isPresent()
|
||||
? AssetReference.forAssetId(updatedEntry.get().assetId())
|
||||
: AssetReference.forRelativeAssetRoot(targetRelativeRoot);
|
||||
final MoveAssetResult result = new MoveAssetResult(
|
||||
PackerOperationStatus.SUCCESS,
|
||||
"Asset moved: " + sourceRelativeRoot + " -> " + targetRelativeRoot,
|
||||
canonicalReference,
|
||||
targetRoot,
|
||||
targetManifestPath);
|
||||
events.emit(PackerEventKind.ACTION_APPLIED, result.summary(), List.of(sourceRelativeRoot, targetRelativeRoot));
|
||||
return result;
|
||||
} catch (IOException exception) {
|
||||
return moveFailureResult(
|
||||
events,
|
||||
"Unable to move asset: " + exception.getMessage(),
|
||||
sourceRoot,
|
||||
sourceRoot.resolve("asset.json"),
|
||||
List.of(sourceRelativeRoot, targetRelativeRoot));
|
||||
}
|
||||
}
|
||||
|
||||
private CreateAssetResult failureResult(
|
||||
PackerOperationEventEmitter events,
|
||||
String summary,
|
||||
@@ -399,6 +473,22 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
return result;
|
||||
}
|
||||
|
||||
private MoveAssetResult moveFailureResult(
|
||||
PackerOperationEventEmitter events,
|
||||
String summary,
|
||||
Path assetRoot,
|
||||
Path manifestPath,
|
||||
List<String> affectedAssets) {
|
||||
final MoveAssetResult result = new MoveAssetResult(
|
||||
PackerOperationStatus.FAILED,
|
||||
summary,
|
||||
null,
|
||||
assetRoot,
|
||||
manifestPath);
|
||||
events.emit(PackerEventKind.ACTION_FAILED, result.summary(), affectedAssets);
|
||||
return result;
|
||||
}
|
||||
|
||||
private void writeManifest(Path manifestPath, CreateAssetRequest request, String assetUuid) throws IOException {
|
||||
final Map<String, Object> manifest = new LinkedHashMap<>();
|
||||
manifest.put("schema_version", 1);
|
||||
@@ -504,4 +594,13 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
.toList();
|
||||
return registry.withAssets(updatedEntries, registry.nextAssetId());
|
||||
}
|
||||
|
||||
private PackerRegistryState replaceRegistryEntryRoot(
|
||||
PackerRegistryState registry,
|
||||
PackerRegistryEntry updatedEntry) {
|
||||
final List<PackerRegistryEntry> updatedEntries = registry.assets().stream()
|
||||
.map(candidate -> candidate.assetId() == updatedEntry.assetId() ? updatedEntry : candidate)
|
||||
.toList();
|
||||
return registry.withAssets(updatedEntries, registry.nextAssetId());
|
||||
}
|
||||
}
|
||||
|
||||
+129
-9
@@ -1,6 +1,5 @@
|
||||
package p.packer.services;
|
||||
|
||||
import p.packer.dtos.PackerAssetActionAvailabilityDTO;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.packer.messages.GetAssetActionsRequest;
|
||||
import p.packer.messages.GetAssetActionsResult;
|
||||
@@ -14,6 +13,7 @@ import p.packer.models.PackerAssetDeclaration;
|
||||
import p.packer.models.PackerAssetDeclarationParseResult;
|
||||
import p.packer.models.PackerDeleteAssetEvaluation;
|
||||
import p.packer.models.PackerDiagnostic;
|
||||
import p.packer.models.PackerMoveAssetEvaluation;
|
||||
import p.packer.models.PackerRegisterAssetEvaluation;
|
||||
import p.packer.models.PackerRegistryEntry;
|
||||
import p.packer.models.PackerResolvedAssetReference;
|
||||
@@ -44,6 +44,7 @@ public final class PackerAssetActionReadService {
|
||||
final PackerProjectContext project = Objects.requireNonNull(request, "request").project();
|
||||
final PackerRuntimeSnapshot snapshot = runtimeRegistry.getOrLoad(project).snapshot();
|
||||
final PackerRegisterAssetEvaluation registerEvaluation = evaluateRegister(snapshot, project, request.assetReference());
|
||||
final PackerMoveAssetEvaluation moveEvaluation = evaluateMove(snapshot, project, request.assetReference(), null);
|
||||
final PackerDeleteAssetEvaluation deleteEvaluation = evaluateDelete(snapshot, project, request.assetReference());
|
||||
final List<PackerAssetActionAvailability> actions = new ArrayList<>();
|
||||
if (registerEvaluation.resolved().registryEntry().isEmpty()) {
|
||||
@@ -53,6 +54,13 @@ public final class PackerAssetActionReadService {
|
||||
true,
|
||||
registerEvaluation.reason()));
|
||||
}
|
||||
if (moveEvaluation.resolved().runtimeAsset().isPresent()) {
|
||||
actions.add(new PackerAssetActionAvailability(
|
||||
AssetAction.MOVE,
|
||||
moveEvaluation.canMove(),
|
||||
true,
|
||||
moveEvaluation.reason()));
|
||||
}
|
||||
if (deleteEvaluation.resolved().runtimeAsset().isPresent()) {
|
||||
actions.add(new PackerAssetActionAvailability(
|
||||
AssetAction.DELETE,
|
||||
@@ -62,9 +70,12 @@ public final class PackerAssetActionReadService {
|
||||
}
|
||||
|
||||
final PackerOperationStatus status;
|
||||
if (registerEvaluation.resolved().runtimeAsset().isEmpty() && deleteEvaluation.resolved().runtimeAsset().isEmpty()) {
|
||||
if (registerEvaluation.resolved().runtimeAsset().isEmpty()
|
||||
&& moveEvaluation.resolved().runtimeAsset().isEmpty()
|
||||
&& deleteEvaluation.resolved().runtimeAsset().isEmpty()) {
|
||||
status = PackerOperationStatus.FAILED;
|
||||
} else if (combinedDiagnostics(registerEvaluation.diagnostics(), deleteEvaluation.diagnostics()).stream().anyMatch(PackerDiagnostic::blocking)) {
|
||||
} else if (combinedDiagnostics(registerEvaluation.diagnostics(), moveEvaluation.diagnostics(), deleteEvaluation.diagnostics())
|
||||
.stream().anyMatch(PackerDiagnostic::blocking)) {
|
||||
status = PackerOperationStatus.PARTIAL;
|
||||
} else {
|
||||
status = PackerOperationStatus.SUCCESS;
|
||||
@@ -73,7 +84,10 @@ public final class PackerAssetActionReadService {
|
||||
status,
|
||||
"Asset action capabilities resolved from runtime snapshot.",
|
||||
PackerReadMessageMapper.toAssetActionAvailabilityDTOs(actions),
|
||||
PackerReadMessageMapper.toDiagnosticDTOs(combinedDiagnostics(registerEvaluation.diagnostics(), deleteEvaluation.diagnostics())));
|
||||
PackerReadMessageMapper.toDiagnosticDTOs(combinedDiagnostics(
|
||||
registerEvaluation.diagnostics(),
|
||||
moveEvaluation.diagnostics(),
|
||||
deleteEvaluation.diagnostics())));
|
||||
}
|
||||
|
||||
public PackerRegisterAssetEvaluation evaluateRegister(
|
||||
@@ -153,6 +167,98 @@ public final class PackerAssetActionReadService {
|
||||
return new PackerDeleteAssetEvaluation(resolved, diagnostics, true, null);
|
||||
}
|
||||
|
||||
public PackerMoveAssetEvaluation evaluateMove(
|
||||
PackerRuntimeSnapshot snapshot,
|
||||
PackerProjectContext project,
|
||||
AssetReference assetReference,
|
||||
String requestedTargetRoot) {
|
||||
final PackerResolvedAssetReference resolved = assetReferenceResolver.resolve(project, snapshot, assetReference);
|
||||
final List<PackerDiagnostic> diagnostics = new ArrayList<>(resolved.diagnostics());
|
||||
if (resolved.runtimeAsset().isEmpty()) {
|
||||
diagnostics.add(new PackerDiagnostic(
|
||||
PackerDiagnosticSeverity.ERROR,
|
||||
PackerDiagnosticCategory.STRUCTURAL,
|
||||
"asset.json was not found for the requested asset root.",
|
||||
resolved.assetRoot().resolve("asset.json"),
|
||||
true));
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
false,
|
||||
"asset.json was not found for the requested asset root.",
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty());
|
||||
}
|
||||
|
||||
if (requestedTargetRoot == null) {
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
true,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty());
|
||||
}
|
||||
|
||||
final String normalizedTargetRoot = normalizeRelativeAssetRoot(requestedTargetRoot);
|
||||
if (normalizedTargetRoot == null) {
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
false,
|
||||
"Target root must stay inside assets/ and use a non-blank relative path.",
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty());
|
||||
}
|
||||
|
||||
final Path targetRoot = PackerWorkspacePaths.assetRoot(project, normalizedTargetRoot);
|
||||
if (!targetRoot.startsWith(PackerWorkspacePaths.assetsRoot(project))) {
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
false,
|
||||
"Target root must stay inside assets/.",
|
||||
Optional.of(normalizedTargetRoot),
|
||||
Optional.of(targetRoot),
|
||||
Optional.of(targetRoot.resolve("asset.json")));
|
||||
}
|
||||
|
||||
if (targetRoot.equals(resolved.assetRoot())) {
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
false,
|
||||
"Target root must differ from the current asset root.",
|
||||
Optional.of(normalizedTargetRoot),
|
||||
Optional.of(targetRoot),
|
||||
Optional.of(targetRoot.resolve("asset.json")));
|
||||
}
|
||||
|
||||
final Path targetManifestPath = targetRoot.resolve("asset.json");
|
||||
if (java.nio.file.Files.isRegularFile(targetManifestPath)) {
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
false,
|
||||
"Target root already contains asset.json.",
|
||||
Optional.of(normalizedTargetRoot),
|
||||
Optional.of(targetRoot),
|
||||
Optional.of(targetManifestPath));
|
||||
}
|
||||
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
true,
|
||||
null,
|
||||
Optional.of(normalizedTargetRoot),
|
||||
Optional.of(targetRoot),
|
||||
Optional.of(targetManifestPath));
|
||||
}
|
||||
|
||||
private String firstBlockingReason(List<PackerDiagnostic> diagnostics, String fallback) {
|
||||
return diagnostics.stream()
|
||||
.filter(PackerDiagnostic::blocking)
|
||||
@@ -162,11 +268,25 @@ public final class PackerAssetActionReadService {
|
||||
.orElse(fallback);
|
||||
}
|
||||
|
||||
private List<PackerDiagnostic> combinedDiagnostics(
|
||||
List<PackerDiagnostic> left,
|
||||
List<PackerDiagnostic> right) {
|
||||
final List<PackerDiagnostic> combined = new ArrayList<>(left);
|
||||
combined.addAll(right);
|
||||
@SafeVarargs
|
||||
private List<PackerDiagnostic> combinedDiagnostics(List<PackerDiagnostic>... groups) {
|
||||
final List<PackerDiagnostic> combined = new ArrayList<>();
|
||||
for (List<PackerDiagnostic> group : groups) {
|
||||
combined.addAll(group);
|
||||
}
|
||||
return combined;
|
||||
}
|
||||
|
||||
private String normalizeRelativeAssetRoot(String candidate) {
|
||||
final String raw = Objects.requireNonNullElse(candidate, "").trim().replace('\\', '/');
|
||||
if (raw.isBlank()) {
|
||||
return null;
|
||||
}
|
||||
final Path normalized = Path.of(raw).normalize();
|
||||
if (normalized.isAbsolute() || normalized.startsWith("..")) {
|
||||
return null;
|
||||
}
|
||||
final String value = normalized.toString().replace('\\', '/');
|
||||
return value.isBlank() ? null : value;
|
||||
}
|
||||
}
|
||||
|
||||
+30
@@ -76,4 +76,34 @@ public final class PackerRuntimePatchService {
|
||||
.toList();
|
||||
return new PackerRuntimeSnapshot(generation, updatedRegistry, updatedAssets);
|
||||
}
|
||||
|
||||
public PackerRuntimeSnapshot afterMoveAsset(
|
||||
PackerRuntimeSnapshot snapshot,
|
||||
long generation,
|
||||
PackerRegistryState updatedRegistry,
|
||||
java.util.Optional<PackerRegistryEntry> updatedRegistryEntry,
|
||||
Path sourceRoot,
|
||||
Path targetRoot,
|
||||
Path targetManifestPath) {
|
||||
final PackerAssetDeclarationParseResult parsed = declarationParser.parse(targetManifestPath);
|
||||
final List<PackerRuntimeAsset> updatedAssets = new ArrayList<>();
|
||||
boolean patched = false;
|
||||
for (PackerRuntimeAsset asset : snapshot.assets()) {
|
||||
if (asset.assetRoot().equals(sourceRoot.toAbsolutePath().normalize())) {
|
||||
updatedAssets.add(new PackerRuntimeAsset(
|
||||
targetRoot,
|
||||
targetManifestPath,
|
||||
updatedRegistryEntry,
|
||||
parsed));
|
||||
patched = true;
|
||||
} else {
|
||||
updatedAssets.add(asset);
|
||||
}
|
||||
}
|
||||
if (!patched) {
|
||||
throw new IllegalStateException("Unable to patch runtime snapshot for moved asset: " + sourceRoot);
|
||||
}
|
||||
updatedAssets.sort(Comparator.comparing(asset -> asset.assetRoot().toString(), String.CASE_INSENSITIVE_ORDER));
|
||||
return new PackerRuntimeSnapshot(generation, updatedRegistry, updatedAssets);
|
||||
}
|
||||
}
|
||||
|
||||
+139
-11
@@ -19,6 +19,8 @@ import p.packer.messages.DeleteAssetResult;
|
||||
import p.packer.messages.GetAssetActionsRequest;
|
||||
import p.packer.messages.GetAssetDetailsRequest;
|
||||
import p.packer.messages.ListAssetsRequest;
|
||||
import p.packer.messages.MoveAssetRequest;
|
||||
import p.packer.messages.MoveAssetResult;
|
||||
import p.packer.messages.RegisterAssetRequest;
|
||||
import p.packer.messages.RegisterAssetResult;
|
||||
import p.packer.messages.assets.AssetAction;
|
||||
@@ -201,15 +203,16 @@ final class FileSystemPackerWorkspaceServiceTest {
|
||||
AssetReference.forRelativeAssetRoot("orphans/ui_sounds")));
|
||||
|
||||
assertEquals(PackerOperationStatus.SUCCESS, result.status());
|
||||
assertEquals(2, result.actions().size());
|
||||
assertEquals(3, result.actions().size());
|
||||
assertEquals(AssetAction.REGISTER, result.actions().get(0).action());
|
||||
assertTrue(result.actions().get(0).visible());
|
||||
assertTrue(result.actions().get(0).enabled());
|
||||
assertNull(result.actions().get(0).reason());
|
||||
assertEquals(AssetAction.DELETE, result.actions().get(1).action());
|
||||
assertEquals(AssetAction.MOVE, result.actions().get(1).action());
|
||||
assertTrue(result.actions().get(1).visible());
|
||||
assertTrue(result.actions().get(1).enabled());
|
||||
assertNull(result.actions().get(1).reason());
|
||||
assertEquals(AssetAction.DELETE, result.actions().get(2).action());
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -222,9 +225,11 @@ final class FileSystemPackerWorkspaceServiceTest {
|
||||
AssetReference.forAssetId(1)));
|
||||
|
||||
assertEquals(PackerOperationStatus.SUCCESS, result.status());
|
||||
assertEquals(1, result.actions().size());
|
||||
assertEquals(AssetAction.DELETE, result.actions().getFirst().action());
|
||||
assertTrue(result.actions().getFirst().enabled());
|
||||
assertEquals(2, result.actions().size());
|
||||
assertEquals(AssetAction.MOVE, result.actions().get(0).action());
|
||||
assertTrue(result.actions().get(0).enabled());
|
||||
assertEquals(AssetAction.DELETE, result.actions().get(1).action());
|
||||
assertTrue(result.actions().get(1).enabled());
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -270,8 +275,9 @@ final class FileSystemPackerWorkspaceServiceTest {
|
||||
final var actionsResult = service.getAssetActions(new GetAssetActionsRequest(
|
||||
project(projectRoot),
|
||||
registerResult.assetReference()));
|
||||
assertEquals(1, actionsResult.actions().size());
|
||||
assertEquals(AssetAction.DELETE, actionsResult.actions().getFirst().action());
|
||||
assertEquals(2, actionsResult.actions().size());
|
||||
assertEquals(AssetAction.MOVE, actionsResult.actions().get(0).action());
|
||||
assertEquals(AssetAction.DELETE, actionsResult.actions().get(1).action());
|
||||
assertEquals(1, loader.loadCount());
|
||||
}
|
||||
|
||||
@@ -285,12 +291,13 @@ final class FileSystemPackerWorkspaceServiceTest {
|
||||
AssetReference.forRelativeAssetRoot("bad")));
|
||||
|
||||
assertEquals(PackerOperationStatus.PARTIAL, result.status());
|
||||
assertEquals(2, result.actions().size());
|
||||
assertEquals(3, result.actions().size());
|
||||
assertEquals(AssetAction.REGISTER, result.actions().get(0).action());
|
||||
assertFalse(result.actions().get(0).enabled());
|
||||
assertNotNull(result.actions().get(0).reason());
|
||||
assertEquals(AssetAction.DELETE, result.actions().get(1).action());
|
||||
assertEquals(AssetAction.MOVE, result.actions().get(1).action());
|
||||
assertTrue(result.actions().get(1).enabled());
|
||||
assertEquals(AssetAction.DELETE, result.actions().get(2).action());
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -350,12 +357,13 @@ final class FileSystemPackerWorkspaceServiceTest {
|
||||
final var actions = service.getAssetActions(new GetAssetActionsRequest(
|
||||
project(projectRoot),
|
||||
AssetReference.forRelativeAssetRoot("orphans/ui_clone")));
|
||||
assertEquals(2, actions.actions().size());
|
||||
assertEquals(3, actions.actions().size());
|
||||
assertEquals(AssetAction.REGISTER, actions.actions().get(0).action());
|
||||
assertFalse(actions.actions().get(0).enabled());
|
||||
assertNotNull(actions.actions().get(0).reason());
|
||||
assertEquals(AssetAction.DELETE, actions.actions().get(1).action());
|
||||
assertEquals(AssetAction.MOVE, actions.actions().get(1).action());
|
||||
assertTrue(actions.actions().get(1).enabled());
|
||||
assertEquals(AssetAction.DELETE, actions.actions().get(2).action());
|
||||
|
||||
final RegisterAssetResult registerResult = service.registerAsset(new RegisterAssetRequest(
|
||||
project(projectRoot),
|
||||
@@ -393,6 +401,126 @@ final class FileSystemPackerWorkspaceServiceTest {
|
||||
assertTrue(listResult.assets().isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void movesRegisteredAssetAndKeepsRegisteredIdentity() throws Exception {
|
||||
final Path projectRoot = tempDir.resolve("move-registered");
|
||||
final FileSystemPackerWorkspaceService service = service();
|
||||
final CreateAssetResult createResult = service.createAsset(new CreateAssetRequest(
|
||||
project(projectRoot),
|
||||
"ui/source-atlas",
|
||||
"source_atlas",
|
||||
AssetFamilyCatalog.IMAGE_BANK,
|
||||
OutputFormatCatalog.TILES_INDEXED_V1,
|
||||
OutputCodecCatalog.NONE,
|
||||
true));
|
||||
Files.writeString(projectRoot.resolve("assets/ui/source-atlas/atlas.png"), "fixture");
|
||||
|
||||
final MoveAssetResult moveResult = service.moveAsset(new MoveAssetRequest(
|
||||
project(projectRoot),
|
||||
createResult.assetReference(),
|
||||
"ui/renamed-atlas"));
|
||||
|
||||
assertEquals(PackerOperationStatus.SUCCESS, moveResult.status());
|
||||
assertEquals(createResult.assetReference(), moveResult.assetReference());
|
||||
assertFalse(Files.exists(projectRoot.resolve("assets/ui/source-atlas/asset.json")));
|
||||
assertTrue(Files.isRegularFile(projectRoot.resolve("assets/ui/renamed-atlas/asset.json")));
|
||||
assertTrue(Files.isRegularFile(projectRoot.resolve("assets/ui/renamed-atlas/atlas.png")));
|
||||
|
||||
final var details = service.getAssetDetails(new GetAssetDetailsRequest(project(projectRoot), createResult.assetReference()));
|
||||
assertEquals(PackerOperationStatus.SUCCESS, details.status());
|
||||
assertEquals(PackerAssetState.REGISTERED, details.details().summary().state());
|
||||
assertEquals(projectRoot.resolve("assets/ui/renamed-atlas").toAbsolutePath().normalize(), details.details().summary().identity().assetRoot());
|
||||
}
|
||||
|
||||
@Test
|
||||
void movesUnregisteredAssetAndReturnsNewRootReference() throws Exception {
|
||||
final Path projectRoot = copyFixture("workspaces/orphan-valid", tempDir.resolve("move-unregistered"));
|
||||
final FileSystemPackerWorkspaceService service = service();
|
||||
Files.writeString(projectRoot.resolve("assets/orphans/ui_sounds/readme.txt"), "keep");
|
||||
|
||||
final MoveAssetResult moveResult = service.moveAsset(new MoveAssetRequest(
|
||||
project(projectRoot),
|
||||
AssetReference.forRelativeAssetRoot("orphans/ui_sounds"),
|
||||
"recovered/ui_sounds_renamed"));
|
||||
|
||||
assertEquals(PackerOperationStatus.SUCCESS, moveResult.status());
|
||||
assertEquals(AssetReference.forRelativeAssetRoot("recovered/ui_sounds_renamed"), moveResult.assetReference());
|
||||
assertTrue(Files.isRegularFile(projectRoot.resolve("assets/recovered/ui_sounds_renamed/asset.json")));
|
||||
assertTrue(Files.isRegularFile(projectRoot.resolve("assets/recovered/ui_sounds_renamed/readme.txt")));
|
||||
|
||||
final var details = service.getAssetDetails(new GetAssetDetailsRequest(project(projectRoot), moveResult.assetReference()));
|
||||
assertEquals(PackerOperationStatus.SUCCESS, details.status());
|
||||
assertEquals(PackerAssetState.UNREGISTERED, details.details().summary().state());
|
||||
assertEquals(projectRoot.resolve("assets/recovered/ui_sounds_renamed").toAbsolutePath().normalize(), details.details().summary().identity().assetRoot());
|
||||
}
|
||||
|
||||
@Test
|
||||
void blocksMoveOutsideAssetsRoot() throws Exception {
|
||||
final Path projectRoot = copyFixture("workspaces/orphan-valid", tempDir.resolve("move-outside"));
|
||||
final FileSystemPackerWorkspaceService service = service();
|
||||
|
||||
final MoveAssetResult moveResult = service.moveAsset(new MoveAssetRequest(
|
||||
project(projectRoot),
|
||||
AssetReference.forRelativeAssetRoot("orphans/ui_sounds"),
|
||||
"../outside/ui_sounds"));
|
||||
|
||||
assertEquals(PackerOperationStatus.FAILED, moveResult.status());
|
||||
assertNull(moveResult.assetReference());
|
||||
}
|
||||
|
||||
@Test
|
||||
void blocksMoveWhenTargetAlreadyContainsAssetManifest() throws Exception {
|
||||
final Path projectRoot = tempDir.resolve("move-target-asset");
|
||||
final FileSystemPackerWorkspaceService service = service();
|
||||
final CreateAssetResult source = service.createAsset(new CreateAssetRequest(
|
||||
project(projectRoot),
|
||||
"ui/source",
|
||||
"source",
|
||||
AssetFamilyCatalog.IMAGE_BANK,
|
||||
OutputFormatCatalog.TILES_INDEXED_V1,
|
||||
OutputCodecCatalog.NONE,
|
||||
false));
|
||||
final CreateAssetResult target = service.createAsset(new CreateAssetRequest(
|
||||
project(projectRoot),
|
||||
"ui/target",
|
||||
"target",
|
||||
AssetFamilyCatalog.IMAGE_BANK,
|
||||
OutputFormatCatalog.TILES_INDEXED_V1,
|
||||
OutputCodecCatalog.NONE,
|
||||
false));
|
||||
|
||||
final MoveAssetResult moveResult = service.moveAsset(new MoveAssetRequest(
|
||||
project(projectRoot),
|
||||
source.assetReference(),
|
||||
"ui/target"));
|
||||
|
||||
assertEquals(PackerOperationStatus.FAILED, moveResult.status());
|
||||
assertNull(moveResult.assetReference());
|
||||
assertNotNull(target.assetReference());
|
||||
}
|
||||
|
||||
@Test
|
||||
void moveAssetPatchesLoadedSnapshotWithoutWholeProjectReload() throws Exception {
|
||||
final Path projectRoot = copyFixture("workspaces/orphan-valid", tempDir.resolve("move-no-reload"));
|
||||
final CountingLoader loader = countingLoader();
|
||||
final FileSystemPackerWorkspaceService service = service(ignored -> { }, loader);
|
||||
|
||||
service.listAssets(new ListAssetsRequest(project(projectRoot)));
|
||||
assertEquals(1, loader.loadCount());
|
||||
|
||||
final MoveAssetResult moveResult = service.moveAsset(new MoveAssetRequest(
|
||||
project(projectRoot),
|
||||
AssetReference.forRelativeAssetRoot("orphans/ui_sounds"),
|
||||
"recovered/ui_sounds_moved"));
|
||||
|
||||
assertEquals(PackerOperationStatus.SUCCESS, moveResult.status());
|
||||
assertEquals(1, loader.loadCount());
|
||||
|
||||
final var details = service.getAssetDetails(new GetAssetDetailsRequest(project(projectRoot), moveResult.assetReference()));
|
||||
assertEquals(PackerOperationStatus.SUCCESS, details.status());
|
||||
assertEquals(1, loader.loadCount());
|
||||
}
|
||||
|
||||
@Test
|
||||
void deletesUnregisteredAssetJsonAndRemovesItFromSnapshot() throws Exception {
|
||||
final Path projectRoot = copyFixture("workspaces/orphan-valid", tempDir.resolve("delete-unregistered"));
|
||||
|
||||
Reference in New Issue
Block a user