Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat:sde-v2.0.7] Support AAS version 0.3 #32

Merged
merged 48 commits into from
Jul 25, 2023
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
5ca9eeb
stable version with support edc
sachinargade123 Jun 19, 2023
db60138
remove unwanted maven model
sachinargade123 Jun 19, 2023
96a0686
A1SDS-2444_adapting new changes to sub models
amoldashwant Jun 20, 2023
e70251e
- lookup submodel DTR changes.
ChetanT-System Jun 20, 2023
890a6b9
Merge branch 'support_edc_-1.4.1' of https://github.com/catenax-ng/tx…
amoldashwant Jun 21, 2023
0182261
image docker file
adityagajbhiye9 Jun 21, 2023
2155761
A1SDS-2452 Manufacturer_id added in the required list of singleLevelB…
amoldashwant Jun 22, 2023
3956951
A1SDS-2452 response updated as per the new version
amoldashwant Jun 22, 2023
9e38331
A1SDS-2452 Code updated for response new version
ChetanT-System Jun 22, 2023
45e66e9
Handle mutiple dt call for dt url
sachinargade123 Jun 26, 2023
7836d6d
Update edc connector support
sachinargade123 Jun 26, 2023
b9115c0
name changed
adityagajbhiye9 Jun 27, 2023
74fbf71
Update Dockerfile
adityagajbhiye9 Jun 27, 2023
a51989b
Merge pull request #144 from catenax-ng/support_edc_0.4.1
adityagajbhiye9 Jun 27, 2023
a697cf3
Merge pull request #145 from catenax-ng/A1SDS-2451_Aspect_model_changes
adityagajbhiye9 Jun 27, 2023
b611362
Sonar critical issue fix
sachinargade123 Jun 27, 2023
98e1279
Merge branch 'support_edc_0.4.1' of https://github.com/catenax-ng/tx-…
sachinargade123 Jun 27, 2023
77ea204
Update data api path
sachinargade123 Jun 27, 2023
2037939
Update build.yml
adityagajbhiye9 Jun 27, 2023
75a372f
Update Dockerfile
adityagajbhiye9 Jun 27, 2023
f44ae64
Correct offset and limit sequence
sachinargade123 Jun 27, 2023
261fc49
Merge branch 'support_edc_0.4.1' of https://github.com/catenax-ng/tx-…
sachinargade123 Jun 27, 2023
4ef4560
replace asset:prop with edc
sachinargade123 Jun 27, 2023
89c8a25
image name change
adityagajbhiye9 Jun 27, 2023
48977ff
Update Dockerfile
adityagajbhiye9 Jun 27, 2023
5dd83cf
Merge pull request #146 from catenax-ng/support_edc_0.4.1
adityagajbhiye9 Jun 27, 2023
6144e91
Refactor DDTR as common and cache implementation for lookup ddtr url
sachinargade123 Jun 29, 2023
3d28e2e
Merge pull request #147 from catenax-ng/DDTR_refactor_cache_support
sachinargade123 Jun 29, 2023
6f89441
Bug Fix A1SDS-2479 :Title name changes in json schema
ChetanT-System Jun 30, 2023
8e2d1d9
Bug Fix A1SDS-2485 : Changes in Usecase json schema for renamed
ChetanT-System Jun 30, 2023
4ad842a
Merge pull request #148 from catenax-ng/DST_PIP9_ITR4_A1SDS-2479
adityagajbhiye9 Jun 30, 2023
293f833
Merge pull request #149 from catenax-ng/DST_PIP9_ITR4_A1SDS-2485
adityagajbhiye9 Jun 30, 2023
5d06d5d
A1SDS-2474: Code changes to support new AAS v3.0 DDTR
ChetanT-System Jul 5, 2023
fba6793
A1SDS-2474: Updated Code changes to support new AAS v3.0 DDTR
ChetanT-System Jul 5, 2023
b54a391
A1SDS-2474: Updated Code changes for new AAS v3.0 DDTR
ChetanT-System Jul 6, 2023
e13f510
A1SDS-2474: Changes for DTR URL
ChetanT-System Jul 6, 2023
43f28a5
Sync code to ITR brnach
sachinargade123 Jul 12, 2023
d698cbe
Merge pull request #152 from catenax-ng/DST_PIP9_ITR3
adityagajbhiye9 Jul 13, 2023
265ed9a
pulling code from DST_PIP9_ITR3
adityagajbhiye9 Jul 13, 2023
7bc4e90
Merge pull request #153 from catenax-ng/DST_PIP9_ITR4
adityagajbhiye9 Jul 13, 2023
adef556
realease version correction split_itr3_com_3
adityagajbhiye9 Jul 13, 2023
f5de816
release version correction DST_PIP9_ITR3
adityagajbhiye9 Jul 13, 2023
c8d65f7
release version correction -DST_PIP9_ITR4
adityagajbhiye9 Jul 13, 2023
3da08c7
changelog updated
adityagajbhiye9 Jul 13, 2023
eb0ba1f
Update CHANGELOG.md
adityagajbhiye9 Jul 13, 2023
40d9b4c
Merge branch 'eclipse-tractusx:main' into main
adityagajbhiye9 Jul 18, 2023
552e343
Merge branch 'main' into support_AAS_V3.0
adityagajbhiye9 Jul 18, 2023
977e657
Merge pull request #157 from catenax-ng/support_AAS_V3.0
adityagajbhiye9 Jul 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
replace asset:prop with edc
  • Loading branch information
sachinargade123 committed Jun 27, 2023
commit 4ef45609c45407e7d4f30b1304aaa2c7bd9696a7
Original file line number Diff line number Diff line change
@@ -93,19 +93,21 @@ private QueryDataOfferModel buildContractOffer(String sproviderUrl, JsonNode con

JsonNode policy = offer.get("odrl:hasPolicy");

String edcstr = "edc:";

QueryDataOfferModel build = QueryDataOfferModel.builder()
.assetId(getFieldFromJsonNode(offer, EDCAssetConstant.ASSET_PROP_ID))
.assetId(getFieldFromJsonNode(offer, edcstr + EDCAssetConstant.ASSET_PROP_ID))
.connectorOfferUrl(sproviderUrl + File.separator + getFieldFromJsonNode(offer, "@id"))
.offerId(getFieldFromJsonNode(policy, "@id"))
.title(getFieldFromJsonNode(offer, EDCAssetConstant.ASSET_PROP_NAME))
.type(getFieldFromJsonNode(offer, EDCAssetConstant.ASSET_PROP_TYPE))
.description(getFieldFromJsonNode(offer, EDCAssetConstant.ASSET_PROP_DESCRIPTION))
.created(getFieldFromJsonNode(offer, EDCAssetConstant.ASSET_PROP_CREATED))
.modified(getFieldFromJsonNode(offer, EDCAssetConstant.ASSET_PROP_MODIFIED))
.publisher(getFieldFromJsonNode(offer, EDCAssetConstant.ASSET_PROP_PUBLISHER))
.version(getFieldFromJsonNode(offer, EDCAssetConstant.ASSET_PROP_VERSION))
.fileName(getFieldFromJsonNode(offer, EDCAssetConstant.ASSET_PROP_FILENAME))
.fileContentType(getFieldFromJsonNode(offer, EDCAssetConstant.ASSET_PROP_CONTENTTYPE))
.title(getFieldFromJsonNode(offer, edcstr + EDCAssetConstant.ASSET_PROP_NAME))
.type(getFieldFromJsonNode(offer, edcstr + EDCAssetConstant.ASSET_PROP_TYPE))
.description(getFieldFromJsonNode(offer, edcstr + EDCAssetConstant.ASSET_PROP_DESCRIPTION))
.created(getFieldFromJsonNode(offer, edcstr + EDCAssetConstant.ASSET_PROP_CREATED))
.modified(getFieldFromJsonNode(offer, edcstr + EDCAssetConstant.ASSET_PROP_MODIFIED))
.publisher(getFieldFromJsonNode(offer, edcstr + EDCAssetConstant.ASSET_PROP_PUBLISHER))
.version(getFieldFromJsonNode(offer, edcstr + EDCAssetConstant.ASSET_PROP_VERSION))
.fileName(getFieldFromJsonNode(offer, edcstr + EDCAssetConstant.ASSET_PROP_FILENAME))
.fileContentType(getFieldFromJsonNode(offer, edcstr + EDCAssetConstant.ASSET_PROP_CONTENTTYPE))
.connectorId(getFieldFromJsonNode(contractOfferCatalog, "edc:participantId")).build();

checkAndSetPolicyPermission(build, policy);