Fix property names for incoming links #1144
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
benjamingeer
commented
Jan 8, 2019
| @@ -383,7 +383,7 @@ object ConstructResponseUtilV2 { | |||
|
|
|||
| if (incomingLinkAssertions.nonEmpty) { | |||
| // create a virtual property representing an incoming link | |||
| val incomingProps: (IRI, Seq[ValueRdfData]) = OntologyConstants.KnoraBase.HasIncomingLink -> incomingLinkAssertions.values.toSeq.flatten.map { | |||
| val incomingProps: (IRI, Seq[ValueRdfData]) = OntologyConstants.KnoraBase.HasIncomingLinkValue -> incomingLinkAssertions.values.toSeq.flatten.map { | |||
There was a problem hiding this comment.
This is the key place where this actually gets used.
|
I think in Knora-ui only the test data has to be updated. We can do that tomorrow morning. |
tobiasschweizer
suggested changes
Jan 9, 2019
There was a problem hiding this comment.
Some tests fail:
java.lang.AssertionError: assertion failed: property Iris are different for resource JsonLDString(http://rdfh.ch/8be1b7cf7103): expected Set(http://api.knora.org/ontology/knora-api/v2#hasIncomingLink, http://api.knora.org/ontology/knora-api/v2#attachedToProject, http://api.knora.org/ontology/knora-api/v2#creationDate, http://0.0.0.0:3333/ontology/0803/incunabula/v2#title, http://api.knora.org/ontology/knora-api/v2#attachedToUser, http://api.knora.org/ontology/knora-api/v2#hasPermissions), received Set(http://api.knora.org/ontology/knora-api/v2#hasIncomingLinkValue, http://api.knora.org/ontology/knora-api/v2#attachedToProject, http://api.knora.org/ontology/knora-api/v2#creationDate, http://0.0.0.0:3333/ontology/0803/incunabula/v2#title, http://api.knora.org/ontology/knora-api/v2#attachedToUser, http://api.knora.org/ontology/knora-api/v2#hasPermissions)
I think the tests data simply has to be adapted (hasIncomingLink -> hasIncomingLinkValue)
|
@tobiasschweizer OK to merge now? |
benjamingeer
pushed a commit
to dasch-swiss/knora-ui
that referenced
this pull request
Jan 9, 2019
tobiasschweizer
approved these changes
Jan 9, 2019
# Conflicts: # webapi/src/test/resources/test-data/ontologyR2RV2/knoraApiOntologyWithValueObjects.rdf
benjamingeer
pushed a commit
to dasch-swiss/knora-ui
that referenced
this pull request
Jan 9, 2019
* test (knora-core): Update test data to reflect dasch-swiss/dsp-api#1144 * test (knora-core): Update more test data.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
hasIncomingLinktohasIncomingLinkValue, because the name of a link value property must end inValue. Also rename the corresponding virtual property inknora-base.hasIncomingLinkto theknora-apiontology.Corresponding PR in
Knora-ui: dasch-swiss/knora-ui#148Fixes #1135.