added contract update into asset workspace

This commit is contained in:
2026-03-24 13:42:47 +00:00
parent bf4dc17469
commit b88a4e3c62
120 changed files with 1177 additions and 1211 deletions
@@ -1,7 +1,9 @@
package p.packer.models;
import org.apache.commons.lang3.StringUtils;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import java.util.List;
import java.util.Map;
@@ -13,7 +15,7 @@ public record PackerAssetDeclaration(
String name,
AssetFamilyCatalog assetFamily,
Map<String, List<String>> inputsByRole,
String outputFormat,
OutputFormatCatalog outputFormat,
OutputCodecCatalog outputCodec,
boolean preloadEnabled) {
@@ -25,9 +27,9 @@ public record PackerAssetDeclaration(
name = Objects.requireNonNull(name, "name").trim();
assetFamily = Objects.requireNonNull(assetFamily, "assetFamily");
inputsByRole = Map.copyOf(Objects.requireNonNull(inputsByRole, "inputsByRole"));
outputFormat = Objects.requireNonNull(outputFormat, "outputFormat").trim();
outputFormat = Objects.requireNonNull(outputFormat, "outputFormat");
outputCodec = Objects.requireNonNull(outputCodec, "outputCodec");
if (assetUuid.isBlank() || name.isBlank() || outputFormat.isBlank()) {
if (StringUtils.isBlank(assetUuid) || StringUtils.isBlank(name)) {
throw new IllegalArgumentException("declaration fields must not be blank");
}
}
@@ -1,6 +1,7 @@
package p.packer.models;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import java.nio.file.Path;
import java.util.List;
@@ -9,7 +10,7 @@ import java.util.Objects;
public record PackerAssetDetails(
PackerAssetSummary summary,
String outputFormat,
OutputFormatCatalog outputFormat,
OutputCodecCatalog outputCodec,
List<OutputCodecCatalog> availableOutputCodecs,
Map<OutputCodecCatalog, List<PackerCodecConfigurationField>> codecConfigurationFieldsByCodec,
@@ -18,7 +19,7 @@ public record PackerAssetDetails(
public PackerAssetDetails {
Objects.requireNonNull(summary, "summary");
outputFormat = Objects.requireNonNullElse(outputFormat, "unknown").trim();
outputFormat = Objects.requireNonNullElse(outputFormat, OutputFormatCatalog.UNKNOWN);
outputCodec = Objects.requireNonNullElse(outputCodec, OutputCodecCatalog.UNKNOWN);
availableOutputCodecs = List.copyOf(Objects.requireNonNull(availableOutputCodecs, "availableOutputCodecs"));
codecConfigurationFieldsByCodec = Map.copyOf(Objects.requireNonNull(codecConfigurationFieldsByCodec, "codecConfigurationFieldsByCodec"));
@@ -1,7 +1,7 @@
package p.packer.models;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.AssetReference;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.assets.PackerAssetState;
import p.packer.messages.assets.PackerBuildParticipation;
@@ -10,11 +10,7 @@ import p.packer.models.PackerRegistryState;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
public final class FileSystemPackerRegistryRepository implements PackerRegistryRepository {
private static final ObjectMapper MAPPER = new ObjectMapper();
@@ -1,46 +1,17 @@
package p.packer.services;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import p.packer.messages.PackerOperationStatus;
import p.packer.messages.PackerProjectContext;
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;
import p.packer.messages.diagnostics.PackerDiagnosticCategory;
import p.packer.messages.diagnostics.PackerDiagnosticSeverity;
import com.fasterxml.jackson.databind.node.ObjectNode;
import p.packer.PackerWorkspaceService;
import p.packer.events.PackerEventKind;
import p.packer.events.PackerEventSink;
import p.packer.events.PackerProgress;
import p.packer.messages.CreateAssetRequest;
import p.packer.messages.CreateAssetResult;
import p.packer.messages.DeleteAssetRequest;
import p.packer.messages.DeleteAssetResult;
import p.packer.messages.GetAssetDetailsRequest;
import p.packer.messages.GetAssetDetailsResult;
import p.packer.messages.InitWorkspaceRequest;
import p.packer.messages.InitWorkspaceResult;
import p.packer.messages.ListAssetsRequest;
import p.packer.messages.ListAssetsResult;
import p.packer.messages.RegisterAssetRequest;
import p.packer.messages.RegisterAssetResult;
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;
import p.packer.models.PackerRegistryEntry;
import p.packer.models.PackerRegistryState;
import p.packer.models.PackerRuntimeAsset;
import p.packer.models.PackerRuntimeSnapshot;
import p.packer.messages.*;
import p.packer.messages.assets.*;
import p.packer.messages.diagnostics.PackerDiagnosticCategory;
import p.packer.messages.diagnostics.PackerDiagnosticSeverity;
import p.packer.models.*;
import java.io.IOException;
import java.nio.file.Files;
@@ -115,7 +86,7 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
events.emit(
PackerEventKind.ASSET_DISCOVERED,
"Discovered asset: " + summary.identity().assetName(),
new PackerProgress(total == 0 ? 1.0d : (index + 1) / (double) total, false),
new PackerProgress((index + 1) / (double) total, false),
List.of(summary.identity().assetName()));
}
@@ -405,9 +376,9 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
sourceRoot,
targetRoot,
targetManifestPath));
final AssetReference canonicalReference = updatedEntry.isPresent()
? AssetReference.forAssetId(updatedEntry.get().assetId())
: AssetReference.forRelativeAssetRoot(targetRelativeRoot);
final AssetReference canonicalReference = updatedEntry
.map(packerRegistryEntry -> AssetReference.forAssetId(packerRegistryEntry.assetId()))
.orElseGet(() -> AssetReference.forRelativeAssetRoot(targetRelativeRoot));
final MoveAssetResult result = new MoveAssetResult(
PackerOperationStatus.SUCCESS,
"Asset moved: " + sourceRelativeRoot + " -> " + targetRelativeRoot,
@@ -603,4 +574,111 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
.toList();
return registry.withAssets(updatedEntries, registry.nextAssetId());
}
@Override
public UpdateAssetContractResponse updateAssetContract(final UpdateAssetContractRequest request) {
final UpdateAssetContractRequest safeRequest = Objects.requireNonNull(request, "request");
final PackerProjectContext project = safeRequest.project();
return writeCoordinator.execute(project, () -> updateAssetContractInWriteLane(safeRequest));
}
private UpdateAssetContractResponse updateAssetContractInWriteLane(UpdateAssetContractRequest request) {
final PackerProjectContext project = request.project();
workspaceFoundation.initWorkspace(new InitWorkspaceRequest(project));
final PackerRuntimeSnapshot snapshot = runtimeRegistry.getOrLoad(project).snapshot();
final PackerDeleteAssetEvaluation evaluation = actionReadService.evaluateDelete(snapshot, project, request.assetReference());
if (!evaluation.canDelete()) {
return new UpdateAssetContractResponse(
false,
Objects.requireNonNullElse(evaluation.reason(), "Asset contract cannot be updated."));
}
if (request.outputCodec() == OutputCodecCatalog.UNKNOWN) {
return new UpdateAssetContractResponse(false, "Output codec is required.");
}
final Path assetRoot = evaluation.resolved().assetRoot();
final Path manifestPath = assetRoot.resolve("asset.json");
if (!Files.isRegularFile(manifestPath)) {
return new UpdateAssetContractResponse(false, "asset.json was not found for the requested asset root.");
}
final ObjectNode manifest;
try {
final JsonNode rawManifest = MAPPER.readTree(manifestPath.toFile());
if (!(rawManifest instanceof ObjectNode objectNode)) {
return new UpdateAssetContractResponse(false, "asset.json must contain a JSON object at the root.");
}
manifest = objectNode;
} catch (IOException exception) {
return new UpdateAssetContractResponse(false, "Unable to read asset manifest: " + exception.getMessage());
}
final OutputFormatCatalog outputFormat = resolveManifestOutputFormat(manifest);
if (outputFormat == OutputFormatCatalog.UNKNOWN) {
return new UpdateAssetContractResponse(false, "Output format is missing or invalid in asset.json.");
}
if (!outputFormat.supports(request.outputCodec())) {
return new UpdateAssetContractResponse(false, "Output codec is not supported for the selected output format.");
}
try {
patchManifestContract(manifest, request);
MAPPER.writerWithDefaultPrettyPrinter().writeValue(manifestPath.toFile(), manifest);
runtimeRegistry.update(project, (currentSnapshot, generation) -> runtimePatchService.afterUpdateAssetContract(
currentSnapshot,
generation,
assetRoot,
manifestPath,
evaluation.resolved().registryEntry()));
return new UpdateAssetContractResponse(true, null);
} catch (IOException exception) {
return new UpdateAssetContractResponse(false, "Unable to update asset contract: " + exception.getMessage());
} catch (RuntimeException exception) {
return new UpdateAssetContractResponse(false, "Unable to update runtime snapshot: " + exception.getMessage());
}
}
private OutputFormatCatalog resolveManifestOutputFormat(ObjectNode manifest) {
final JsonNode outputNode = manifest.get("output");
if (!(outputNode instanceof ObjectNode outputObject)) {
return OutputFormatCatalog.UNKNOWN;
}
final JsonNode formatNode = outputObject.get("format");
if (formatNode == null || !formatNode.isTextual()) {
return OutputFormatCatalog.UNKNOWN;
}
return OutputFormatCatalog.fromManifestValue(formatNode.asText());
}
private void patchManifestContract(ObjectNode manifest, UpdateAssetContractRequest request) {
final ObjectNode preloadNode = mutableObject(manifest, "preload");
preloadNode.put("enabled", request.preloadEnabled());
final ObjectNode outputNode = mutableObject(manifest, "output");
outputNode.put("codec", request.outputCodec().manifestValue());
final ObjectNode codecConfigurationNode = mutableObject(outputNode, "codec_configuration");
codecConfigurationNode.removeAll();
final String selectedCodecPrefix = request.outputCodec().name() + ":";
request.codecFieldValues().forEach((fieldKey, fieldValue) -> {
if (fieldKey == null || fieldKey.isBlank() || !fieldKey.startsWith(selectedCodecPrefix)) {
return;
}
final String normalizedFieldKey = fieldKey.substring(selectedCodecPrefix.length()).trim();
if (normalizedFieldKey.isBlank()) {
return;
}
codecConfigurationNode.put(normalizedFieldKey, Objects.requireNonNullElse(fieldValue, ""));
});
}
private ObjectNode mutableObject(ObjectNode parent, String fieldName) {
final JsonNode current = parent.get(fieldName);
if (current instanceof ObjectNode objectNode) {
return objectNode;
}
final ObjectNode created = MAPPER.createObjectNode();
parent.set(fieldName, created);
return created;
}
}
@@ -1,24 +1,10 @@
package p.packer.services;
import p.packer.messages.AssetReference;
import p.packer.messages.GetAssetActionsRequest;
import p.packer.messages.GetAssetActionsResult;
import p.packer.messages.PackerOperationStatus;
import p.packer.messages.PackerProjectContext;
import p.packer.messages.*;
import p.packer.messages.assets.AssetAction;
import p.packer.messages.diagnostics.PackerDiagnosticCategory;
import p.packer.messages.diagnostics.PackerDiagnosticSeverity;
import p.packer.models.PackerAssetActionAvailability;
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;
import p.packer.models.PackerRuntimeAsset;
import p.packer.models.PackerRuntimeSnapshot;
import p.packer.models.*;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import p.packer.messages.diagnostics.PackerDiagnosticCategory;
import p.packer.messages.diagnostics.PackerDiagnosticSeverity;
import p.packer.models.PackerAssetDeclaration;
@@ -12,11 +13,7 @@ import p.packer.models.PackerDiagnostic;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
public final class PackerAssetDeclarationParser {
private static final ObjectMapper MAPPER = new ObjectMapper();
@@ -43,7 +40,7 @@ public final class PackerAssetDeclarationParser {
final String name = requiredText(root, "name", diagnostics, manifestPath);
final AssetFamilyCatalog assetFamily = requiredAssetFamily(root, diagnostics, manifestPath);
final Map<String, List<String>> inputsByRole = requiredInputs(root.path("inputs"), diagnostics, manifestPath);
final String outputFormat = requiredText(root.path("output"), "format", diagnostics, manifestPath);
final OutputFormatCatalog outputFormat = requiredOutputFormat(root.path("output"), diagnostics, manifestPath);
final OutputCodecCatalog outputCodec = requiredOutputCodec(root.path("output"), diagnostics, manifestPath);
final Boolean preloadEnabled = requiredBoolean(root.path("preload"), "enabled", diagnostics, manifestPath);
@@ -118,6 +115,24 @@ public final class PackerAssetDeclarationParser {
return field.booleanValue();
}
private OutputFormatCatalog requiredOutputFormat(JsonNode node, List<PackerDiagnostic> diagnostics, Path manifestPath) {
final String fmtValue = requiredText(node, "format", diagnostics, manifestPath);
if (fmtValue == null) {
return null;
}
final OutputFormatCatalog outputFormat = OutputFormatCatalog.fromManifestValue(fmtValue);
if (outputFormat == OutputFormatCatalog.UNKNOWN) {
diagnostics.add(new PackerDiagnostic(
PackerDiagnosticSeverity.ERROR,
PackerDiagnosticCategory.STRUCTURAL,
"Field 'output' must have a valid value.",
manifestPath,
true));
return null;
}
return outputFormat;
}
private OutputCodecCatalog requiredOutputCodec(JsonNode node, List<PackerDiagnostic> diagnostics, Path manifestPath) {
final String codecValue = requiredText(node, "codec", diagnostics, manifestPath);
if (codecValue == null) {
@@ -128,7 +143,7 @@ public final class PackerAssetDeclarationParser {
diagnostics.add(new PackerDiagnostic(
PackerDiagnosticSeverity.ERROR,
PackerDiagnosticCategory.STRUCTURAL,
"Field 'codec' must be one of: NONE.",
"Field 'codec' must have a valid value.",
manifestPath,
true));
return null;
@@ -1,34 +1,13 @@
package p.packer.services;
import p.packer.messages.PackerOperationStatus;
import p.packer.messages.PackerProjectContext;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.AssetReference;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.PackerAssetState;
import p.packer.messages.assets.PackerBuildParticipation;
import p.packer.messages.*;
import p.packer.messages.assets.*;
import p.packer.messages.diagnostics.PackerDiagnosticCategory;
import p.packer.messages.diagnostics.PackerDiagnosticSeverity;
import p.packer.messages.GetAssetDetailsRequest;
import p.packer.messages.GetAssetDetailsResult;
import p.packer.models.PackerAssetDeclaration;
import p.packer.models.PackerAssetDeclarationParseResult;
import p.packer.models.PackerAssetDetails;
import p.packer.models.PackerAssetIdentity;
import p.packer.models.PackerAssetSummary;
import p.packer.models.PackerDiagnostic;
import p.packer.models.PackerRegistryEntry;
import p.packer.models.PackerResolvedAssetReference;
import p.packer.models.PackerRuntimeAsset;
import p.packer.models.PackerRuntimeSnapshot;
import p.packer.models.*;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.*;
public final class PackerAssetDetailsService {
private final PackerRuntimeRegistry runtimeRegistry;
@@ -126,7 +105,7 @@ public final class PackerAssetDetailsService {
true);
final PackerAssetDetails details = new PackerAssetDetails(
summary,
"unknown",
OutputFormatCatalog.UNKNOWN,
OutputCodecCatalog.UNKNOWN,
List.of(OutputCodecCatalog.NONE),
Map.of(OutputCodecCatalog.NONE, List.of()),
@@ -4,11 +4,7 @@ import p.packer.messages.AssetReference;
import p.packer.messages.PackerProjectContext;
import p.packer.messages.diagnostics.PackerDiagnosticCategory;
import p.packer.messages.diagnostics.PackerDiagnosticSeverity;
import p.packer.models.PackerDiagnostic;
import p.packer.models.PackerRegistryEntry;
import p.packer.models.PackerResolvedAssetReference;
import p.packer.models.PackerRuntimeAsset;
import p.packer.models.PackerRuntimeSnapshot;
import p.packer.models.*;
import java.nio.file.Path;
import java.util.List;
@@ -1,10 +1,10 @@
package p.packer.services;
import p.packer.messages.PackerProjectContext;
import p.packer.events.PackerEvent;
import p.packer.events.PackerEventKind;
import p.packer.events.PackerEventSink;
import p.packer.events.PackerProgress;
import p.packer.messages.PackerProjectContext;
import java.time.Instant;
import java.util.List;
@@ -3,18 +3,14 @@ package p.packer.services;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import p.packer.models.PackerCodecConfigurationField;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.*;
final class PackerOutputContractCatalog {
private PackerOutputContractCatalog() {
}
static OutputContractDefinition definitionFor(String outputFormat, OutputCodecCatalog selectedCodec) {
static OutputContractDefinition definitionFor(OutputFormatCatalog outputFormat, OutputCodecCatalog selectedCodec) {
final List<OutputCodecCatalog> availableCodecs = availableCodecsFor(outputFormat, selectedCodec);
return new OutputContractDefinition(
availableCodecs,
@@ -25,13 +21,12 @@ final class PackerOutputContractCatalog {
java.util.LinkedHashMap::new)));
}
static List<OutputCodecCatalog> availableCodecsFor(String outputFormat, OutputCodecCatalog selectedCodec) {
static List<OutputCodecCatalog> availableCodecsFor(OutputFormatCatalog outputFormat, OutputCodecCatalog selectedCodec) {
final Set<OutputCodecCatalog> codecs = new LinkedHashSet<>();
final OutputFormatCatalog formatCatalog = OutputFormatCatalog.fromManifestValue(outputFormat);
if (formatCatalog != OutputFormatCatalog.UNKNOWN) {
codecs.addAll(formatCatalog.availableCodecs());
if (outputFormat != OutputFormatCatalog.UNKNOWN) {
codecs.addAll(outputFormat.availableCodecs());
} else {
final String normalizedFormat = Objects.requireNonNullElse(outputFormat, "").trim().toUpperCase(Locale.ROOT);
final String normalizedFormat = outputFormat.manifestValue().trim().toUpperCase(Locale.ROOT);
if (normalizedFormat.startsWith("TILES/")
|| normalizedFormat.startsWith("PALETTE/")
|| normalizedFormat.startsWith("SOUND/")
@@ -51,7 +46,7 @@ final class PackerOutputContractCatalog {
return List.copyOf(codecs);
}
private static List<PackerCodecConfigurationField> fieldsFor(String outputFormat, OutputCodecCatalog codec) {
private static List<PackerCodecConfigurationField> fieldsFor(OutputFormatCatalog outputFormat, OutputCodecCatalog codec) {
return List.of();
}
@@ -5,15 +5,7 @@ import p.packer.messages.PackerProjectContext;
import java.io.Closeable;
import java.nio.file.Path;
import java.util.Objects;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
public final class PackerProjectWriteCoordinator implements Closeable {
@@ -1,18 +1,8 @@
package p.packer.services;
import p.packer.dtos.PackerAssetDetailsDTO;
import p.packer.dtos.PackerAssetActionAvailabilityDTO;
import p.packer.dtos.PackerAssetIdentityDTO;
import p.packer.dtos.PackerAssetSummaryDTO;
import p.packer.dtos.PackerCodecConfigurationFieldDTO;
import p.packer.dtos.PackerDiagnosticDTO;
import p.packer.dtos.*;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.models.PackerAssetActionAvailability;
import p.packer.models.PackerAssetDetails;
import p.packer.models.PackerAssetIdentity;
import p.packer.models.PackerAssetSummary;
import p.packer.models.PackerCodecConfigurationField;
import p.packer.models.PackerDiagnostic;
import p.packer.models.*;
import java.util.List;
import java.util.Map;
@@ -1,7 +1,7 @@
package p.packer.services;
import p.packer.messages.PackerProjectContext;
import p.packer.messages.InitWorkspaceRequest;
import p.packer.messages.PackerProjectContext;
import p.packer.models.PackerRegistryEntry;
import p.packer.models.PackerRegistryState;
import p.packer.models.PackerRuntimeAsset;
@@ -10,12 +10,7 @@ import p.packer.models.PackerRuntimeSnapshot;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -1,17 +1,9 @@
package p.packer.services;
import p.packer.models.PackerAssetDeclarationParseResult;
import p.packer.models.PackerRegistryEntry;
import p.packer.models.PackerRegistryState;
import p.packer.models.PackerRuntimeAsset;
import p.packer.models.PackerRuntimeSnapshot;
import p.packer.models.*;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.*;
public final class PackerRuntimePatchService {
private final PackerAssetDeclarationParser declarationParser;
@@ -81,7 +73,7 @@ public final class PackerRuntimePatchService {
PackerRuntimeSnapshot snapshot,
long generation,
PackerRegistryState updatedRegistry,
java.util.Optional<PackerRegistryEntry> updatedRegistryEntry,
Optional<PackerRegistryEntry> updatedRegistryEntry,
Path sourceRoot,
Path targetRoot,
Path targetManifestPath) {
@@ -106,4 +98,36 @@ public final class PackerRuntimePatchService {
updatedAssets.sort(Comparator.comparing(asset -> asset.assetRoot().toString(), String.CASE_INSENSITIVE_ORDER));
return new PackerRuntimeSnapshot(generation, updatedRegistry, updatedAssets);
}
public PackerRuntimeSnapshot afterUpdateAssetContract(
PackerRuntimeSnapshot snapshot,
long generation,
Path assetRoot,
Path manifestPath,
Optional<PackerRegistryEntry> registryEntry) {
final PackerAssetDeclarationParseResult parsed = declarationParser.parse(manifestPath);
final List<PackerRuntimeAsset> updatedAssets = new ArrayList<>();
boolean patched = false;
for (PackerRuntimeAsset asset : snapshot.assets()) {
if (asset.assetRoot().equals(assetRoot.toAbsolutePath().normalize())) {
updatedAssets.add(new PackerRuntimeAsset(
asset.assetRoot(),
asset.manifestPath(),
asset.registryEntry(),
parsed));
patched = true;
} else {
updatedAssets.add(asset);
}
}
if (!patched) {
updatedAssets.add(new PackerRuntimeAsset(
assetRoot,
manifestPath,
registryEntry,
parsed));
updatedAssets.sort(Comparator.comparing(asset -> asset.assetRoot().toString(), String.CASE_INSENSITIVE_ORDER));
}
return new PackerRuntimeSnapshot(generation, snapshot.registry(), updatedAssets);
}
}
@@ -4,12 +4,12 @@ import p.packer.messages.PackerProjectContext;
import p.packer.models.PackerRuntimeSnapshot;
import java.nio.file.Path;
import java.util.function.BiFunction;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.BiFunction;
public final class PackerRuntimeRegistry {
private final PackerRuntimeSnapshotLoader loader;
@@ -1,9 +1,9 @@
package p.packer.services;
import p.packer.messages.PackerOperationStatus;
import p.packer.messages.PackerProjectContext;
import p.packer.messages.InitWorkspaceRequest;
import p.packer.messages.InitWorkspaceResult;
import p.packer.messages.PackerOperationStatus;
import p.packer.messages.PackerProjectContext;
import p.packer.models.PackerRegistryEntry;
import p.packer.models.PackerRegistryState;