implement PR-19 api read dto separation and model mapping

This commit is contained in:
2026-03-24 13:42:44 +00:00
parent 59e1ad5ecf
commit 2d923455f5
24 changed files with 264 additions and 48 deletions
@@ -6,11 +6,8 @@ import p.packer.PackerProjectContext;
import p.packer.assets.AssetFamilyCatalog;
import p.packer.assets.AssetReference;
import p.packer.assets.OutputFormatCatalog;
import p.packer.assets.PackerAssetIdentity;
import p.packer.assets.PackerAssetState;
import p.packer.assets.PackerAssetSummary;
import p.packer.assets.PackerBuildParticipation;
import p.packer.diagnostics.PackerDiagnostic;
import p.packer.diagnostics.PackerDiagnosticCategory;
import p.packer.diagnostics.PackerDiagnosticSeverity;
import p.packer.events.PackerEventKind;
@@ -26,6 +23,9 @@ import p.packer.messages.ListAssetsRequest;
import p.packer.messages.ListAssetsResult;
import p.packer.PackerWorkspaceService;
import p.packer.models.PackerAssetDeclarationParseResult;
import p.packer.models.PackerAssetIdentity;
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;
@@ -124,8 +124,8 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
return new ListAssetsResult(
status,
"Packer asset snapshot ready.",
assets,
diagnostics);
PackerReadMessageMapper.toAssetSummaryDTOs(assets),
PackerReadMessageMapper.toDiagnosticDTOs(diagnostics));
}
@Override
@@ -4,11 +4,11 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import p.packer.assets.AssetFamilyCatalog;
import p.packer.assets.OutputCodecCatalog;
import p.packer.diagnostics.PackerDiagnostic;
import p.packer.diagnostics.PackerDiagnosticCategory;
import p.packer.diagnostics.PackerDiagnosticSeverity;
import p.packer.models.PackerAssetDeclaration;
import p.packer.models.PackerAssetDeclarationParseResult;
import p.packer.models.PackerDiagnostic;
import java.io.IOException;
import java.nio.file.Path;
@@ -5,18 +5,18 @@ import p.packer.PackerProjectContext;
import p.packer.assets.AssetFamilyCatalog;
import p.packer.assets.AssetReference;
import p.packer.assets.OutputCodecCatalog;
import p.packer.assets.PackerAssetDetails;
import p.packer.assets.PackerAssetIdentity;
import p.packer.assets.PackerAssetState;
import p.packer.assets.PackerAssetSummary;
import p.packer.assets.PackerBuildParticipation;
import p.packer.diagnostics.PackerDiagnostic;
import p.packer.diagnostics.PackerDiagnosticCategory;
import p.packer.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.PackerRuntimeAsset;
import p.packer.models.PackerRuntimeSnapshot;
@@ -93,8 +93,8 @@ public final class PackerAssetDetailsService {
return new GetAssetDetailsResult(
diagnostics.stream().anyMatch(PackerDiagnostic::blocking) ? PackerOperationStatus.PARTIAL : PackerOperationStatus.SUCCESS,
"Asset details resolved from runtime snapshot.",
details,
diagnostics);
PackerReadMessageMapper.toAssetDetailsDTO(details),
PackerReadMessageMapper.toDiagnosticDTOs(diagnostics));
}
private GetAssetDetailsResult failureResult(
@@ -130,8 +130,8 @@ public final class PackerAssetDetailsService {
return new GetAssetDetailsResult(
PackerOperationStatus.FAILED,
"Asset declaration is invalid or unreadable.",
details,
diagnostics);
PackerReadMessageMapper.toAssetDetailsDTO(details),
PackerReadMessageMapper.toDiagnosticDTOs(diagnostics));
}
private Map<String, List<Path>> resolveInputs(Path assetRoot, Map<String, List<String>> inputsByRole) {
@@ -2,13 +2,13 @@ package p.packer.services;
import p.packer.assets.OutputCodecCatalog;
import p.packer.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 p.packer.assets.PackerCodecConfigurationField;
final class PackerOutputContractCatalog {
private PackerOutputContractCatalog() {
@@ -0,0 +1,87 @@
package p.packer.services;
import p.packer.assets.PackerAssetDetailsDTO;
import p.packer.assets.PackerAssetIdentityDTO;
import p.packer.assets.PackerAssetSummaryDTO;
import p.packer.assets.PackerCodecConfigurationFieldDTO;
import p.packer.diagnostics.PackerDiagnosticDTO;
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 java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
public final class PackerReadMessageMapper {
private PackerReadMessageMapper() {
}
public static PackerAssetSummaryDTO toAssetSummaryDTO(PackerAssetSummary summary) {
return new PackerAssetSummaryDTO(
summary.assetReference(),
toAssetIdentityDTO(summary.identity()),
summary.state(),
summary.buildParticipation(),
summary.assetFamily(),
summary.preloadEnabled(),
summary.hasDiagnostics());
}
public static PackerAssetDetailsDTO toAssetDetailsDTO(PackerAssetDetails details) {
return new PackerAssetDetailsDTO(
toAssetSummaryDTO(details.summary()),
details.outputFormat(),
details.outputCodec(),
details.availableOutputCodecs(),
toCodecConfigurationFieldsByCodecDTO(details.codecConfigurationFieldsByCodec()),
details.inputsByRole(),
toDiagnosticDTOs(details.diagnostics()));
}
public static List<PackerAssetSummaryDTO> toAssetSummaryDTOs(List<PackerAssetSummary> summaries) {
return summaries.stream().map(PackerReadMessageMapper::toAssetSummaryDTO).toList();
}
public static List<PackerDiagnosticDTO> toDiagnosticDTOs(List<PackerDiagnostic> diagnostics) {
return diagnostics.stream().map(PackerReadMessageMapper::toDiagnosticDTO).toList();
}
private static PackerAssetIdentityDTO toAssetIdentityDTO(PackerAssetIdentity identity) {
return new PackerAssetIdentityDTO(
identity.assetId(),
identity.assetUuid(),
identity.assetName(),
identity.assetRoot());
}
private static Map<p.packer.assets.OutputCodecCatalog, List<PackerCodecConfigurationFieldDTO>> toCodecConfigurationFieldsByCodecDTO(
Map<p.packer.assets.OutputCodecCatalog, List<PackerCodecConfigurationField>> fieldsByCodec) {
return fieldsByCodec.entrySet().stream().collect(Collectors.toMap(
Map.Entry::getKey,
entry -> entry.getValue().stream().map(PackerReadMessageMapper::toCodecConfigurationFieldDTO).toList(),
(left, right) -> left,
java.util.LinkedHashMap::new));
}
private static PackerCodecConfigurationFieldDTO toCodecConfigurationFieldDTO(PackerCodecConfigurationField field) {
return new PackerCodecConfigurationFieldDTO(
field.key(),
field.label(),
field.fieldType(),
field.value(),
field.required(),
field.options());
}
private static PackerDiagnosticDTO toDiagnosticDTO(PackerDiagnostic diagnostic) {
return new PackerDiagnosticDTO(
diagnostic.severity(),
diagnostic.category(),
diagnostic.message(),
diagnostic.evidencePath(),
diagnostic.blocking());
}
}