Update ontology entities (part 2) #707

benjamingeer · 2018-01-16T15:01:54Z

Change a property's label or comment.
Create a class.
Change a class's label or comment.
Add cardinalities to a class if it is not used in data.
Replace a class's cardinalities with new ones if it is not used in data.
Delete a property if it is not used in data or ontologies.
Delete a class if it is not used in data or ontologies.
After updating an ontology entity, reload it from the triplestore to check that it was saved correctly.
Document the ontology API.

If an ontology is created using this API, the ontology inconsistencies discussed in #286 are prevented.

I had to:

Refactor the loading and caching of ontologies in OntologyResponderV2.
Add support for blank nodes as subjects in SparqlExtendedConstructResponse, because we need them to read cardinalities from a class definition using CONSTRUCT.
Undo the SPARQL-escaping of the input after an update, so the input can be compared to the data that was saved in the triplestore.

Resolves #603.
Resolves #579.
Resolves #286.
Resolves #242.
Resolves #157.
Resolves #104.
Resolves #710.

…eck that it's correct.

…oing).

…erty. - Add unit test for that.

- Fix bugs in the comparison of SPARQL-escaped input with data read from the triplestore.

…this branch.

- Refactor SparqlExtendedConstructResponse to distinguish between blank nodes and IRIs.

- Refactor the ontology responder to calculate cardinality inheritance, and recalculate class hierarchies, when adding a class definition. - Do more error-checking. - Fix getClassDefinition.scala.txt not to return bogus blank nodes. - Add a test.

…e bugs. - Cache abstract classes in OntologyResponderV2, and hide them when necessary in OntologyResponderV1.

- More tests.

- When creating a class or adding cardinalities, if new cardinalities override inherited ones, check that they are at least as restrictive.

- Fix incorrect SPARQL-unescaping.

- Add an e2e test for that.

… used in data.

…rchies.

benjamingeer · 2018-02-01T17:11:04Z

@kilchenmann I think this is ready to use now. Could you please read the documentation in docs/rst/knora-api-server/api_v2/ontology-information.rst and see if it's clear and complete enough?

kilchenmann

Thanks Ben. I will have a closer look on it after my vacation.

benjamingeer · 2018-02-02T13:38:49Z

@kilchenmann Bon voyage!

- Clarify consistency rules in ontology API doc. - Test edit conflict prevention.

…another test.

tobiasschweizer · 2018-02-02T17:17:47Z

webapi/src/test/resources/test-data/searchR2RV2/ThingWithBooleanOptional.jsonld

@@ -1,6 +1,10 @@
 {
  "@type" : "schema:ItemList",
  "schema:itemListElement" : [ {
+    "@id" : "http://data.knora.org/nResNuvARcWYUdWyo0GWGw",
+    "@type" : "anything:Thing",


I like things.

tobiasschweizer · 2018-02-06T10:12:08Z

docs/rst/knora-api-server/api_v2/ontology-information.rst

+
+Currently, the only modifiable ontology metadata is the ontology's ``rdfs:label``.
+
+::


knora-api:hasOntologies is not used here either (see "Creating a New Ontology")

benjamingeer · 2018-02-06T12:32:02Z

Review tasks from @tobiasschweizer:

When creating an entity, make sure its local name is validated
Use hasOntologies to update ontology metadata
In tests, if one ontology is expected, check that there's only one
Make a separate test for InputOntologiesV2.fromJsonLD
When updating an entity, check that it's in the same ontology as the one specified in hasOntologies
In addCardinalitiesToClass.scala.txt, check that the class exists
Add a boolean isValueClass to value classes in knora-api in the default schema

benjamingeer · 2018-02-07T11:09:08Z

@tobiasschweizer Can I merge this now?

tobiasschweizer · 2018-02-07T11:54:32Z

I will have another look at it just after lunch

tobiasschweizer

Looks good to me.

Thx. for the isValueClass flag!

…basel/Knora into wip/goldbach_beta_release * 'wip/goldbach_beta_release' of https://github.com/dhlab-basel/Knora: Update ontology entities (part 2) (#707)

tobiasschweizer · 2018-02-12T07:00:57Z

@benjamingeer Can this branch be deleted?

benjamingeer · 2018-02-12T07:19:22Z

Yes thanks!

tobiasschweizer · 2018-02-12T07:19:59Z

I like deleting things. I believe you do too.

Benjamin Geer added 11 commits January 16, 2018 16:00

feature (webapi): After saving a property definition, reload it to ch…

083fce4

…eck that it's correct.

feature (webapi): Change a property's labels (ongoing).

d4de4a2

feature (webapi): Change a property's rdfs:label or rdfs:comment (ong…

e992a69

…oing).

feature (webapi): Add route for changing labels or comments of a prop…

f403c8c

…erty. - Add unit test for that.

test (webapi): Add r2r tests for changing property labels and comments.

1dc7467

- Fix bugs in the comparison of SPARQL-escaped input with data read from the triplestore.

feature (webapi): Add a class to an ontology (ongoing).

8e62761

feature (webapi): Add a class definition (ongoing).

d0dcfe7

Merge branch 'develop' into wip/ontology-updates-7

a6bdd23

fix (webapi): Fix build and test breakage after merging develop into …

f5e98c6

…this branch.

feature (webapi): Add a class to an ontology.

d16f4b2

- Refactor SparqlExtendedConstructResponse to distinguish between blank nodes and IRIs.

benjamingeer mentioned this pull request Jan 25, 2018

Two warnings while compiling webapi #710

Closed

Benjamin Geer added 14 commits January 25, 2018 15:59

fix (webapi): Fix stupid bug.

cfed9a1

test (webapi): Add more tests of resource class creation, and fix mor…

509adcc

…e bugs. - Cache abstract classes in OntologyResponderV2, and hide them when necessary in OntologyResponderV1.

test (webapi): Create properties and classes.

da9bbdd

- More tests.

test (webapi): More property creation tests.

71c2a0a

feature (webapi): Add cardinalities to a class (ongoing).

086a2f3

- When creating a class or adding cardinalities, if new cardinalities override inherited ones, check that they are at least as restrictive.

test (webapi): Add cardinalities to a class.

6262a6d

feature (webapi): Change the labels or comments of a class (ongoing).

cbe8989

- Fix incorrect SPARQL-unescaping.

test (webapi): Change the labels or comments of a class.

657d384

feature (webapi): Change the labels or comments of a class.

d3534c7

- Add an e2e test for that.

feature (webapi): Don't allow adding cardinalities to a class if it's…

7caee70

… used in data.

refactor (webapi): Remove redunant response schema argument.

557c734

Merge branch 'develop' into wip/ontology-updates-7

2b7ccef

Merge branch 'develop' into wip/ontology-updates-7

0e8e0b9

feature (webapi): Change a class's cardinalities.

5fa1372

benjamingeer mentioned this pull request Jan 31, 2018

Reference to uninitialized value #715

Closed

Benjamin Geer added 3 commits January 31, 2018 15:44

feature (webapi): Delete a class or property.

eb79dd6

fix (webapi): Fix #157.

8eefc05

fix (webapi): Check for duplicate IRIs and cyclical inheritance hiera…

42f1c3c

…rchies.

benjamingeer requested a review from kilchenmann February 1, 2018 17:09

benjamingeer assigned tobiasschweizer Feb 1, 2018

Benjamin Geer added 2 commits February 2, 2018 13:59

Merge branch 'develop' into wip/ontology-updates-7

0938d49

docs (webapi): Mention consistency requirement for ontology update API.

995a702

kilchenmann reviewed Feb 2, 2018

View reviewed changes

Benjamin Geer added 2 commits February 2, 2018 15:37

fix (webapi): Don't modify a class's cardinalities if it has a subclass.

50c5ad4

- Clarify consistency rules in ontology API doc. - Test edit conflict prevention.

test (webapi): Fix search test after the addition of a BlueThing for …

20889f4

…another test.

tobiasschweizer reviewed Feb 2, 2018

View reviewed changes

tobiasschweizer reviewed Feb 6, 2018

View reviewed changes

docs (webapi): Clarify creation of entity names.

2b1cf04

tobiasschweizer mentioned this pull request Feb 6, 2018

Ontology Cache Service: classes dhlab-basel/Salsah#161

Closed

Benjamin Geer added 4 commits February 6, 2018 16:35

test (webapi): Do some of the review tasks for #707.

6b38636

feature (webapi): More review tasks.

bf167de

Merge branch 'develop' into wip/ontology-updates-7

d6ac2dd

feature (webapi): Add knora-api:isValueClass.

aed536b

benjamingeer added the API/V2 label Feb 7, 2018

tobiasschweizer approved these changes Feb 7, 2018

View reviewed changes

benjamingeer merged commit f804346 into develop Feb 7, 2018

benjamingeer deleted the wip/ontology-updates-7 branch February 12, 2018 07:19

subotic added this to the v1.2.0 milestone Feb 12, 2018

benjamingeer mentioned this pull request Jul 5, 2019

Ben's PR history #571

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update ontology entities (part 2) #707

Update ontology entities (part 2) #707

benjamingeer commented Jan 16, 2018 •

edited

Loading

benjamingeer commented Feb 1, 2018

kilchenmann left a comment •

edited

Loading

benjamingeer commented Feb 2, 2018

tobiasschweizer Feb 2, 2018

tobiasschweizer Feb 6, 2018

benjamingeer commented Feb 6, 2018 •

edited

Loading

benjamingeer commented Feb 7, 2018

tobiasschweizer commented Feb 7, 2018

tobiasschweizer left a comment

tobiasschweizer commented Feb 12, 2018

benjamingeer commented Feb 12, 2018

tobiasschweizer commented Feb 12, 2018


		Currently, the only modifiable ontology metadata is the ontology's ``rdfs:label``.

		::

Update ontology entities (part 2) #707

Update ontology entities (part 2) #707

Conversation

benjamingeer commented Jan 16, 2018 • edited Loading

benjamingeer commented Feb 1, 2018

kilchenmann left a comment • edited Loading

Choose a reason for hiding this comment

benjamingeer commented Feb 2, 2018

tobiasschweizer Feb 2, 2018

Choose a reason for hiding this comment

tobiasschweizer Feb 6, 2018

Choose a reason for hiding this comment

benjamingeer commented Feb 6, 2018 • edited Loading

benjamingeer commented Feb 7, 2018

tobiasschweizer commented Feb 7, 2018

tobiasschweizer left a comment

Choose a reason for hiding this comment

tobiasschweizer commented Feb 12, 2018

benjamingeer commented Feb 12, 2018

tobiasschweizer commented Feb 12, 2018

benjamingeer commented Jan 16, 2018 •

edited

Loading

kilchenmann left a comment •

edited

Loading

benjamingeer commented Feb 6, 2018 •

edited

Loading