From baaa0d8b26346a95752c8b6b5a0c2023ad7d2061 Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Tue, 9 Jan 2024 16:44:28 +0100 Subject: [PATCH] refactor: renamed to AssetBuilder --- .../edc/ext/wrapper/WrapperExtensionContextBuilder.java | 6 +++--- .../ext/wrapper/api/ui/pages/asset/AssetApiService.java | 6 +++--- .../pages/asset/{AssetUpdater.java => AssetBuilder.java} | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) rename extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/{AssetUpdater.java => AssetBuilder.java} (93%) diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java index a51ff0df5..5c07ddebe 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java @@ -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; @@ -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, @@ -187,7 +187,7 @@ public static WrapperExtensionContext buildContext( var assetApiService = new AssetApiService( assetService, assetMapper, - assetUpdater, + assetBuilder, selfDescriptionService ); var transferRequestBuilder = new TransferRequestBuilder( diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetApiService.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetApiService.java index 658460cd2..bae70eeb8 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetApiService.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetApiService.java @@ -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 getAssets() { @@ -49,7 +49,7 @@ public List 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()); } @@ -57,7 +57,7 @@ public IdResponseDto createAsset(UiAssetCreateRequest request) { 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()); } diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetUpdater.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetBuilder.java similarity index 93% rename from extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetUpdater.java rename to extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetBuilder.java index 82f7a5198..ebe9bf4e3 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetUpdater.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetBuilder.java @@ -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; @@ -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); @@ -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())