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

Editorial rework merge #207

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
826d89a
adding DCAT into JSON schema
tr-sap Mar 7, 2023
e88ab43
catalog schema DCAT fix
tr-sap Mar 8, 2023
193aa90
fix catalog schema - DCAT
tr-sap Mar 8, 2023
9e3966f
fix catalog schema type error - DCAT
tr-sap Mar 8, 2023
12e9947
DCAT catalog-shape added for Catalog class
tr-sap Mar 8, 2023
f5a05d3
fix typo in DCAT of catalog schema
tr-sap Mar 8, 2023
9f9096b
fix type of dct:modified in DCAT of catalog schema
tr-sap Mar 8, 2023
95e241b
DCAT dcat:CatalogRecord class added to catalog shape
tr-sap Mar 8, 2023
da30fb2
fix DCAT referecen in Resource catalog
tr-sap Mar 8, 2023
d6923e2
DCAT wrong property of Resource removed
tr-sap Mar 8, 2023
a5d74c5
Fix DCAT catalog property of Resource
tr-sap Mar 8, 2023
6be2056
ResourceShape added to catalog-shape.ttl
tr-sap Mar 8, 2023
865ee2e
RelationshipShape added to catalog-shape.ttl
tr-sap Mar 8, 2023
d746e19
DCAT fix issue in skos:Concept
tr-sap Mar 8, 2023
831a3e3
DCAT ConceptShape ConceptSchemeShape and AgentShape added
tr-sap Mar 8, 2023
d18c2b5
DCAT fix of Dataset property
tr-sap Mar 8, 2023
8475650
DCAT DatasetShape added
tr-sap Mar 8, 2023
29c3057
DCAT DataServiceShape added
tr-sap Mar 8, 2023
624d08c
DCAT Distribution catalog issue in type
tr-sap Mar 8, 2023
a5a288a
DCAT typo in property
tr-sap Mar 8, 2023
ae364a0
DCAT DataServiceShape added
tr-sap Mar 8, 2023
8478bc0
add references for reused classes & datatypes
sebbader-sap Mar 9, 2023
bbc579b
Merge pull request #1 from tr-sap/review_sebastian
tr-sap Mar 14, 2023
db3a298
clean up on schema
tr-sap Mar 21, 2023
48c64b1
properties changed
tr-sap Mar 22, 2023
ef55838
refactoring
tr-sap Apr 3, 2023
b22a2d3
refactoring
tr-sap Apr 3, 2023
0a1638d
Merge branch 'main' into dcat-catalog-schema-and-shape
sebbader-sap Apr 17, 2023
6400b06
change dct:issued from string to dateTime
sebbader-sap May 3, 2023
aba4407
fix dct:language from xsd:string to referencing a resource
sebbader-sap May 3, 2023
4e92cc0
correcting hasPolicy declarations
sebbader-sap May 3, 2023
fdafeea
reviewing the catalog json schema
sebbader-sap May 25, 2023
3184fda
refactor catalog json schema
sebbader-sap May 31, 2023
907e0ef
add odrl policy json schema
sebbader-sap May 31, 2023
42c7d42
fix syntax bugs in catalog json schema and adding foaf to the context…
sebbader-sap May 31, 2023
a3b96b6
fix bugs in catalog and contract json schemas
sebbader-sap May 31, 2023
0912192
fix examples to match to the catalog and contract json schemas
sebbader-sap May 31, 2023
87186d8
replace relative reference to the contract-schema.json with an absolu…
sebbader-sap Jun 1, 2023
8b895cf
Merge branch 'main' into dcat-catalog-schema-and-shape
sebbader-sap Jun 1, 2023
5ff009c
fix findings from mkollenstart's review
sebbader-sap Jul 13, 2023
74f77d2
testing negotiation-subtask-1.1 branch
SimantVerma-Bcone Sep 7, 2023
8ae42d5
removing the test change
SimantVerma-Bcone Sep 7, 2023
dcb8895
unwnated characters
SimantVerma-Bcone Sep 7, 2023
9e6ec39
Task #1: fix schemas and examples in "negotiation"
SimantVerma-Bcone Sep 7, 2023
9818c39
correct references to GitHub raw files
sebbader-sap Sep 7, 2023
8c70bfc
making 'required' field compatible to json 2019-09
SimantVerma-Bcone Sep 8, 2023
e8c8527
changes suggested by Sebastian
SimantVerma-Bcone Sep 12, 2023
71d19e2
changes to processId, correcting ref, removing Sec
SimantVerma-Bcone Sep 20, 2023
aa6626a
chnages since last review
SimantVerma-Bcone Sep 20, 2023
d1e526a
left over change
SimantVerma-Bcone Sep 20, 2023
01e1698
missing s in dspace
SimantVerma-Bcone Sep 20, 2023
f8cf0d6
removing RightOperand property
SimantVerma-Bcone Sep 20, 2023
6ef346a
chnage in Permission, Json validated
SimantVerma-Bcone Sep 20, 2023
ef6d2d5
catalog subtask changes
SimantVerma-Bcone Sep 20, 2023
53bd73d
Merge commit '6ef346af1ba959845dac79e2de08093d548741c8' into dcat-cat…
sebbader-sap Sep 21, 2023
fabc4d6
Merge branch 'main' into dcat-catalog-schema-and-shape
sebbader-sap Sep 21, 2023
a0cabb1
reverting dspace:filter type to object
SimantVerma-Bcone Sep 21, 2023
f4250a3
re-introducing updates to the json schemas
sebbader-sap Sep 21, 2023
7845f6d
fix filter in contract-request-message-schema
sebbader-sap Sep 21, 2023
8c04381
Merge branch 'dcat-catalog-schema-and-shape' into catalog-subtask
sebbader-sap Sep 21, 2023
7a211c4
fixing schema in "Transfer"
SimantVerma-Bcone Sep 22, 2023
8410c2e
Merge pull request #4 from simantvermasap/transfer-subtask
simantvermasap Sep 25, 2023
1b110bf
Merge pull request #3 from simantvermasap/catalog-subtask
simantvermasap Sep 25, 2023
6e9d024
Trying Shapes validation with Json-LD
SimantVerma-Bcone Sep 26, 2023
0f60ffa
debugging catalog shapes
sebbader-sap Sep 27, 2023
5753e20
fixing shapes in Catalog
SimantVerma-Bcone Oct 3, 2023
58689ac
Negotaitaion Shapes validation
SimantVerma-Bcone Oct 6, 2023
8c93621
Merge branch 'dcat-catalog-schema-and-shape' into negotiation-subtask…
sebbader-sap Oct 9, 2023
6483f07
Remove the ContractAgreement shape
sebbader-sap Oct 9, 2023
135bcb2
add the AgreementShape
sebbader-sap Oct 9, 2023
69b2816
Negotiation shapes correction
SimantVerma-Bcone Oct 10, 2023
60fafe8
Merge branch 'negotiation-subtask-1.1' of https://github.com/simantve…
SimantVerma-Bcone Oct 10, 2023
18e58da
conflict merge
SimantVerma-Bcone Oct 10, 2023
60ad44b
schema and shapes re-validating after merge
SimantVerma-Bcone Oct 10, 2023
a3a62d2
change assigner and assignee to string
sebbader-sap Oct 11, 2023
ff050aa
introduve verifiable credential structure to agreement msg
sebbader-sap Oct 11, 2023
6c2c546
adjust agreement msg example to vc pattern
sebbader-sap Oct 11, 2023
6b4a32e
comment error
SimantVerma-Bcone Oct 12, 2023
96e3f87
Catalog shapes changes
SimantVerma-Bcone Oct 12, 2023
35bd224
Shapes and schema validation for Transfer
SimantVerma-Bcone Oct 18, 2023
fb2c1a8
Introduce sh:IRI pattern for agreementId
sebbader-sap Oct 18, 2023
b117232
correction for dspace:reason and others
SimantVerma-Bcone Oct 18, 2023
37cfa5e
dataset schema and puml
SimantVerma-Bcone Oct 27, 2023
85f8b45
Update catalog-error-schema.json - remove "dspace:code" and "dspace:r…
simantvermasap Nov 3, 2023
a2b7f7f
Update dataset-schema.json - remove "dct:title" and "dct:description"…
simantvermasap Nov 3, 2023
cf2cf76
Merge branch 'main' into catalog-subtask
SimantVerma-Bcone Nov 6, 2023
23efadf
agreement verification change
SimantVerma-Bcone Nov 6, 2023
e2eb7b4
Merge branch 'main' into transfer-subtask
SimantVerma-Bcone Nov 7, 2023
89712b2
Transfer Messages - shapes and schema validation
SimantVerma-Bcone Nov 7, 2023
0784b38
removing "@id" from transfer messages
SimantVerma-Bcone Nov 8, 2023
fe55630
Merge branch 'shapes-and-schemas-subtask' of https://github.com/siman…
SimantVerma-Bcone Nov 10, 2023
3633583
Merge transfer into shapes-and-schemas-subtask
SimantVerma-Bcone Nov 10, 2023
a9ceee9
Merge remote-tracking branch 'origin/negotiation-subtask-1.1' into sh…
SimantVerma-Bcone Nov 10, 2023
8aaa0f1
correction for catalog schema
SimantVerma-Bcone Nov 14, 2023
0cb569b
error handling
SimantVerma-Bcone Nov 17, 2023
97bbc9a
pull request #11 changes
SimantVerma-Bcone Nov 24, 2023
95c8e74
pull request changes
SimantVerma-Bcone Nov 29, 2023
1a83c11
Merge branch 'International-Data-Spaces-Association:main' into shapes…
simantvermasap Dec 6, 2023
67c6491
Merge branch 'shapes-and-schemas-subtask' into editorial-rework
SimantVerma-Bcone Jan 26, 2024
0a8d7fb
new chnages to editorial-rework
SimantVerma-Bcone Jan 26, 2024
ada9e22
merge editorial-rework to shapes-and-schemas
SimantVerma-Bcone Feb 1, 2024
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
2 changes: 1 addition & 1 deletion catalog/catalog.protocol.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,4 @@ When a [Catalog](../model/terminology.md#catalog) contains protected [Datasets](

### 4.4 Catalog Brokers

A [Dataspace](../model/terminology.md#dataspace) may include Catalog Brokers. A Catalog Broker is a [Consumer](../model/terminology.md#consumer) that has trusted access to 1..N upstream [Catalog Services](../model/terminology.md#catalog-service) and advertises their respective [Catalogs](../model/terminology.md#catalog) as a single [Catalog Service](../model/terminology.md#catalog-service). The broker is expected to honor upstream access control requirements.
A [Dataspace](../model/terminology.md#dataspace) may include Catalog Brokers. A Catalog Broker is a [Consumer](../model/terminology.md#consumer) that has trusted access to 1..N upstream [Catalog Services](../model/terminology.md#catalog-service) and advertises their respective [Catalogs](../model/terminology.md#catalog) as a single [Catalog Service](../model/terminology.md#catalog-service). The broker is expected to honor upstream access control requirements.
17 changes: 2 additions & 15 deletions catalog/message/schema/catalog-error-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,10 @@
"type": "string"
},
"dspace:reason": {
"type": "array",
"items": {
"type": "object",
"properties": {
"@value": {
"type": "string"
},
"@language": {
"type": "string"
}
},
"required": ["@value", "@language"]
},
"minItems": 1
"type": "array"
}
},
"required": [ "@context", "@type" ]
}
}
}
}
5 changes: 1 addition & 4 deletions catalog/message/schema/catalog-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@
}
}
],
"required": [
"@context",
"@type"
],
"required": [ "@context", "@type" ],
"additionalProperties": false
}
}
Expand Down
9 changes: 2 additions & 7 deletions catalog/message/schema/dataset-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,7 @@
"type": "string"
}
},
"required": [
"@id"
]
"required": [ "@id" ]
},
"Multilanguage": {
"type": "object",
Expand All @@ -163,10 +161,7 @@
"type": "string"
}
},
"required": [
"@value",
"@language"
]
"required": [ "@value", "@language" ]
}
}
}
6 changes: 4 additions & 2 deletions catalog/message/shape/catalog-error-shape.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ dspace_shapes:CatalogErrorShape
sh:datatype xsd:string ;
] ;
sh:property [
sh:path dspace:reason ;
sh:path dspace:reason ;
sh:datatype rdf:langString ;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should line 37 be indented then as well?

] .
] ;

.
1 change: 1 addition & 0 deletions catalog/message/shape/catalog-request-message-shape.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ dspace_shapes:CatalogRequestMessageShape
a sh:PropertyShape ;
sh:path dspace:filter ;
] ;

.
78 changes: 78 additions & 0 deletions catalog/message/shape/dataset-shape.ttl
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix dct: <http://purl.org/dc/terms/> .
@prefix dcat: <http://www.w3.org/ns/dcat#> .
@prefix odrl: <http://www.w3.org/ns/odrl/2/> .
@prefix cred: <https://www.w3.org/2018/credentials#> .
@prefix sec: <https://w3id.org/security#> .
@prefix prov: <http://www.w3.org/ns/prov#> .

@prefix dspace: <https://w3id.org/dspace/v0.8/> .
@prefix dspace_shapes: <https://w3id.org/dspace/shapes/v0.8/> .

@prefix sh: <http://www.w3.org/ns/shacl#> .

dspace_shapes:
a owl:Ontology ;
sh:declare [
sh:prefix "rdf" ;
sh:namespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"^^xsd:anyURI ;
] ;
sh:declare [
sh:prefix "dspace" ;
sh:namespace "https://w3id.org/dspace/v0.8/"^^xsd:anyURI ;
] ;
.

dspace_shapes:DatasetShape
a sh:NodeShape ;
sh:targetClass dcat:Dataset ;

sh:property [
a sh:PropertyShape ;
sh:path dcat:distribution ;
simantvermasap marked this conversation as resolved.
Show resolved Hide resolved
sh:class dcat:Distribution ;
sh:minCount 0;
sh:severity sh:Violation ;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): A dcat:distribution property must point to a dcat:Distribution."@en ;
] ;

sh:property [
a sh:PropertyShape ;
sh:path dcat:keyword ;
sh:datatype xsd:string ;
sh:minCount 0;
sh:severity sh:Violation ;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): A dcat:keyword property must point to a xsd:string field."@en ;
] ;

sh:property [
a sh:PropertyShape ;
sh:path dct:description ;
sh:datatype rdf:langString ;
sh:minCount 0;
sh:severity sh:Violation ;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): A dct:description property must point to a rdf:langString field."@en ;
] ;

sh:property [
a sh:PropertyShape ;
sh:path dct:title ;
sh:datatype xsd:string ;
simantvermasap marked this conversation as resolved.
Show resolved Hide resolved
sh:minCount 0;
sh:severity sh:Violation ;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): A dct:title property must point to a xsd:string field."@en ;
] ;

sh:property [
a sh:PropertyShape ;
sh:path odrl:hasPolicy ;
sh:class odrl:Policy ;
sh:severity sh:Violation ;
sh:minCount 0;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dataset-shape.ttl> (DatasetShape): An odrl:hasPolicy property must point to an odrl:Policy."@en ;
] ;

.
1 change: 1 addition & 0 deletions common/schema/context.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"dspace:catalog": { "@container": "@set" },
"dspace:filter": { "@container": "@set" },
"dspace:timestamp": { "@type": "xsd:dateTime" },
"dspace:callbackAddress": { "@type": "xsd:anyURI" },

"foaf:homepage": { "@type": "xsd:anyURI" },

Expand Down
4 changes: 3 additions & 1 deletion negotiation/message/diagram/contract-agreement-message.puml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ class "dspace:ContractAgreementMessage" {
class odrl:Agreement {
@type : "odrl:Agreement"
@id: String
odrl:target : xsd:anyURI
dspace:timestamp : xsd:dateTime
...
dspace:consumerId : String
dspace:providerId : String
}

"dspace:ContractAgreementMessage" "1" *-- "1" "odrl:Agreement" : "odrl:agreement"
Expand Down
9 changes: 3 additions & 6 deletions negotiation/message/schema/contract-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,7 @@
]
}
],
"required": [
"@type",
"dspace:providerId"
]
"required": [ "@type", "dspace:providerId" ]
},
"Agreement": {
"type": "object",
Expand All @@ -114,8 +111,8 @@
"const": "odrl:Agreement"
},
"dspace:timestamp": {
"type": "string",
"pattern": "-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?"
"type": "string",
"pattern": "-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion releases/v0.8/catalog/message/catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@
}
}
]
}
}
2 changes: 1 addition & 1 deletion releases/v0.8/catalog/message/dataset-request-message.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"@context": "https://w3id.org/dspace/v0.8/context.json",
"@type": "dspace:DatasetRequestMessage",
"dspace:dataset": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88"
}
}
2 changes: 1 addition & 1 deletion releases/v0.8/catalog/message/dataset.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
]
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
},
"dspace:signature": {},
"dspace:callbackAddress": "https://......"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,5 @@
"@context": "https://w3id.org/dspace/v0.8/context.json",
"@type": "dspace:ContractAgreementVerificationMessage",
"dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
"dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
"dspace:hashedMessage": {
"dspace:digest": "some-hash",
"dspace:algorithm": "SHA-384"
},
"dspace:signature": {}
}
"dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833"
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
"dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
"dspace:eventType": "dspace:ACCEPTED"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
"@language": "en"
}
]
}
}
12 changes: 6 additions & 6 deletions releases/v0.8/negotiation/message/contract-negotiation.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": "https://w3id.org/dspace/v0.8/context.json",
"@type": "dspace:ContractNegotiation",
"dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
"dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
"dspace:state": "dspace:REQUESTED"
}
"@context": "https://w3id.org/dspace/v0.8/context.json",
"@type": "dspace:ContractNegotiation",
"dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
"dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
"dspace:state": "dspace:REQUESTED"
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
}]
},
"dspace:callbackAddress": "https://......"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
"odrl:target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88"
},
"dspace:callbackAddress": "https://......"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"@type": "dspace:TransferCompletionMessage",
"dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
"dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833"
}
}
2 changes: 1 addition & 1 deletion releases/v0.8/transfer/message/transfer-error.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
{},
{}
]
}
}
13 changes: 12 additions & 1 deletion releases/v0.8/transfer/message/transfer-start-message.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,16 @@
"@type": "dspace:TransferStartMessage",
"dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
"dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
"dspace:dataAddress": "https://......"
"dspace:dataAddress": {
"@type": "dspace:DataAddress",
"dspace:endpointType": "https://w3id.org/idsa/v4.1/HTTP",
"dspace:endpoint": "http://example.com",
"dspace:endpointProperties": [
{
"@type": "dspace:EndpointProperty",
"dspace:name": "Authorization",
"dspace:value": "Bearer TOKEN-ABCDEFG"
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
{},
{}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
{},
{}
]
}
}
2 changes: 2 additions & 0 deletions transfer/message/diagram/transfer-request-message.puml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In #184, we removed the explicit listing of properties that have a linked class in the .puml diagrams.

Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ class "dspace:TransferRequestMessage" {
dspace:agreementId : String
dct:format : String
dspace:callbackAddress : String
dspace:dataAddress : dspace:DataAddress
}

class "dspace:DataAddress" {
@type : "dspace:DataAddress"
dspace:endpointType : String
dspace:endpoint : String
dspace:endpointProperties : dspace:EndpointProperty
}

class "dspace:EndpointProperty" {
Expand Down
2 changes: 2 additions & 0 deletions transfer/message/diagram/transfer-start-message.puml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see previous comment

Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ class "dspace:TransferStartMessage" {
@type : "dspace:TransferStartMessage"
dspace:providerPid : String
dspace:consumerPid : String
dspace:dataAddress : dspace:DataAddress
}

class "dspace:DataAddress" {
@type : "dspace:DataAddress"
dspace:endpointType : String
dspace:endpoint : String
dspace:endpointProperties : dspace:EndpointProperty
}

class "dspace:EndpointProperty" {
Expand Down
5 changes: 1 addition & 4 deletions transfer/message/schema/transfer-error-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@
},
"dspace:reason": {
"type": "array",
"minItems": 1,
"items": {

}
"items": {}
}
},
"required": [ "@context", "@type", "dspace:providerPid", "dspace:consumerPid"]
Expand Down
2 changes: 1 addition & 1 deletion transfer/message/schema/transfer-process-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
]
}
},
"required": [ "@context", "@type", "dspace:providerPid", "dspace:consumerPid", "dspace:consumerPid", "dspace:state" ]
"required": [ "@context", "@type", "dspace:providerPid", "dspace:consumerPid", "dspace:state" ]
}
}
}
Loading