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.

Sign up for GitHub

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

Jump to bottom

fix: Remove cardinality restriction for comments on regions (DEV-3179) #3026

Merged
merged 5 commits into from
Feb 6, 2024
Merged

fix: Remove cardinality restriction for comments on regions (DEV-3179) #3026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2d576d
Update knora-base.ttl
BalduinLandolt Feb 6, 2024
a591413
update version string
BalduinLandolt Feb 6, 2024
3e1e67f
add migration plugin
BalduinLandolt Feb 6, 2024
cf924ce
update test data
BalduinLandolt Feb 6, 2024
8ad7ea8
Merge branch 'main' into feature/dev-3179-remove-cardinality-restrict…
BalduinLandolt Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test_data/generated_test_data/ontologyR2RV2/knoraApiOntologySimple.jsonld
View file
Open in desktop
Expand Up @@ -539,7 +539,7 @@
"owl:onProperty": {
"@id": "knora-api:hasComment"
},
"owl:minCardinality": 1
"owl:minCardinality": 0
},
{
"@type": "owl:Restriction",
Expand Down
2 changes: 1 addition & 1 deletion test_data/generated_test_data/ontologyR2RV2/knoraApiOntologySimple.rdf
View file
Open in desktop
Expand Up @@ -330,7 +330,7 @@
<rdfs:subClassOf>
<owl:Restriction>
<owl:minCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#integer"
>1</owl:minCardinality>
>0</owl:minCardinality>
<owl:onProperty>
<owl:DatatypeProperty rdf:about="http://api.knora.org/ontology/knora-api/simple/v2#hasComment"/>
</owl:onProperty>
Expand Down
2 changes: 1 addition & 1 deletion test_data/generated_test_data/ontologyR2RV2/knoraApiOntologySimple.ttl
View file
Open in desktop
Expand Up @@ -244,7 +244,7 @@ knora-api:Region rdf:type owl:Class ;
owl:onProperty knora-api:hasIncomingLink
] ;
rdfs:subClassOf [ rdf:type owl:Restriction ;
owl:minCardinality 1 ;
owl:minCardinality 0 ;
owl:onProperty knora-api:hasComment
] ;
knora-api:resourceIcon "region.gif" .
Expand Down
2 changes: 1 addition & 1 deletion test_data/generated_test_data/ontologyR2RV2/knoraApiOntologyWithValueObjects.jsonld
View file
Open in desktop
Expand Up @@ -3762,7 +3762,7 @@
"owl:onProperty": {
"@id": "knora-api:hasComment"
},
"owl:minCardinality": 1
"owl:minCardinality": 0
},
{
"@type": "owl:Restriction",
Expand Down
2 changes: 1 addition & 1 deletion test_data/generated_test_data/ontologyR2RV2/knoraApiOntologyWithValueObjects.rdf
View file
Open in desktop
Expand Up @@ -4829,7 +4829,7 @@
<rdfs:subClassOf>
<owl:Restriction>
<owl:minCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#integer"
>1</owl:minCardinality>
>0</owl:minCardinality>
<owl:onProperty>
<owl:ObjectProperty rdf:about="http://api.knora.org/ontology/knora-api/v2#hasComment"/>
</owl:onProperty>
Expand Down
2 changes: 1 addition & 1 deletion test_data/generated_test_data/ontologyR2RV2/knoraApiOntologyWithValueObjects.ttl
View file
Open in desktop
Expand Up @@ -4849,7 +4849,7 @@ knora-api:Region rdf:type owl:Class ;
owl:onProperty knora-api:hasPermissions
] ;
rdfs:subClassOf [ rdf:type owl:Restriction ;
owl:minCardinality 1 ;
owl:minCardinality 0 ;
owl:onProperty knora-api:hasComment
] ;
rdfs:subClassOf [ rdf:type owl:Restriction ;
Expand Down
10 changes: 5 additions & 5 deletions webapi/src/main/resources/knora-ontologies/knora-base.ttl
View file
Open in desktop
@@ -1,4 +1,4 @@
###
###
# * Copyright © 2021 - 2024 Swiss National Data and Service Center for the Humanities and/or DaSCH Service Platform contributors.
# * SPDX-License-Identifier: Apache-2.0
###
Expand All @@ -19,7 +19,7 @@
rdf:type owl:Ontology ;
rdfs:label "The Knora base ontology"@en ;
:attachedToProject knora-admin:SystemProject ;
:ontologyVersion "knora-base v26" .
:ontologyVersion "knora-base v27" .


#################################################################
Expand Down Expand Up @@ -659,10 +659,10 @@
:hasSequenceBounds
rdf:type owl:ObjectProperty ;
:objectClassConstraint :IntervalValue ;
:isEditable true ;
:isEditable true ;
rdfs:subPropertyOf :hasValue ;
rdfs:label "Sequenz-Grenzen"@de,
"Sequence Bounds"@en;
"Sequence Bounds"@en ;
rdfs:comment "Indicates the bounds of a sequence, i.e. the start and end point in the containing resource."@en .


Expand Down Expand Up @@ -1769,7 +1769,7 @@
owl:cardinality "1"^^xsd:nonNegativeInteger ],
[ rdf:type owl:Restriction ;
owl:onProperty :hasComment ;
owl:minCardinality "1"^^xsd:nonNegativeInteger ] ;
owl:minCardinality "0"^^xsd:nonNegativeInteger ] ;
:resourceIcon "region.gif"^^xsd:string ;
:canBeInstantiated true ;
rdfs:comment "Represents a geometric region of a resource. The geometry is represented currently as JSON string."@en .
Expand Down
2 changes: 1 addition & 1 deletion webapi/src/main/scala/org/knora/webapi/package.scala
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ package object webapi {
* The version of `knora-base` and of the other built-in ontologies that this version of Knora requires.
* Must be the same as the object of `knora-base:ontologyVersion` in the `knora-base` ontology being used.
*/
val KnoraBaseVersion: String = "knora-base v26"
val KnoraBaseVersion: String = "knora-base v27"

/**
* `IRI` is a synonym for `String`, used to improve code readability.
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala
View file
Open in desktop
Expand Up @@ -60,7 +60,8 @@ object RepositoryUpdatePlan {
PluginForKnoraBaseVersion(versionNumber = 23, plugin = new UpgradePluginPR2094(log)),
PluginForKnoraBaseVersion(versionNumber = 24, plugin = new MigrateOnlyBuiltInGraphs), // PR 2076
PluginForKnoraBaseVersion(versionNumber = 25, plugin = new MigrateOnlyBuiltInGraphs), // PR 2268
PluginForKnoraBaseVersion(versionNumber = 26, plugin = new MigrateOnlyBuiltInGraphs) // PR 3003
PluginForKnoraBaseVersion(versionNumber = 26, plugin = new MigrateOnlyBuiltInGraphs), // PR 3003
PluginForKnoraBaseVersion(versionNumber = 27, plugin = new MigrateOnlyBuiltInGraphs) // PR 3026
// KEEP IT ON THE BOTTOM
// From "versionNumber = 6" don't use prBasedVersionString!
)
Expand Down