Skip to content

Commit

Permalink
refactor: renamed to AssetBuilder
Browse files Browse the repository at this point in the history
  • Loading branch information
richardtreier committed Jan 9, 2024
1 parent 224a146 commit baaa0d8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import de.sovity.edc.ext.wrapper.api.ui.UiResourceImpl;
import de.sovity.edc.ext.wrapper.api.ui.pages.asset.AssetApiService;
import de.sovity.edc.ext.wrapper.api.ui.pages.asset.AssetIdValidator;
import de.sovity.edc.ext.wrapper.api.ui.pages.asset.AssetUpdater;
import de.sovity.edc.ext.wrapper.api.ui.pages.asset.AssetBuilder;
import de.sovity.edc.ext.wrapper.api.ui.pages.catalog.CatalogApiService;
import de.sovity.edc.ext.wrapper.api.ui.pages.contract_agreements.ContractAgreementPageApiService;
import de.sovity.edc.ext.wrapper.api.ui.pages.contract_agreements.ContractAgreementTransferApiService;
Expand Down Expand Up @@ -178,7 +178,7 @@ public static WrapperExtensionContext buildContext(
);
var contractAgreementUtils = new ContractAgreementUtils(contractAgreementService);
var assetIdValidator = new AssetIdValidator();
var assetUpdater = new AssetUpdater(
var assetBuilder = new AssetBuilder(
assetMapper,
edcPropertyUtils,
assetIdValidator,
Expand All @@ -187,7 +187,7 @@ public static WrapperExtensionContext buildContext(
var assetApiService = new AssetApiService(
assetService,
assetMapper,
assetUpdater,
assetBuilder,
selfDescriptionService
);
var transferRequestBuilder = new TransferRequestBuilder(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
public class AssetApiService {
private final AssetService assetService;
private final AssetMapper assetMapper;
private final AssetUpdater assetUpdater;
private final AssetBuilder assetBuilder;
private final SelfDescriptionService selfDescriptionService;

public List<UiAsset> getAssets() {
Expand All @@ -49,15 +49,15 @@ public List<UiAsset> getAssets() {

@NotNull
public IdResponseDto createAsset(UiAssetCreateRequest request) {
var asset = assetUpdater.createAsset(request);
var asset = assetBuilder.fromCreateRequest(request);
asset = assetService.create(asset).orElseThrow(ServiceException::new);
return new IdResponseDto(asset.getId());
}

public IdResponseDto editAsset(String assetId, UiAssetEditMetadataRequest request) {
var asset = assetService.findById(assetId);
Objects.requireNonNull(asset, "Asset with ID %s not found".formatted(assetId));
asset = assetUpdater.editAssetMetadata(asset, request);
asset = assetBuilder.fromEditMetadataRequest(asset, request);
asset = assetService.update(asset).orElseThrow(ServiceException::new);
return new IdResponseDto(asset.getId());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.eclipse.edc.spi.types.domain.asset.Asset;

@RequiredArgsConstructor
public class AssetUpdater {
public class AssetBuilder {
private final AssetMapper assetMapper;
private final EdcPropertyUtils edcPropertyUtils;
private final AssetIdValidator assetIdValidator;
Expand All @@ -35,7 +35,7 @@ public class AssetUpdater {
* @param request {@link UiAssetCreateRequest}
* @return {@link Asset}
*/
public Asset createAsset(UiAssetCreateRequest request) {
public Asset fromCreateRequest(UiAssetCreateRequest request) {
assetIdValidator.assertValid(request.getId());
var organizationName = selfDescriptionService.getCuratorName();
return assetMapper.buildAsset(request, organizationName);
Expand All @@ -48,9 +48,9 @@ public Asset createAsset(UiAssetCreateRequest request) {
* @param request {@link UiAssetEditMetadataRequest}
* @return copy of {@link Asset}
*/
public Asset editAssetMetadata(Asset asset, UiAssetEditMetadataRequest request) {
public Asset fromEditMetadataRequest(Asset asset, UiAssetEditMetadataRequest request) {
var createRequest = buildCreateRequest(asset, request);
var tmpAsset = createAsset(createRequest);
var tmpAsset = fromCreateRequest(createRequest);

return asset.toBuilder()
.properties(tmpAsset.getProperties())
Expand Down

0 comments on commit baaa0d8

Please sign in to comment.