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
@@ -7,7 +7,7 @@ import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import p.packer.assets.AssetReference;
import p.packer.assets.PackerAssetDetails;
import p.packer.assets.PackerAssetDetailsDTO;
import p.packer.messages.GetAssetDetailsRequest;
import p.studio.Container;
import p.studio.events.StudioWorkspaceEventBus;
@@ -244,7 +244,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
workspaceSummaryLabel.setManaged(visible);
}
private AssetWorkspaceAssetDetails mapDetails(PackerAssetDetails details) {
private AssetWorkspaceAssetDetails mapDetails(PackerAssetDetailsDTO details) {
return new AssetWorkspaceAssetDetails(
AssetListPackerMappings.mapSummary(details.summary()),
details.outputFormat(),
@@ -1,6 +1,6 @@
package p.studio.workspaces.assets.details;
import p.packer.assets.PackerAssetSummary;
import p.packer.assets.PackerAssetSummaryDTO;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetState;
import p.studio.workspaces.assets.messages.AssetWorkspaceBuildParticipation;
@@ -9,7 +9,7 @@ public final class AssetListPackerMappings {
private AssetListPackerMappings() {
}
public static AssetWorkspaceAssetSummary mapSummary(PackerAssetSummary summary) {
public static AssetWorkspaceAssetSummary mapSummary(PackerAssetSummaryDTO summary) {
final AssetWorkspaceAssetState state = switch (summary.state()) {
case REGISTERED -> AssetWorkspaceAssetState.REGISTERED;
case UNREGISTERED -> AssetWorkspaceAssetState.UNREGISTERED;
@@ -11,7 +11,7 @@ import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import p.packer.assets.OutputCodecCatalog;
import p.packer.assets.PackerCodecConfigurationField;
import p.packer.assets.PackerCodecConfigurationFieldDTO;
import p.studio.Container;
import p.studio.controls.forms.StudioFormActionBar;
import p.studio.controls.forms.StudioFormMode;
@@ -211,7 +211,7 @@ public final class AssetDetailsContractControl extends VBox implements StudioCon
return createCodecMetadataPane(title, content);
}
for (PackerCodecConfigurationField field : fields) {
for (PackerCodecConfigurationFieldDTO field : fields) {
content.getChildren().add(createCodecFieldRow(field, draft, editing));
}
return createCodecMetadataPane(title, content);
@@ -230,7 +230,7 @@ public final class AssetDetailsContractControl extends VBox implements StudioCon
}
private Node createCodecFieldRow(
PackerCodecConfigurationField field,
PackerCodecConfigurationFieldDTO field,
AssetContractDraft draft,
boolean editing) {
final Node valueNode = switch (field.fieldType()) {
@@ -242,7 +242,7 @@ public final class AssetDetailsContractControl extends VBox implements StudioCon
}
private Node createBooleanField(
PackerCodecConfigurationField field,
PackerCodecConfigurationFieldDTO field,
AssetContractDraft draft,
boolean editing) {
final CheckBox checkBox = new CheckBox();
@@ -265,7 +265,7 @@ public final class AssetDetailsContractControl extends VBox implements StudioCon
}
private Node createEnumField(
PackerCodecConfigurationField field,
PackerCodecConfigurationFieldDTO field,
AssetContractDraft draft,
boolean editing) {
final ComboBox<String> comboBox = new ComboBox<>(FXCollections.observableArrayList(field.options()));
@@ -289,7 +289,7 @@ public final class AssetDetailsContractControl extends VBox implements StudioCon
}
private Node createTextField(
PackerCodecConfigurationField field,
PackerCodecConfigurationFieldDTO field,
AssetContractDraft draft,
boolean editing) {
final TextField textField = new TextField(currentValue(field, draft));
@@ -313,7 +313,7 @@ public final class AssetDetailsContractControl extends VBox implements StudioCon
return textField;
}
private String currentValue(PackerCodecConfigurationField field, AssetContractDraft draft) {
private String currentValue(PackerCodecConfigurationFieldDTO field, AssetContractDraft draft) {
return draft.codecFieldValue(draft.selectedCodec(), field.key(), field.value());
}
@@ -11,7 +11,7 @@ import javafx.scene.layout.FlowPane;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import p.packer.assets.AssetReference;
import p.packer.assets.PackerAssetSummary;
import p.packer.assets.PackerAssetSummaryDTO;
import p.packer.messages.ListAssetsRequest;
import p.studio.Container;
import p.studio.events.StudioWorkspaceEventBus;
@@ -233,7 +233,7 @@ public final class AssetListControl extends VBox implements StudioEventAware {
workspaceBus.publish(new StudioAssetsNavigatorViewStateChangedEvent(nextViewState));
}
private AssetWorkspaceAssetSummary mapAsset(PackerAssetSummary summary) {
private AssetWorkspaceAssetSummary mapAsset(PackerAssetSummaryDTO summary) {
return AssetListPackerMappings.mapSummary(summary);
}
@@ -1,6 +1,6 @@
package p.studio.workspaces.assets.messages;
import p.packer.assets.PackerCodecConfigurationField;
import p.packer.assets.PackerCodecConfigurationFieldDTO;
import p.packer.assets.OutputCodecCatalog;
import java.nio.file.Path;
@@ -13,7 +13,7 @@ public record AssetWorkspaceAssetDetails(
String outputFormat,
OutputCodecCatalog outputCodec,
List<OutputCodecCatalog> availableOutputCodecs,
Map<OutputCodecCatalog, List<PackerCodecConfigurationField>> codecConfigurationFieldsByCodec,
Map<OutputCodecCatalog, List<PackerCodecConfigurationFieldDTO>> codecConfigurationFieldsByCodec,
Map<String, List<Path>> inputsByRole) {
public AssetWorkspaceAssetDetails {