From a5ea62eeaaadb97caa456e7dc9e6946c44abcf5b Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Mon, 25 Apr 2022 14:05:05 +0200 Subject: [PATCH] refactor(triplestore): remove embedded-jena-tdb related code (#2043) * remove embedded-jena-tdb related code * remove TriplestoreTypes * remove triplestore param from sparql queries in admin * remove triplestore param from sparql queries in v1 * remove triplestore param from sparql queries in v2 * remove more triplestore params * minor improvements * fix: cache calls twirl template instead of resolving it, when trying to build cache from triplestore * fix: more wrong twirl template calls * docs: remove Jena TDB from docs Co-authored-by: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com> --- .../design/principles/design-overview.md | 9 +- .../design/principles/store-module.md | 169 +------ docs/05-internals/development/overview.md | 2 +- webapi/src/main/resources/application.conf | 12 - .../knora/webapi/responders/Responder.scala | 24 +- .../responders/admin/GroupsResponderADM.scala | 18 +- .../responders/admin/ListsResponderADM.scala | 37 +- .../admin/PermissionsResponderADM.scala | 40 +- .../admin/ProjectsResponderADM.scala | 52 +- .../responders/admin/SipiResponderADM.scala | 34 +- .../responders/admin/UsersResponderADM.scala | 46 +- .../responders/v1/CkanResponderV1.scala | 33 +- .../responders/v1/ListsResponderV1.scala | 5 +- .../responders/v1/ProjectsResponderV1.scala | 33 +- .../responders/v1/ResourcesResponderV1.scala | 65 +-- .../responders/v1/SearchResponderV1.scala | 17 +- .../responders/v1/UsersResponderV1.scala | 29 +- .../responders/v1/ValuesResponderV1.scala | 63 +-- .../responders/v2/OntologyResponderV2.scala | 53 +- .../responders/v2/ResourcesResponderV2.scala | 73 ++- .../responders/v2/SearchResponderV2.scala | 46 +- .../responders/v2/StandoffResponderV2.scala | 57 ++- .../responders/v2/ValuesResponderV2.scala | 27 +- .../webapi/responders/v2/ontology/Cache.scala | 66 +-- .../v2/ontology/Cardinalities.scala | 22 +- .../v2/ontology/OntologyHelpers.scala | 24 +- .../knora/webapi/settings/KnoraSettings.scala | 49 +- .../settings/KnoraSettingsConstants.scala | 9 - .../org/knora/webapi/settings/package.scala | 1 - .../triplestore/TriplestoreManager.scala | 19 +- .../triplestore/embedded/JenaTDBActor.scala | 465 ------------------ .../http/HttpTriplestoreConnector.scala | 68 +-- .../sparql/admin/canDeleteList.scala.txt | 4 +- .../sparql/admin/changeParentNode.scala.txt | 5 +- ...reateNewAdministrativePermission.scala.txt | 3 - ...NewDefaultObjectAccessPermission.scala.txt | 3 - .../sparql/admin/createNewGroup.scala.txt | 3 - .../sparql/admin/createNewListNode.scala.txt | 3 - .../sparql/admin/createNewProject.scala.txt | 3 - .../sparql/admin/createNewUser.scala.txt | 3 - .../queries/sparql/admin/deleteNode.scala.txt | 3 - .../sparql/admin/deletePermission.scala.txt | 3 - .../sparql/admin/getFileValue.scala.txt | 4 +- .../queries/sparql/admin/getGroups.scala.txt | 4 +- .../sparql/admin/getListNode.scala.txt | 4 +- .../admin/getListNodeWithChildren.scala.txt | 4 +- .../queries/sparql/admin/getLists.scala.txt | 4 +- .../sparql/admin/getNodePath.scala.txt | 4 +- .../sparql/admin/getParentNode.scala.txt | 4 +- .../sparql/admin/getPermissionByIRI.scala.txt | 4 +- .../admin/getProjectAdminData.scala.txt | 4 +- .../admin/getProjectAdminMembers.scala.txt | 4 +- .../sparql/admin/getProjectMembers.scala.txt | 4 +- .../sparql/admin/getProjectOfEntity.scala.txt | 4 +- .../admin/getProjectPermissions.scala.txt | 4 +- .../sparql/admin/getProjects.scala.txt | 4 +- .../queries/sparql/admin/getUsers.scala.txt | 4 +- .../sparql/admin/isEntityUsed.scala.txt | 4 +- .../queries/sparql/admin/isNodeUsed.scala.txt | 4 +- .../sparql/admin/updateGroup.scala.txt | 3 - .../sparql/admin/updateListInfo.scala.txt | 3 - .../sparql/admin/updateNodePosition.scala.txt | 3 - .../sparql/admin/updatePermission.scala.txt | 3 - .../sparql/admin/updateProject.scala.txt | 3 - .../queries/sparql/admin/updateUser.scala.txt | 3 - .../sparql/admin/updateUserPassword.scala.txt | 3 - .../sparql/v1/addValueVersion.scala.txt | 2 - .../queries/sparql/v1/changeComment.scala.txt | 2 - .../queries/sparql/v1/changeLink.scala.txt | 2 - .../sparql/v1/changeResourceLabel.scala.txt | 2 - .../sparql/v1/checkResourceDeletion.scala.txt | 4 +- .../v1/checkResourceLabelChange.scala.txt | 4 +- .../sparql/v1/checkValueDeletion.scala.txt | 4 +- .../queries/sparql/v1/ckanDokubib.scala.txt | 4 +- .../sparql/v1/ckanIncunabula.scala.txt | 4 +- .../queries/sparql/v1/createLink.scala.txt | 2 - .../sparql/v1/createNewResources.scala.txt | 2 - .../queries/sparql/v1/createValue.scala.txt | 2 - .../queries/sparql/v1/deleteLink.scala.txt | 2 - .../sparql/v1/deleteResource.scala.txt | 2 - .../queries/sparql/v1/deleteValue.scala.txt | 2 - .../sparql/v1/findLinkValueByIri.scala.txt | 4 +- .../sparql/v1/findLinkValueByObject.scala.txt | 4 +- .../sparql/v1/findResourceWithValue.scala.txt | 4 +- .../sparql/v1/findValueInVersions.scala.txt | 4 +- ...getAdministrativePermissionByIri.scala.txt | 4 +- ...tivePermissionForProjectAndGroup.scala.txt | 4 +- ...inistrativePermissionsForProject.scala.txt | 4 +- .../queries/sparql/v1/getContext.scala.txt | 4 +- .../sparql/v1/getCreatedResource.scala.txt | 4 +- ...getDefaultObjectAccessPermission.scala.txt | 4 +- ...faultObjectAccessPermissionByIri.scala.txt | 4 +- ...bjectAccessPermissionsForProject.scala.txt | 4 +- .../v1/getFileValuesForResource.scala.txt | 4 +- .../queries/sparql/v1/getGraphData.scala.txt | 4 +- .../queries/sparql/v1/getGroupByIri.scala.txt | 4 +- .../sparql/v1/getGroupByName.scala.txt | 4 +- .../sparql/v1/getGroupMembersByIri.scala.txt | 4 +- .../sparql/v1/getGroupMembersByName.scala.txt | 4 +- .../queries/sparql/v1/getGroups.scala.txt | 3 - .../sparql/v1/getIncomingReferences.scala.txt | 4 +- .../v1/getLastModificationDate.scala.txt | 4 +- ...etLinkSourceAndTargetPermissions.scala.txt | 4 +- .../twirl/queries/sparql/v1/getList.scala.txt | 4 +- .../queries/sparql/v1/getNodePath.scala.txt | 4 +- .../v1/getObjectAccessPermission.scala.txt | 4 +- .../v1/getProjectAdminMembersByIri.scala.txt | 4 +- ...etProjectAdminMembersByShortname.scala.txt | 4 +- .../sparql/v1/getProjectByIri.scala.txt | 4 +- .../sparql/v1/getProjectByShortcode.scala.txt | 4 +- .../sparql/v1/getProjectByShortname.scala.txt | 4 +- .../v1/getProjectMembersByIri.scala.txt | 4 +- .../v1/getProjectMembersByShortname.scala.txt | 4 +- .../queries/sparql/v1/getProjects.scala.txt | 3 - .../queries/sparql/v1/getRegions.scala.txt | 4 +- .../sparql/v1/getResourceClass.scala.txt | 4 +- .../sparql/v1/getResourceInfo.scala.txt | 4 +- .../getResourcePropertiesAndValues.scala.txt | 4 +- .../v1/getResourceSearchResult.scala.txt | 23 +- .../getResourceTypesForNamedGraph.scala.txt | 4 +- .../v1/getResourcesByProjectAndType.scala.txt | 4 +- .../sparql/v1/getUserByEmail.scala.txt | 4 +- .../queries/sparql/v1/getUserByIri.scala.txt | 4 +- .../queries/sparql/v1/getUsers.scala.txt | 3 - .../queries/sparql/v1/getValue.scala.txt | 4 +- .../sparql/v1/getVersionHistory.scala.txt | 4 +- .../queries/sparql/v1/isPartOf.scala.txt | 4 +- .../sparql/v1/searchExtended.scala.txt | 44 +- .../sparql/v1/searchFulltext.scala.txt | 23 +- .../v2/addCardinalitiesToClass.scala.txt | 4 +- .../sparql/v2/addValueVersion.scala.txt | 2 - .../v2/changeClassLabelsOrComments.scala.txt | 4 +- .../sparql/v2/changeLinkMetadata.scala.txt | 2 - .../sparql/v2/changeLinkTarget.scala.txt | 2 - .../v2/changeOntologyMetadata.scala.txt | 4 +- .../v2/changePropertyGuiElement.scala.txt | 4 +- .../changePropertyLabelsOrComments.scala.txt | 4 +- .../v2/changeResourceMetadata.scala.txt | 4 +- .../v2/changeValuePermissions.scala.txt | 2 - .../sparql/v2/checkResourceDeletion.scala.txt | 4 +- .../sparql/v2/checkValueDeletion.scala.txt | 4 +- .../queries/sparql/v2/createClass.scala.txt | 4 +- .../queries/sparql/v2/createLink.scala.txt | 2 - .../sparql/v2/createNewMapping.scala.txt | 4 +- .../sparql/v2/createNewResources.scala.txt | 2 - .../sparql/v2/createOntology.scala.txt | 4 +- .../sparql/v2/createProperty.scala.txt | 4 +- .../queries/sparql/v2/createValue.scala.txt | 2 - .../queries/sparql/v2/deleteClass.scala.txt | 4 +- .../queries/sparql/v2/deleteLink.scala.txt | 2 - .../sparql/v2/deleteOntology.scala.txt | 4 +- .../sparql/v2/deleteProperty.scala.txt | 4 +- .../sparql/v2/deleteResource.scala.txt | 4 +- .../queries/sparql/v2/deleteValue.scala.txt | 2 - .../queries/sparql/v2/eraseResource.scala.txt | 4 +- .../v2/getAllOntologyMetadata.scala.txt | 3 - ...getAllResourcesInProjectPrequery.scala.txt | 3 +- .../sparql/v2/getClassDefinition.scala.txt | 4 +- .../queries/sparql/v2/getDeleteDate.scala.txt | 4 +- .../queries/sparql/v2/getGraphData.scala.txt | 4 +- .../queries/sparql/v2/getMapping.scala.txt | 4 +- .../sparql/v2/getOntologyGraph.scala.txt | 4 +- .../sparql/v2/getOntologyInfo.scala.txt | 4 +- .../sparql/v2/getPropertyDefinition.scala.txt | 4 +- .../getResourcePropertiesAndValues.scala.txt | 4 +- .../getResourceValueVersionHistory.scala.txt | 3 +- ...esourcesByClassInProjectPrequery.scala.txt | 4 +- .../sparql/v2/getStandoffTagByUUID.scala.txt | 4 +- .../sparql/v2/isClassUsedInData.scala.txt | 4 +- .../queries/sparql/v2/isEntityUsed.scala.txt | 4 +- .../sparql/v2/isOntologyUsed.scala.txt | 4 +- .../v2/replaceClassCardinalities.scala.txt | 4 +- .../sparql/v2/searchFulltext.scala.txt | 7 +- .../sparql/v2/searchResourceByLabel.scala.txt | 4 +- .../sparql/v2/isPropertyUsed.scala.txt | 4 +- .../v1/ResourcesResponderV1Spec.scala | 33 +- .../responders/v1/ValuesResponderV1Spec.scala | 39 +- .../v2/ResourcesResponderV2Spec.scala | 32 +- .../v2/StandoffResponderV2Spec.scala | 6 +- .../triplestore/AllTriplestoreSpec.scala | 16 +- 180 files changed, 622 insertions(+), 1766 deletions(-) delete mode 100644 webapi/src/main/scala/org/knora/webapi/store/triplestore/embedded/JenaTDBActor.scala diff --git a/docs/05-internals/design/principles/design-overview.md b/docs/05-internals/design/principles/design-overview.md index 2e1d03592a..e79b970764 100644 --- a/docs/05-internals/design/principles/design-overview.md +++ b/docs/05-internals/design/principles/design-overview.md @@ -279,19 +279,14 @@ SPARQL queries are generated from templates, using the [Twirl](https://github.com/playframework/twirl) template engine. For example, if we're querying a resource, the template will contain a placeholder for the resource's IRI. The templates can be found under -`src/main/twirl/queries/sparql`. In many cases, different SPARQL must -be generated for different triplestores; the Twirl template function -then takes the name of the triplestore as a parameter, and may delegate -to triplestore-specific templates. +`src/main/twirl/queries/sparql`. -Responders are not expected to know which triplestore is being used or how it -is accessed. To perform a SPARQL SELECT query, a responder sends a `SparqlSelectRequest` +To perform a SPARQL SELECT query, a responder sends a `SparqlSelectRequest` message to the `storeManager` actor, like this: ```scala for { isEntityUsedSparql <- Future(queries.sparql.v2.txt.isEntityUsed( - triplestore = settings.triplestoreType, entityIri = entityIri, ignoreKnoraConstraints = ignoreKnoraConstraints, ignoreRdfSubjectAndObject = ignoreRdfSubjectAndObject diff --git a/docs/05-internals/design/principles/store-module.md b/docs/05-internals/design/principles/store-module.md index b4a25f8466..4434fe35b7 100644 --- a/docs/05-internals/design/principles/store-module.md +++ b/docs/05-internals/design/principles/store-module.md @@ -7,6 +7,9 @@ ## Overview +**GraphDB and embedded Jena TDB triplestores support is deprecated** since +[v20.1.1](https://github.com/dasch-swiss/dsp-api/releases/tag/v20.1.1) of DSP-API. + The store module houses the different types of data stores supported by Knora. At the moment, only triplestores and IIIF servers (Sipi) are supported. The triplestore support is implemented in the @@ -20,170 +23,16 @@ which is started when Knora starts. The `StoreManager` then starts the `TriplestoreManager` and `IIIFManager`, which each in turn starts their correct actor implementation. -## HTTP-based Triplestores - -HTTP-based triplestore support is implemented in the -`org.knora.webapi.triplestore.http` package. - -An HTTP-based triplestore is one that is accessed remotely over the HTTP -protocol. `HttpTriplestoreConnector` supports the open source triplestore -- [Apache Jena Fuseki](https://jena.apache.org). - -### Apache Jena Fuseki - -## Embedded Triplestores - -Embedded triplestores are implemented in the -`org.knora.webapi.triplestore.embedded` package. - -An embedded triplestore is one that runs in the same JVM as the Knora -API server. - -### Apache Jena TDB - -The support for embedded Jena TDB is currently dropped. The -documentation and the code will remain in the repository. You can use it -at your own risk. - -The support for the embedded Jena-TDB triplestore is implemented in -`org.knora.webapi.triplestore.embedded.JenaTDBActor`. - -The relevant Jena libraries that are used are the following: - - - Jena API - The library used to work programmatically with RDF data - - Jena TDB - Their implementation of a triple store - -#### Concurrency - -Jena provides concurrency on different levels. - -On the Jena TDB level there is the `Dataset` object, representing the -triple store. On every access, a transaction (read or write) can be -started. - -On the Jena API level there is a `Model` object, which is equivalent to -an RDF `Graph`. Here we can lock the model, so that MRSW (Multiple -Reader Single Writer) access is allowed. - - - - - +## Triplestores -#### Implementation +Currently, the only supported triplestore is [Apache Jena Fuseki](https://jena.apache.org), a HTTP-based triplestore. -We employ transactions on the `Dataset` level. This means that every -thread that accesses the triplestore, starts a read or write enabled -transaction. +HTTP-based triplestore support is implemented in the `org.knora.webapi.triplestore.http` package. -The transaction mechanism in TDB is based on write-ahead-logging. All -changes made inside a write-transaction are written to journals, then -propagated to the main database at a suitable moment. This design allows -for read-transactions to proceed without locking or other overhead over -the base database. - -Transactional TDB supports one active write transaction, and multiple -read transactions at the same time. Read-transactions started before a -write-transaction commits see the database in a state without any -changes visible. Any transaction starting after a write-transaction -commits sees the database with the changes visible, whether fully -propagates back to the database or not. There can be active read -transactions seeing the state of the database before the updates, and -read transactions seeing the state of the database after the updates -running at the same time. - -#### Configuration - -In `application.conf` set to use the embedded triplestore: - -``` - triplestore { - dbtype = "embedded-jena-tdb" - - embedded-jena-tdb { - persisted = true // "false" -> memory, "true" -> disk - loadExistingData = false // "false" -> use data if exists, "false" -> create a fresh store - storage-path = "_TMP" // ignored if "memory" - } - - reload-on-start = false // ignored if "memory" as it will always reload - - rdf-data = [ - { - path = "knora-ontologies/knora-base.ttl" - name = "http://www.knora.org/ontology/knora-base" - } - { - path = "knora-ontologies/salsah-gui.ttl" - name = "http://www.knora.org/ontology/salsah-gui" - } - { - path = "test_data/ontologies/incunabula-onto.ttl" - name = "http://www.knora.org/ontology/0803/incunabula" - } - { - path = "test_data/demo_data/incunabula-demo-data.ttl" - name = "http://www.knora.org/data/incunabula" - } - { - path = "test_data/ontologies/images-onto.ttl" - name = "http://www.knora.org/ontology/0804/dokubib" - } - { - path = "test_data/demo_data/images-demo-data.ttl" - name = "http://www.knora.org/data/dokubib" - } - ] - } -``` - -Here the storage is set to `persistent`, meaning that a Jena TDB store -will be created under the defined `tdb-storage-path`. The -`reload-on-start` flag, if set to `true` would reload the triplestore -with the data referenced in `rdf-data`. - -#### TDB Disk Persisted Store - -Make sure to set `reload-on-start` to `true` if run for the first time. -This will create a TDB store and load the data. - -If only *read access* is performed, then Knora can be run once with -reloading enabled. After that, reloading can be turned off, and the -persisted TDB store can be reused, as any data found under the -`tdb-storage-path` will be reused. - -If the TDB storage files get corrupted, then just delete the folder and -reload the data anew. - -#### Actor Messages - - - `ResetTripleStoreContent(rdfDataObjects: List[RdfDataObject])` - - `ResetTripleStoreContentACK()` - -The embedded Jena TDB can receive reset messages, and will ACK when -reloading of the data is finished. `RdfDataObject` is a simple case -class, containing the path and name (the same as `rdf-data` in the -config file) - -As an example, to use it inside a test you could write something like: - -```scala - val rdfDataObjects = List ( - RdfDataObject(path = "knora-ontologies/knora-base.ttl", - name = "http://www.knora.org/ontology/knora-base"), - RdfDataObject(path = "knora-ontologies/salsah-gui.ttl", - name = "http://www.knora.org/ontology/salsah-gui"), - RdfDataObject(path = "test_data/ontologies/incunabula-onto.ttl", - name = "http://www.knora.org/ontology/0803/incunabula"), - RdfDataObject(path = "test_data/all_data/incunabula-data.ttl", - name = "http://www.knora.org/data/incunabula") - ) +An HTTP-based triplestore is one that is accessed remotely over the HTTP +protocol. `HttpTriplestoreConnector` supports the open source triplestore [Apache Jena Fuseki](https://jena.apache.org). - "Reload data " in { - storeManager ! ResetTripleStoreContent(rdfDataObjects) - expectMsg(300.seconds, ResetTripleStoreContentACK()) - } -``` ## IIIF Servers -Currently, only support for SIPI is implemented in -`org.knora.webapi.store.iiifSipiConnector`. +Currently, only support for SIPI is implemented in `org.knora.webapi.store.iiifSipiConnector`. diff --git a/docs/05-internals/development/overview.md b/docs/05-internals/development/overview.md index 4deab1b22a..5e51f591be 100644 --- a/docs/05-internals/development/overview.md +++ b/docs/05-internals/development/overview.md @@ -24,7 +24,7 @@ installation of Knora. The different parts are: A number of triplestore implementations are available, including [free software](http://www.gnu.org/philosophy/free-sw.en.html) as well as proprietary options. DSP-API is designed to work with any -standards-compliant triplestore. It is primarily tested with [Apache Jena](https://jena.apache.org/). +standards-compliant triplestore. It is primarily tested with [Apache Jena Fuseki](https://jena.apache.org/). ## Sipi diff --git a/webapi/src/main/resources/application.conf b/webapi/src/main/resources/application.conf index d435e5a515..b57f58faee 100644 --- a/webapi/src/main/resources/application.conf +++ b/webapi/src/main/resources/application.conf @@ -510,7 +510,6 @@ app { triplestore { dbtype = "fuseki" dbtype = ${?KNORA_WEBAPI_TRIPLESTORE_DBTYPE} - // dbtype = "embedded-jena-tdb" // dbtype = "fake-triplestore" use-https = false @@ -540,17 +539,6 @@ app { password = ${?KNORA_WEBAPI_TRIPLESTORE_FUSEKI_PASSWORD} } - embedded-jena-tdb { - persisted = true // "false" -> memory, "true" -> disk - loadExistingData = false // "false" -> use data if exists, "false" -> create a fresh store - storage-path = "_TMP" // ignored if "memory" - } - - fake-jena-tdb { - fake-persisted-storage = true - fake-triplestore-data-dir = "src/main/resources/query-log" - } - reload-on-start = false // ignored if "memory" as it will always reload # This data is automatically loaded during resetting of the triple store content initiated diff --git a/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala b/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala index 186f7233b3..8ac4352000 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala @@ -6,23 +6,27 @@ package org.knora.webapi package responders -import exceptions.{BadRequestException, DuplicateValueException, UnexpectedMessageException} -import messages.store.triplestoremessages.SparqlSelectRequest -import messages.util.ResponderData -import messages.util.rdf.SparqlSelectResult -import messages.{SmartIri, StringFormatter} -import settings.{KnoraDispatchers, KnoraSettings, KnoraSettingsImpl} -import akka.actor.{ActorRef, ActorSystem} +import akka.actor.ActorRef +import akka.actor.ActorSystem import akka.event.LoggingAdapter import akka.http.scaladsl.util.FastFuture import akka.pattern._ import akka.util.Timeout -import com.typesafe.scalalogging.{LazyLogging, Logger} +import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.Logger import org.knora.webapi.store.cacheservice.settings.CacheServiceSettings -import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.ExecutionContext +import scala.concurrent.Future import scala.language.postfixOps +import exceptions.{BadRequestException, DuplicateValueException, UnexpectedMessageException} +import messages.store.triplestoremessages.SparqlSelectRequest +import messages.util.ResponderData +import messages.util.rdf.SparqlSelectResult +import messages.{SmartIri, StringFormatter} +import settings.{KnoraDispatchers, KnoraSettings, KnoraSettingsImpl} + /** * Responder helper methods. */ @@ -118,7 +122,6 @@ abstract class Responder(responderData: ResponderData) extends LazyLogging { isEntityUsedSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .isEntityUsed( - triplestore = settings.triplestoreType, entityIri = entityIri, ignoreKnoraConstraints = ignoreKnoraConstraints, ignoreRdfSubjectAndObject = ignoreRdfSubjectAndObject @@ -145,7 +148,6 @@ abstract class Responder(responderData: ResponderData) extends LazyLogging { isClassUsedInDataSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .isClassUsedInData( - triplestore = settings.triplestoreType, classIri = classIri ) .toString() diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala index 03c623e951..eb9b934225 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala @@ -11,17 +11,22 @@ import org.knora.webapi._ import org.knora.webapi.exceptions._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.admin.responder.groupsmessages._ -import org.knora.webapi.messages.admin.responder.projectsmessages.{ProjectADM, ProjectGetADM, ProjectIdentifierADM} +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM import org.knora.webapi.messages.admin.responder.usersmessages._ import org.knora.webapi.messages.admin.responder.valueObjects.GroupStatus import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.ResponderData import org.knora.webapi.messages.util.rdf.SparqlSelectResult -import org.knora.webapi.messages.util.{KnoraSystemInstances, ResponderData} import org.knora.webapi.messages.v1.responder.projectmessages._ -import org.knora.webapi.messages.{OntologyConstants, SmartIri} +import org.knora.webapi.responders.IriLocker +import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage -import org.knora.webapi.responders.{IriLocker, Responder} import java.util.UUID import scala.concurrent.Future @@ -88,7 +93,6 @@ class GroupsResponderADM(responderData: ResponderData) extends Responder(respond sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getGroups( - triplestore = settings.triplestoreType, maybeIri = None ) .toString() @@ -210,7 +214,6 @@ class GroupsResponderADM(responderData: ResponderData) extends Responder(respond sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getGroups( - triplestore = settings.triplestoreType, maybeIri = Some(groupIri) ) .toString() @@ -326,7 +329,6 @@ class GroupsResponderADM(responderData: ResponderData) extends Responder(respond sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getGroupMembersByIri( - triplestore = settings.triplestoreType, groupIri ) .toString() @@ -461,7 +463,6 @@ class GroupsResponderADM(responderData: ResponderData) extends Responder(respond createNewGroupSparqlString = org.knora.webapi.messages.twirl.queries.sparql.admin.txt .createNewGroup( adminNamedGraphIri = OntologyConstants.NamedGraphs.AdminNamedGraph, - triplestore = settings.triplestoreType, groupIri, groupClassIri = OntologyConstants.KnoraAdmin.UserGroup, name = createRequest.name.value, @@ -726,7 +727,6 @@ class GroupsResponderADM(responderData: ResponderData) extends Responder(respond org.knora.webapi.messages.twirl.queries.sparql.admin.txt .updateGroup( adminNamedGraphIri = "http://www.knora.org/data/admin", - triplestore = settings.triplestoreType, groupIri, maybeName = groupUpdatePayload.name.map(_.value), maybeDescriptions = groupUpdatePayload.descriptions.map(_.value), diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponderADM.scala index f61ea48333..4cb5f57b62 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponderADM.scala @@ -11,21 +11,26 @@ import org.knora.webapi._ import org.knora.webapi.exceptions._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.admin.responder.listsmessages.ListNodeCreatePayloadADM.{ - ListChildNodeCreatePayloadADM, - ListRootNodeCreatePayloadADM -} +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.admin.responder.listsmessages.ListNodeCreatePayloadADM.ListChildNodeCreatePayloadADM +import org.knora.webapi.messages.admin.responder.listsmessages.ListNodeCreatePayloadADM.ListRootNodeCreatePayloadADM import org.knora.webapi.messages.admin.responder.listsmessages.ListsErrorMessagesADM._ import org.knora.webapi.messages.admin.responder.listsmessages._ -import org.knora.webapi.messages.admin.responder.projectsmessages.{ProjectADM, ProjectGetADM, ProjectIdentifierADM} +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM import org.knora.webapi.messages.admin.responder.usersmessages._ -import org.knora.webapi.messages.admin.responder.valueObjects.{ListIRI, ListName, ProjectIRI} +import org.knora.webapi.messages.admin.responder.valueObjects.ListIRI +import org.knora.webapi.messages.admin.responder.valueObjects.ListName +import org.knora.webapi.messages.admin.responder.valueObjects.ProjectIRI import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.ResponderData import org.knora.webapi.messages.util.rdf.SparqlSelectResult -import org.knora.webapi.messages.util.{KnoraSystemInstances, ResponderData} -import org.knora.webapi.messages.{OntologyConstants, SmartIri} +import org.knora.webapi.responders.IriLocker +import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage -import org.knora.webapi.responders.{IriLocker, Responder} import java.util.UUID import scala.annotation.tailrec @@ -110,7 +115,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getLists( - triplestore = settings.triplestoreType, maybeProjectIri = projectIri ) .toString() @@ -316,7 +320,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getListNode( - triplestore = settings.triplestoreType, nodeIri = nodeIri ) .toString() @@ -485,7 +488,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getListNode( - triplestore = settings.triplestoreType, nodeIri = nodeIri ) .toString() @@ -700,7 +702,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde nodeChildrenQuery <- Future { org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getListNodeWithChildren( - triplestore = settings.triplestoreType, startNodeIri = ofNodeIri ) .toString() @@ -790,7 +791,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde nodePathQuery <- Future { org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getNodePath( - triplestore = settings.triplestoreType, queryNodeIri = queryNodeIri, preferredLanguage = requestingUser.lang, fallbackLanguage = settings.fallbackLanguage @@ -984,7 +984,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde org.knora.webapi.messages.twirl.queries.sparql.admin.txt .createNewListNode( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, listClassIri = OntologyConstants.KnoraBase.ListNode, projectIri = projectIri.value, nodeIri = newListNodeIri, @@ -1008,7 +1007,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde org.knora.webapi.messages.twirl.queries.sparql.admin.txt .createNewListNode( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, listClassIri = OntologyConstants.KnoraBase.ListNode, projectIri = projectIri.value, nodeIri = newListNodeIri, @@ -1773,7 +1771,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .canDeleteList( - triplestore = settings.triplestoreType, listIri = iri ) .toString() @@ -2161,7 +2158,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde changeNodeInfoSparqlString: String = org.knora.webapi.messages.twirl.queries.sparql.admin.txt .updateListInfo( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, nodeIri = changeNodeInfoRequest.listIri.value, hasOldName = hasOldName, isRootNode = isRootNode, @@ -2223,7 +2219,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde isNodeUsedSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .isNodeUsed( - triplestore = settings.triplestoreType, nodeIri = nodeIri ) .toString() @@ -2277,7 +2272,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde getParentNodeSparqlString: String <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getParentNode( - triplestore = settings.triplestoreType, nodeIri = nodeIri ) .toString @@ -2310,7 +2304,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde sparqlDeleteNode: String <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .deleteNode( - triplestore = settings.triplestoreType, dataNamedGraph = dataNamedGraph, nodeIri = nodeIri, isRootNode = isRootNode @@ -2350,7 +2343,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde sparqlUpdateNodePosition: String <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .updateNodePosition( - triplestore = settings.triplestoreType, dataNamedGraph = dataNamedGraph, nodeIri = nodeIri, newPosition = newPosition @@ -2445,7 +2437,6 @@ class ListsResponderADM(responderData: ResponderData) extends Responder(responde sparqlChangeParentNode: String <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .changeParentNode( - triplestore = settings.triplestoreType, dataNamedGraph = dataNamedGraph, nodeIri = nodeIri, currentParentIri = oldParentIri, diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala index bd538b20ea..b9e471df4c 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala @@ -5,27 +5,34 @@ package org.knora.webapi.responders.admin -import java.util.UUID - import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ import org.knora.webapi.exceptions._ import org.knora.webapi.feature.FeatureFactoryConfig -import org.knora.webapi.messages.{OntologyConstants, SmartIri} -import org.knora.webapi.messages.admin.responder.groupsmessages.{GroupADM, GroupGetADM} -import org.knora.webapi.messages.admin.responder.projectsmessages.{ProjectADM, ProjectGetADM, ProjectIdentifierADM} +import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.admin.responder.groupsmessages.GroupADM +import org.knora.webapi.messages.admin.responder.groupsmessages.GroupGetADM import org.knora.webapi.messages.admin.responder.permissionsmessages import org.knora.webapi.messages.admin.responder.permissionsmessages._ +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.store.triplestoremessages._ -import org.knora.webapi.messages.util.{KnoraSystemInstances, PermissionUtilADM, ResponderData} -import org.knora.webapi.responders.{IriLocker, Responder} +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.PermissionUtilADM +import org.knora.webapi.messages.util.ResponderData +import org.knora.webapi.messages.util.rdf.SparqlSelectResult +import org.knora.webapi.messages.util.rdf.VariableResultsRow +import org.knora.webapi.responders.IriLocker +import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage import org.knora.webapi.util.cache.CacheUtil -import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, VariableResultsRow} +import java.util.UUID import scala.collection.immutable.Iterable import scala.collection.mutable.ListBuffer import scala.concurrent.Future @@ -478,7 +485,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getAdministrativePermissionsForProject( - triplestore = settings.triplestoreType, projectIri = projectIRI ) .toString() @@ -570,7 +576,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getAdministrativePermissionForProjectAndGroup( - triplestore = settings.triplestoreType, projectIri = projectIri, groupIri = groupIri ) @@ -731,7 +736,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re createAdministrativePermissionSparqlString = org.knora.webapi.messages.twirl.queries.sparql.admin.txt .createNewAdministrativePermission( namedGraphIri = OntologyConstants.NamedGraphs.PermissionNamedGraph, - triplestore = settings.triplestoreType, permissionClassIri = OntologyConstants.KnoraAdmin.AdministrativePermission, permissionIri = newPermissionIri, projectIri = project.id, @@ -793,7 +797,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getObjectAccessPermission( - triplestore = settings.triplestoreType, resourceIri = Some(resourceIri), valueIri = None ) @@ -852,7 +855,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getObjectAccessPermission( - triplestore = settings.triplestoreType, resourceIri = None, valueIri = Some(valueIri) ) @@ -907,7 +909,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getDefaultObjectAccessPermissionsForProject( - triplestore = settings.triplestoreType, projectIri = projectIri ) .toString() @@ -1017,11 +1018,9 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re // not found permission in the cache for { - sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getDefaultObjectAccessPermission( - triplestore = settings.triplestoreType, projectIri = projectIri, maybeGroupIri = groupIri, maybeResourceClassIri = resourceClassIri, @@ -1642,7 +1641,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re createNewDefaultObjectAccessPermissionSparqlString = org.knora.webapi.messages.twirl.queries.sparql.admin.txt .createNewDefaultObjectAccessPermission( namedGraphIri = OntologyConstants.NamedGraphs.PermissionNamedGraph, - triplestore = settings.triplestoreType, permissionIri = newPermissionIri, permissionClassIri = OntologyConstants.KnoraAdmin.DefaultObjectAccessPermission, projectIri = project.id, @@ -1703,7 +1701,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getProjectPermissions( - triplestore = settings.triplestoreType, projectIri = projectIRI ) .toString() @@ -2165,7 +2162,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getPermissionByIRI( - triplestore = settings.triplestoreType, permissionIri = permissionIri ) .toString() @@ -2265,7 +2261,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re org.knora.webapi.messages.twirl.queries.sparql.admin.txt .updatePermission( namedGraphIri = OntologyConstants.NamedGraphs.PermissionNamedGraph, - triplestore = settings.triplestoreType, permissionIri = permissionIri, maybeGroup = maybeGroup, maybeHasPermissions = maybeHasPermissions, @@ -2289,7 +2284,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re sparqlDeletePermission: String <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .deletePermission( - triplestore = settings.triplestoreType, namedGraphIri = OntologyConstants.NamedGraphs.PermissionNamedGraph, permissionIri = permissionIri ) @@ -2325,7 +2319,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re isPermissionUsedSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .isEntityUsed( - triplestore = settings.triplestoreType, entityIri = permissionIri ) .toString() @@ -2344,7 +2337,6 @@ class PermissionsResponderADM(responderData: ResponderData) extends Responder(re sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getProjectOfEntity( - triplestore = settings.triplestoreType, entityIri = entityIri ) .toString() diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala index 2c38b2955d..0b4b799c9e 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala @@ -13,36 +13,37 @@ import org.knora.webapi.exceptions._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.instrumentation.InstrumentationSupport import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.admin.responder.permissionsmessages._ import org.knora.webapi.messages.admin.responder.projectsmessages._ -import org.knora.webapi.messages.admin.responder.usersmessages.{ - UserADM, - UserGetADM, - UserIdentifierADM, - UserInformationTypeADM -} -import org.knora.webapi.messages.store.cacheservicemessages.{ - CacheServiceFlushDB, - CacheServiceGetProjectADM, - CacheServicePutProjectADM -} +import org.knora.webapi.messages.admin.responder.usersmessages.UserADM +import org.knora.webapi.messages.admin.responder.usersmessages.UserGetADM +import org.knora.webapi.messages.admin.responder.usersmessages.UserIdentifierADM +import org.knora.webapi.messages.admin.responder.usersmessages.UserInformationTypeADM +import org.knora.webapi.messages.store.cacheservicemessages.CacheServiceFlushDB +import org.knora.webapi.messages.store.cacheservicemessages.CacheServiceGetProjectADM +import org.knora.webapi.messages.store.cacheservicemessages.CacheServicePutProjectADM import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.ResponderData import org.knora.webapi.messages.util.rdf._ -import org.knora.webapi.messages.util.{KnoraSystemInstances, ResponderData} import org.knora.webapi.messages.v1.responder.projectmessages._ -import org.knora.webapi.messages.v2.responder.ontologymessages.{ - OntologyMetadataGetByProjectRequestV2, - ReadOntologyMetadataV2 -} -import org.knora.webapi.messages.{OntologyConstants, SmartIri} +import org.knora.webapi.messages.v2.responder.ontologymessages.OntologyMetadataGetByProjectRequestV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.ReadOntologyMetadataV2 +import org.knora.webapi.responders.IriLocker +import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage -import org.knora.webapi.responders.{IriLocker, Responder} -import java.io.{BufferedInputStream, BufferedOutputStream} -import java.nio.file.{Files, Path} +import java.io.BufferedInputStream +import java.io.BufferedOutputStream +import java.nio.file.Files +import java.nio.file.Path import java.util.UUID import scala.concurrent.Future -import scala.util.{Failure, Success, Try} +import scala.util.Failure +import scala.util.Success +import scala.util.Try /** * Returns information about Knora projects. @@ -114,7 +115,6 @@ class ProjectsResponderADM(responderData: ResponderData) extends Responder(respo sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getProjects( - triplestore = settings.triplestoreType, maybeIri = None, maybeShortname = None, maybeShortcode = None @@ -319,7 +319,6 @@ class ProjectsResponderADM(responderData: ResponderData) extends Responder(respo sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getProjectMembers( - triplestore = settings.triplestoreType, maybeIri = identifier.toIriOption, maybeShortname = identifier.toShortnameOption, maybeShortcode = identifier.toShortcodeOption @@ -395,7 +394,6 @@ class ProjectsResponderADM(responderData: ResponderData) extends Responder(respo sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getProjectAdminMembers( - triplestore = settings.triplestoreType, maybeIri = identifier.toIriOption, maybeShortname = identifier.toShortnameOption, maybeShortcode = identifier.toShortcodeOption @@ -634,7 +632,6 @@ class ProjectsResponderADM(responderData: ResponderData) extends Responder(respo adminDataSparql: String = org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getProjectAdminData( - triplestore = settings.triplestoreType, projectIri = project.id ) .toString() @@ -653,7 +650,6 @@ class ProjectsResponderADM(responderData: ResponderData) extends Responder(respo permissionDataSparql: String = org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getProjectPermissions( - triplestore = settings.triplestoreType, projectIri = project.id ) .toString() @@ -694,7 +690,6 @@ class ProjectsResponderADM(responderData: ResponderData) extends Responder(respo sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getProjects( - triplestore = settings.triplestoreType, maybeIri = identifier.toIriOption, maybeShortname = identifier.toShortnameOption, maybeShortcode = identifier.toShortcodeOption @@ -885,7 +880,6 @@ class ProjectsResponderADM(responderData: ResponderData) extends Responder(respo org.knora.webapi.messages.twirl.queries.sparql.admin.txt .updateProject( adminNamedGraphIri = "http://www.knora.org/data/admin", - triplestore = settings.triplestoreType, projectIri = projectIri, maybeShortname = projectUpdatePayload.shortname, maybeLongname = projectUpdatePayload.longname, @@ -1110,7 +1104,6 @@ class ProjectsResponderADM(responderData: ResponderData) extends Responder(respo createNewProjectSparqlString = org.knora.webapi.messages.twirl.queries.sparql.admin.txt .createNewProject( adminNamedGraphIri = OntologyConstants.NamedGraphs.AdminNamedGraph, - triplestore = settings.triplestoreType, projectIri = newProjectIRI, projectClassIri = OntologyConstants.KnoraAdmin.KnoraProject, shortname = createProjectRequest.shortname.value, @@ -1216,7 +1209,6 @@ class ProjectsResponderADM(responderData: ResponderData) extends Responder(respo sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getProjects( - triplestore = settings.triplestoreType, maybeIri = identifier.toIriOption, maybeShortname = identifier.toShortnameOption, maybeShortcode = identifier.toShortcodeOption diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/SipiResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/SipiResponderADM.scala index f1413d42b4..c66f446263 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/SipiResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/SipiResponderADM.scala @@ -8,26 +8,23 @@ package org.knora.webapi.responders.admin import akka.actor.Status import akka.http.scaladsl.util.FastFuture import akka.pattern._ -import org.knora.webapi.exceptions.{InconsistentRepositoryDataException, NotFoundException} +import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import org.knora.webapi.exceptions.NotFoundException import org.knora.webapi.messages.SmartIri -import org.knora.webapi.messages.admin.responder.projectsmessages.{ - ProjectIdentifierADM, - ProjectRestrictedViewSettingsADM, - ProjectRestrictedViewSettingsGetADM -} -import org.knora.webapi.messages.admin.responder.sipimessages.{ - SipiFileInfoGetRequestADM, - SipiFileInfoGetResponseADM, - SipiResponderRequestADM -} -import org.knora.webapi.messages.store.triplestoremessages.{ - IriSubjectV2, - LiteralV2, - SparqlExtendedConstructRequest, - SparqlExtendedConstructResponse -} +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectRestrictedViewSettingsADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectRestrictedViewSettingsGetADM +import org.knora.webapi.messages.admin.responder.sipimessages.SipiFileInfoGetRequestADM +import org.knora.webapi.messages.admin.responder.sipimessages.SipiFileInfoGetResponseADM +import org.knora.webapi.messages.admin.responder.sipimessages.SipiResponderRequestADM +import org.knora.webapi.messages.store.triplestoremessages.IriSubjectV2 +import org.knora.webapi.messages.store.triplestoremessages.LiteralV2 +import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructRequest +import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.PermissionUtilADM import org.knora.webapi.messages.util.PermissionUtilADM.EntityPermission -import org.knora.webapi.messages.util.{KnoraSystemInstances, PermissionUtilADM, ResponderData} +import org.knora.webapi.messages.util.ResponderData import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage @@ -68,7 +65,6 @@ class SipiResponderADM(responderData: ResponderData) extends Responder(responder sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getFileValue( - triplestore = settings.triplestoreType, filename = request.filename ) .toString() diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponderADM.scala index 41582308d9..2a3a589c83 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponderADM.scala @@ -8,26 +8,38 @@ package org.knora.webapi.responders.admin import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.{BadRequestException, InconsistentRepositoryDataException, _} +import org.knora.webapi.exceptions.BadRequestException +import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import org.knora.webapi.exceptions._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.instrumentation.InstrumentationSupport import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.admin.responder.groupsmessages.{GroupADM, GroupGetADM} -import org.knora.webapi.messages.admin.responder.permissionsmessages.{PermissionDataGetADM, PermissionsDataADM} -import org.knora.webapi.messages.admin.responder.projectsmessages.{ProjectADM, ProjectGetADM, ProjectIdentifierADM} -import org.knora.webapi.messages.admin.responder.usersmessages.{UserChangeRequestADM, _} -import org.knora.webapi.messages.admin.responder.valueObjects.{Username, Email, Password, UserStatus, SystemAdmin} -import org.knora.webapi.messages.store.cacheservicemessages.{ - CacheServiceGetUserADM, - CacheServicePutUserADM, - CacheServiceRemoveValues -} +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.admin.responder.groupsmessages.GroupADM +import org.knora.webapi.messages.admin.responder.groupsmessages.GroupGetADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionDataGetADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsDataADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM +import org.knora.webapi.messages.admin.responder.usersmessages.UserChangeRequestADM +import org.knora.webapi.messages.admin.responder.usersmessages._ +import org.knora.webapi.messages.admin.responder.valueObjects.Email +import org.knora.webapi.messages.admin.responder.valueObjects.Password +import org.knora.webapi.messages.admin.responder.valueObjects.SystemAdmin +import org.knora.webapi.messages.admin.responder.valueObjects.UserStatus +import org.knora.webapi.messages.admin.responder.valueObjects.Username +import org.knora.webapi.messages.store.cacheservicemessages.CacheServiceGetUserADM +import org.knora.webapi.messages.store.cacheservicemessages.CacheServicePutUserADM +import org.knora.webapi.messages.store.cacheservicemessages.CacheServiceRemoveValues import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.ResponderData import org.knora.webapi.messages.util.rdf.SparqlSelectResult -import org.knora.webapi.messages.util.{KnoraSystemInstances, ResponderData} -import org.knora.webapi.messages.{OntologyConstants, SmartIri} +import org.knora.webapi.responders.IriLocker +import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage -import org.knora.webapi.responders.{IriLocker, Responder} import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder import java.util.UUID @@ -164,7 +176,6 @@ class UsersResponderADM(responderData: ResponderData) extends Responder(responde sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getUsers( - triplestore = settings.triplestoreType, maybeIri = None, maybeUsername = None, maybeEmail = None @@ -900,7 +911,6 @@ class UsersResponderADM(responderData: ResponderData) extends Responder(responde sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getUserByIri( - triplestore = settings.triplestoreType, userIri = userIri ) .toString() @@ -1483,7 +1493,6 @@ class UsersResponderADM(responderData: ResponderData) extends Responder(responde org.knora.webapi.messages.twirl.queries.sparql.admin.txt .updateUser( adminNamedGraphIri = OntologyConstants.NamedGraphs.AdminNamedGraph, - triplestore = settings.triplestoreType, userIri = userIri, maybeUsername = maybeChangedUsername, maybeEmail = maybeChangedEmail, @@ -1638,7 +1647,6 @@ class UsersResponderADM(responderData: ResponderData) extends Responder(responde org.knora.webapi.messages.twirl.queries.sparql.admin.txt .updateUserPassword( adminNamedGraphIri = OntologyConstants.NamedGraphs.AdminNamedGraph, - triplestore = settings.triplestoreType, userIri = userIri, newPassword = password.value ) @@ -1722,7 +1730,6 @@ class UsersResponderADM(responderData: ResponderData) extends Responder(responde createNewUserSparqlString = org.knora.webapi.messages.twirl.queries.sparql.admin.txt .createNewUser( adminNamedGraphIri = OntologyConstants.NamedGraphs.AdminNamedGraph, - triplestore = settings.triplestoreType, userIri = userIri, userClassIri = OntologyConstants.KnoraAdmin.User, username = stringFormatter.toSparqlEncodedString( @@ -1849,7 +1856,6 @@ class UsersResponderADM(responderData: ResponderData) extends Responder(responde sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.admin.txt .getUsers( - triplestore = settings.triplestoreType, maybeIri = identifier.toIriOption, maybeUsername = identifier.toUsernameOption, maybeEmail = identifier.toEmailOption diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/CkanResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/CkanResponderV1.scala index 9b56693e76..807d582a90 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/CkanResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/CkanResponderV1.scala @@ -5,8 +5,6 @@ package org.knora.webapi.responders.v1 -import java.net.URLEncoder - import akka.actor.ActorRef import akka.pattern._ import akka.util.Timeout @@ -15,23 +13,29 @@ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.store.triplestoremessages.SparqlSelectRequest -import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, VariableResultsRow} -import org.knora.webapi.messages.util.{KnoraSystemInstances, ResponderData} +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.ResponderData +import org.knora.webapi.messages.util.rdf.SparqlSelectResult +import org.knora.webapi.messages.util.rdf.VariableResultsRow import org.knora.webapi.messages.v1.responder.ckanmessages._ -import org.knora.webapi.messages.v1.responder.listmessages.{NodePathGetRequestV1, NodePathGetResponseV1} -import org.knora.webapi.messages.v1.responder.projectmessages.{ - ProjectInfoByShortnameGetRequestV1, - ProjectInfoResponseV1, - ProjectInfoV1 -} +import org.knora.webapi.messages.v1.responder.listmessages.NodePathGetRequestV1 +import org.knora.webapi.messages.v1.responder.listmessages.NodePathGetResponseV1 +import org.knora.webapi.messages.v1.responder.projectmessages.ProjectInfoByShortnameGetRequestV1 +import org.knora.webapi.messages.v1.responder.projectmessages.ProjectInfoResponseV1 +import org.knora.webapi.messages.v1.responder.projectmessages.ProjectInfoV1 import org.knora.webapi.messages.v1.responder.resourcemessages._ import org.knora.webapi.messages.v1.responder.usermessages.UserProfileV1 -import org.knora.webapi.messages.v1.responder.valuemessages.{DateValueV1, HierarchicalListValueV1, LinkV1, TextValueV1} +import org.knora.webapi.messages.v1.responder.valuemessages.DateValueV1 +import org.knora.webapi.messages.v1.responder.valuemessages.HierarchicalListValueV1 +import org.knora.webapi.messages.v1.responder.valuemessages.LinkV1 +import org.knora.webapi.messages.v1.responder.valuemessages.TextValueV1 import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage +import java.net.URLEncoder +import scala.concurrent.Await +import scala.concurrent.Future import scala.concurrent.duration._ -import scala.concurrent.{Await, Future} /** * This responder is used by the Ckan route, for serving data to the Ckan harverster, which is published @@ -206,7 +210,7 @@ class CkanResponderV1(responderData: ResponderData) extends Responder(responderD for { sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt - .ckanDokubib(settings.triplestoreType, projectIri, limit) + .ckanDokubib(projectIri, limit) .toString() ) response <- (storeManager ? SparqlSelectRequest(sparqlQuery)).mapTo[SparqlSelectResult] @@ -326,7 +330,7 @@ class CkanResponderV1(responderData: ResponderData) extends Responder(responderD for { sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt - .ckanIncunabula(settings.triplestoreType, projectIri, limit) + .ckanIncunabula(projectIri, limit) .toString() ) response <- (storeManager ? SparqlSelectRequest(sparqlQuery)).mapTo[SparqlSelectResult] @@ -401,7 +405,6 @@ class CkanResponderV1(responderData: ResponderData) extends Responder(responderD sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getResourcesByProjectAndType( - triplestore = settings.triplestoreType, projectIri = projectIri, resType = resType ) diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/ListsResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/ListsResponderV1.scala index 6488580667..513822061c 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/ListsResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/ListsResponderV1.scala @@ -10,7 +10,8 @@ import org.knora.webapi._ import org.knora.webapi.exceptions.NotFoundException import org.knora.webapi.messages.store.triplestoremessages.SparqlSelectRequest import org.knora.webapi.messages.util.ResponderData -import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, VariableResultsRow} +import org.knora.webapi.messages.util.rdf.SparqlSelectResult +import org.knora.webapi.messages.util.rdf.VariableResultsRow import org.knora.webapi.messages.v1.responder.listmessages._ import org.knora.webapi.messages.v1.responder.usermessages.UserProfileV1 import org.knora.webapi.responders.Responder @@ -143,7 +144,6 @@ class ListsResponderV1(responderData: ResponderData) extends Responder(responder listQuery <- Future { org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getList( - triplestore = settings.triplestoreType, rootNodeIri = rootNodeIri, preferredLanguage = userProfile.userData.lang, fallbackLanguage = settings.fallbackLanguage @@ -227,7 +227,6 @@ class ListsResponderV1(responderData: ResponderData) extends Responder(responder nodePathQuery <- Future { org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getNodePath( - triplestore = settings.triplestoreType, queryNodeIri = queryNodeIri, preferredLanguage = userProfile.userData.lang, fallbackLanguage = settings.fallbackLanguage diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/ProjectsResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/ProjectsResponderV1.scala index 3ecd27e7a8..41ca6be05c 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/ProjectsResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/ProjectsResponderV1.scala @@ -8,23 +8,22 @@ package org.knora.webapi.responders.v1 import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.{InconsistentRepositoryDataException, NotFoundException} +import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import org.knora.webapi.exceptions.NotFoundException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.admin.responder.usersmessages.{ - UserADM, - UserGetRequestADM, - UserIdentifierADM, - UserResponseADM -} +import org.knora.webapi.messages.admin.responder.usersmessages.UserADM +import org.knora.webapi.messages.admin.responder.usersmessages.UserGetRequestADM +import org.knora.webapi.messages.admin.responder.usersmessages.UserIdentifierADM +import org.knora.webapi.messages.admin.responder.usersmessages.UserResponseADM import org.knora.webapi.messages.store.triplestoremessages._ -import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, VariableResultsRow} -import org.knora.webapi.messages.util.{KnoraSystemInstances, ResponderData} -import org.knora.webapi.messages.v1.responder.ontologymessages.{ - NamedGraphV1, - NamedGraphsGetRequestV1, - NamedGraphsResponseV1 -} +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.ResponderData +import org.knora.webapi.messages.util.rdf.SparqlSelectResult +import org.knora.webapi.messages.util.rdf.VariableResultsRow +import org.knora.webapi.messages.v1.responder.ontologymessages.NamedGraphV1 +import org.knora.webapi.messages.v1.responder.ontologymessages.NamedGraphsGetRequestV1 +import org.knora.webapi.messages.v1.responder.ontologymessages.NamedGraphsResponseV1 import org.knora.webapi.messages.v1.responder.projectmessages._ import org.knora.webapi.messages.v1.responder.usermessages._ import org.knora.webapi.responders.Responder @@ -100,9 +99,7 @@ class ProjectsResponderV1(responderData: ResponderData) extends Responder(respon for { sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt - .getProjects( - triplestore = settings.triplestoreType - ) + .getProjects() .toString() ) //_ = log.debug(s"getProjectsResponseV1 - query: $sparqlQueryString") @@ -274,7 +271,6 @@ class ProjectsResponderV1(responderData: ResponderData) extends Responder(respon sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getProjectByIri( - triplestore = settings.triplestoreType, projectIri = projectIri ) .toString() @@ -327,7 +323,6 @@ class ProjectsResponderV1(responderData: ResponderData) extends Responder(respon sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getProjectByShortname( - triplestore = settings.triplestoreType, shortname = shortName ) .toString() diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala index 3ffceb19c4..c689466b79 100755 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala @@ -5,56 +5,55 @@ package org.knora.webapi.responders.v1 -import java.time.Instant -import java.util.UUID - import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ import org.knora.webapi.exceptions._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.admin.responder.permissionsmessages.{ - DefaultObjectAccessPermissionsStringForPropertyGetADM, - DefaultObjectAccessPermissionsStringForResourceClassGetADM, - DefaultObjectAccessPermissionsStringResponseADM, - ResourceCreateOperation -} -import org.knora.webapi.messages.admin.responder.projectsmessages.{ - ProjectADM, - ProjectGetRequestADM, - ProjectGetResponseADM, - ProjectIdentifierADM -} +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.StringFormatter +import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringForPropertyGetADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringForResourceClassGetADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringResponseADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.ResourceCreateOperation +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetRequestADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetResponseADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.twirl.SparqlTemplateResourceToCreate import org.knora.webapi.messages.util.GroupedProps._ import org.knora.webapi.messages.util._ -import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, VariableResultsRow} +import org.knora.webapi.messages.util.rdf.SparqlSelectResult +import org.knora.webapi.messages.util.rdf.VariableResultsRow import org.knora.webapi.messages.v1.responder.ontologymessages._ import org.knora.webapi.messages.v1.responder.projectmessages._ import org.knora.webapi.messages.v1.responder.resourcemessages._ import org.knora.webapi.messages.v1.responder.valuemessages._ import org.knora.webapi.messages.v2.responder.UpdateResultInProject +import org.knora.webapi.messages.v2.responder.ontologymessages.Cardinality import org.knora.webapi.messages.v2.responder.ontologymessages.Cardinality.KnoraCardinalityInfo -import org.knora.webapi.messages.v2.responder.ontologymessages.{ - Cardinality, - OntologyMetadataGetByIriRequestV2, - OntologyMetadataV2, - ReadOntologyMetadataV2 -} +import org.knora.webapi.messages.v2.responder.ontologymessages.OntologyMetadataGetByIriRequestV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.OntologyMetadataV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.ReadOntologyMetadataV2 import org.knora.webapi.messages.v2.responder.valuemessages.FileValueContentV2 -import org.knora.webapi.messages.{OntologyConstants, SmartIri, StringFormatter} +import org.knora.webapi.responders.IriLocker +import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage import org.knora.webapi.responders.v2.ResourceUtilV2 -import org.knora.webapi.responders.{IriLocker, Responder} import org.knora.webapi.util.ActorUtil import org.knora.webapi.util.ApacheLuceneSupport.MatchStringWhileTyping +import java.time.Instant +import java.util.UUID import scala.collection.immutable import scala.concurrent.Future -import scala.util.{Failure, Success, Try} +import scala.util.Failure +import scala.util.Success +import scala.util.Try /** * Responds to requests for information about resources, and returns responses in Knora API v1 format. @@ -219,7 +218,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo sparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getGraphData( - triplestore = settings.triplestoreType, startNodeIri = startNode.nodeIri, startNodeOnly = false, outbound = outbound // true to query outbound edges, false to query inbound edges @@ -358,7 +356,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo sparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getGraphData( - triplestore = settings.triplestoreType, startNodeIri = graphDataGetRequest.resourceIri, startNodeOnly = true ) @@ -540,7 +537,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo incomingRefsSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getIncomingReferences( - triplestore = settings.triplestoreType, resourceIri = resourceIri ) .toString() @@ -1049,7 +1045,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo // If this resource is part of another resource, get its parent resource. isPartOfSparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .isPartOf( - triplestore = settings.triplestoreType, resourceIri = resourceIri ) .toString() @@ -1099,7 +1094,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo contextSparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getContext( - triplestore = settings.triplestoreType, resourceIri = resourceIri ) .toString() @@ -1162,7 +1156,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo regionSparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getRegions( - triplestore = settings.triplestoreType, resourceIri = resourceIri ) .toString() @@ -1338,7 +1331,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo searchResourcesSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getResourceSearchResult( - triplestore = settings.triplestoreType, searchPhrase = searchPhrase, restypeIriOption = resourceTypeIri, numberOfProps = numberOfProps, @@ -2037,7 +2029,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo org.knora.webapi.messages.twirl.queries.sparql.v1.txt .createNewResources( dataNamedGraph = namedGraph, - triplestore = settings.triplestoreType, resourcesToCreate = resourcesToCreate, projectIri = projectIri, creatorIri = creatorIri @@ -2070,7 +2061,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo createdResourcesSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getCreatedResource( - triplestore = settings.triplestoreType, resourceIri = resourceIri ) .toString() @@ -2430,7 +2420,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo .deleteResource( dataNamedGraph = StringFormatter.getGeneralInstance.projectDataNamedGraphV1(projectInfoResponse.project_info), - triplestore = settings.triplestoreType, resourceIri = resourceDeleteRequest.resourceIri, maybeDeleteComment = resourceDeleteRequest.deleteComment, currentTime = currentTime, @@ -2444,7 +2433,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo // Check whether the update succeeded. sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .checkResourceDeletion( - triplestore = settings.triplestoreType, resourceIri = resourceDeleteRequest.resourceIri ) .toString() @@ -2584,7 +2572,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .changeResourceLabel( dataNamedGraph = namedGraph, - triplestore = settings.triplestoreType, resourceIri = resourceIri, label = label, currentTime = currentTime @@ -2599,7 +2586,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo // Check whether the update succeeded. sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .checkResourceLabelChange( - triplestore = settings.triplestoreType, resourceIri = resourceIri, label = label ) @@ -2661,7 +2647,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getResourceInfo( - triplestore = settings.triplestoreType, resourceIri = resourceIri ) .toString() @@ -2696,7 +2681,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo resclassSparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getResourceClass( - triplestore = settings.triplestoreType, resourceIri = resourceIri ) .toString() @@ -2991,7 +2975,6 @@ class ResourcesResponderV1(responderData: ResponderData) extends Responder(respo sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getResourcePropertiesAndValues( - triplestore = settings.triplestoreType, resourceIri = resourceIri ) .toString() diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/SearchResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/SearchResponderV1.scala index 4c28f9d93a..26fe52aa09 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/SearchResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/SearchResponderV1.scala @@ -7,14 +7,21 @@ package org.knora.webapi.responders.v1 import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.{BadRequestException, InconsistentRepositoryDataException} +import org.knora.webapi.exceptions.BadRequestException +import org.knora.webapi.exceptions.InconsistentRepositoryDataException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.store.triplestoremessages.SparqlSelectRequest import org.knora.webapi.messages.twirl.SearchCriterion -import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, VariableResultsRow} -import org.knora.webapi.messages.util.{DateUtilV1, PermissionUtilADM, ResponderData, ValueUtilV1} -import org.knora.webapi.messages.v1.responder.ontologymessages.{EntityInfoGetRequestV1, EntityInfoGetResponseV1, _} +import org.knora.webapi.messages.util.DateUtilV1 +import org.knora.webapi.messages.util.PermissionUtilADM +import org.knora.webapi.messages.util.ResponderData +import org.knora.webapi.messages.util.ValueUtilV1 +import org.knora.webapi.messages.util.rdf.SparqlSelectResult +import org.knora.webapi.messages.util.rdf.VariableResultsRow +import org.knora.webapi.messages.v1.responder.ontologymessages.EntityInfoGetRequestV1 +import org.knora.webapi.messages.v1.responder.ontologymessages.EntityInfoGetResponseV1 +import org.knora.webapi.messages.v1.responder.ontologymessages._ import org.knora.webapi.messages.v1.responder.searchmessages._ import org.knora.webapi.messages.v1.responder.valuemessages.KnoraCalendarV1 import org.knora.webapi.responders.Responder @@ -156,7 +163,6 @@ class SearchResponderV1(responderData: ResponderData) extends Responder(responde searchSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .searchFulltext( - triplestore = settings.triplestoreType, searchTerms = LuceneQueryString(searchGetRequest.searchValue), preferredLanguage = searchGetRequest.userProfile.lang, fallbackLanguage = settings.fallbackLanguage, @@ -564,7 +570,6 @@ class SearchResponderV1(responderData: ResponderData) extends Responder(responde // Get the search results. searchSparql = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .searchExtended( - triplestore = settings.triplestoreType, searchCriteria = searchCriteria, preferredLanguage = searchGetRequest.userProfile.lang, fallbackLanguage = settings.fallbackLanguage, diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/UsersResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/UsersResponderV1.scala index ad1af158ae..39952fe2a5 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/UsersResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/UsersResponderV1.scala @@ -5,25 +5,30 @@ package org.knora.webapi.responders.v1 -import java.util.UUID - import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.{ApplicationCacheException, ForbiddenException, NotFoundException} +import org.knora.webapi.exceptions.ApplicationCacheException +import org.knora.webapi.exceptions.ForbiddenException +import org.knora.webapi.exceptions.NotFoundException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants -import org.knora.webapi.messages.admin.responder.permissionsmessages.{PermissionDataGetADM, PermissionsDataADM} +import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionDataGetADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsDataADM import org.knora.webapi.messages.store.triplestoremessages._ -import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, VariableResultsRow} -import org.knora.webapi.messages.util.{KnoraSystemInstances, ResponderData} -import org.knora.webapi.messages.v1.responder.projectmessages.{ProjectInfoByIRIGetV1, ProjectInfoV1} +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.ResponderData +import org.knora.webapi.messages.util.rdf.SparqlSelectResult +import org.knora.webapi.messages.util.rdf.VariableResultsRow +import org.knora.webapi.messages.v1.responder.projectmessages.ProjectInfoByIRIGetV1 +import org.knora.webapi.messages.v1.responder.projectmessages.ProjectInfoV1 import org.knora.webapi.messages.v1.responder.usermessages.UserProfileTypeV1.UserProfileType import org.knora.webapi.messages.v1.responder.usermessages._ import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage import org.knora.webapi.util.cache.CacheUtil +import java.util.UUID import scala.concurrent.Future /** @@ -76,9 +81,7 @@ class UsersResponderV1(responderData: ResponderData) extends Responder(responder sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt - .getUsers( - triplestore = settings.triplestoreType - ) + .getUsers() .toString() ) @@ -134,7 +137,6 @@ class UsersResponderV1(responderData: ResponderData) extends Responder(responder sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getUserByIri( - triplestore = settings.triplestoreType, userIri = userIri ) .toString() @@ -176,7 +178,6 @@ class UsersResponderV1(responderData: ResponderData) extends Responder(responder sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getUserByIri( - triplestore = settings.triplestoreType, userIri = userIri ) .toString() @@ -260,7 +261,6 @@ class UsersResponderV1(responderData: ResponderData) extends Responder(responder sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getUserByEmail( - triplestore = settings.triplestoreType, email = email ) .toString() @@ -332,7 +332,6 @@ class UsersResponderV1(responderData: ResponderData) extends Responder(responder sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getUserByIri( - triplestore = settings.triplestoreType, userIri = userIri ) .toString() @@ -373,7 +372,6 @@ class UsersResponderV1(responderData: ResponderData) extends Responder(responder sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getUserByIri( - triplestore = settings.triplestoreType, userIri = userIri ) .toString() @@ -413,7 +411,6 @@ class UsersResponderV1(responderData: ResponderData) extends Responder(responder sparqlQueryString <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getUserByIri( - triplestore = settings.triplestoreType, userIri = userIri ) .toString() diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala index 6e25319103..84af5f61b8 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala @@ -5,44 +5,49 @@ package org.knora.webapi.responders.v1 -import java.time.Instant - import akka.pattern._ import org.knora.webapi._ import org.knora.webapi.exceptions._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.admin.responder.permissionsmessages.{ - DefaultObjectAccessPermissionsStringForPropertyGetADM, - DefaultObjectAccessPermissionsStringResponseADM, - PermissionADM, - PermissionType -} -import org.knora.webapi.messages.admin.responder.projectsmessages.{ - ProjectADM, - ProjectGetRequestADM, - ProjectGetResponseADM, - ProjectIdentifierADM -} +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.StringFormatter +import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringForPropertyGetADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringResponseADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionType +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetRequestADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetResponseADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate -import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, VariableResultsRow} -import org.knora.webapi.messages.util.{KnoraSystemInstances, PermissionUtilADM, ResponderData, ValueUtilV1} -import org.knora.webapi.messages.v1.responder.ontologymessages.{EntityInfoGetRequestV1, EntityInfoGetResponseV1} -import org.knora.webapi.messages.v1.responder.projectmessages.{ProjectInfoByIRIGetV1, ProjectInfoV1} +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.PermissionUtilADM +import org.knora.webapi.messages.util.ResponderData +import org.knora.webapi.messages.util.ValueUtilV1 +import org.knora.webapi.messages.util.rdf.SparqlSelectResult +import org.knora.webapi.messages.util.rdf.VariableResultsRow +import org.knora.webapi.messages.v1.responder.ontologymessages.EntityInfoGetRequestV1 +import org.knora.webapi.messages.v1.responder.ontologymessages.EntityInfoGetResponseV1 +import org.knora.webapi.messages.v1.responder.projectmessages.ProjectInfoByIRIGetV1 +import org.knora.webapi.messages.v1.responder.projectmessages.ProjectInfoV1 import org.knora.webapi.messages.v1.responder.resourcemessages._ -import org.knora.webapi.messages.v1.responder.usermessages.{UserProfileByIRIGetV1, UserProfileTypeV1, UserProfileV1} +import org.knora.webapi.messages.v1.responder.usermessages.UserProfileByIRIGetV1 +import org.knora.webapi.messages.v1.responder.usermessages.UserProfileTypeV1 +import org.knora.webapi.messages.v1.responder.usermessages.UserProfileV1 import org.knora.webapi.messages.v1.responder.valuemessages._ import org.knora.webapi.messages.v2.responder.ontologymessages.Cardinality import org.knora.webapi.messages.v2.responder.standoffmessages._ import org.knora.webapi.messages.v2.responder.valuemessages.FileValueContentV2 -import org.knora.webapi.messages.{OntologyConstants, StringFormatter} +import org.knora.webapi.responders.IriLocker +import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage import org.knora.webapi.responders.v2.ResourceUtilV2 -import org.knora.webapi.responders.{IriLocker, Responder} import org.knora.webapi.util._ +import java.time.Instant import scala.annotation.tailrec import scala.concurrent.Future @@ -727,7 +732,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde getFileValuesSparql = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getFileValuesForResource( - triplestore = settings.triplestoreType, resourceIri = resourceIri ) .toString() @@ -1151,7 +1155,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .changeComment( dataNamedGraph = StringFormatter.getGeneralInstance.projectDataNamedGraphV1(projectInfo), - triplestore = settings.triplestoreType, resourceIri = findResourceWithValueResult.resourceIri, propertyIri = findResourceWithValueResult.propertyIri, currentValueIri = changeCommentRequest.valueIri, @@ -1297,7 +1300,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .deleteLink( dataNamedGraph = StringFormatter.getGeneralInstance.projectDataNamedGraphV1(projectInfo), - triplestore = settings.triplestoreType, linkSourceIri = findResourceWithValueResult.resourceIri, linkUpdate = sparqlTemplateLinkUpdate, maybeComment = deleteValueRequest.deleteComment, @@ -1351,7 +1353,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .deleteValue( dataNamedGraph = StringFormatter.getGeneralInstance.projectDataNamedGraphV1(projectInfo), - triplestore = settings.triplestoreType, resourceIri = findResourceWithValueResult.resourceIri, propertyIri = findResourceWithValueResult.propertyIri, valueIri = deleteValueRequest.valueIri, @@ -1371,7 +1372,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde // Check whether the update succeeded. sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .checkValueDeletion( - triplestore = settings.triplestoreType, valueIri = deletedValueIri ) .toString() @@ -1454,7 +1454,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlQuery <- Future { org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getVersionHistory( - triplestore = settings.triplestoreType, resourceIri = versionHistoryRequest.resourceIri, propertyIri = versionHistoryRequest.propertyIri, currentValueIri = versionHistoryRequest.currentValueIri @@ -1692,7 +1691,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getValue( - triplestore = settings.triplestoreType, valueIri = valueIri ) .toString() @@ -1734,7 +1732,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getLinkSourceAndTargetPermissions( - triplestore = settings.triplestoreType, linkValueIri = linkValueIri ) .toString() @@ -1795,7 +1792,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlQuery <- Future { org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByIri( - triplestore = settings.triplestoreType, subjectIri = subjectIri, predicateIri = predicateIri, maybeObjectIri = objectIri, @@ -1842,7 +1838,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlQuery <- Future { org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = subjectIri, predicateIri = predicateIri, objectIri = objectIri @@ -2168,7 +2163,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde // Run the template function in a Future to handle exceptions (see http://git.iml.unibas.ch/salsah-suite/knora/wikis/futures-with-akka#handling-errors-with-futures) org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findValueInVersions( - triplestore = settings.triplestoreType, resourceIri = resourceIri, propertyIri = propertyIri, searchValueIri = searchValueIri @@ -2270,7 +2264,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde findResourceSparqlQuery <- Future( org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findResourceWithValue( - triplestore = settings.triplestoreType, searchValueIri = valueIri ) .toString() @@ -2388,7 +2381,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .createLink( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, resourceIri = resourceIri, linkUpdate = sparqlTemplateLinkUpdate, creationDate = currentTime, @@ -2467,7 +2459,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .createValue( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, resourceIri = resourceIri, propertyIri = propertyIri, newValueIri = newValueIri, @@ -2569,7 +2560,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .changeLink( dataNamedGraph = StringFormatter.getGeneralInstance.projectDataNamedGraphV1(projectInfo), - triplestore = settings.triplestoreType, linkSourceIri = resourceIri, linkUpdateForCurrentLink = sparqlTemplateLinkUpdateForCurrentLink, linkUpdateForNewLink = sparqlTemplateLinkUpdateForNewLink, @@ -2723,7 +2713,6 @@ class ValuesResponderV1(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .addValueVersion( dataNamedGraph = StringFormatter.getGeneralInstance.projectDataNamedGraphV1(projectInfo), - triplestore = settings.triplestoreType, resourceIri = resourceIri, propertyIri = propertyIri, currentValueIri = currentValueIri, diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala index 8b00896121..4aa4e78b49 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala @@ -7,34 +7,37 @@ package org.knora.webapi.responders.v2 import akka.http.scaladsl.util.FastFuture import akka.pattern._ +import org.knora.webapi._ import org.knora.webapi.exceptions._ import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.admin.responder.projectsmessages.{ - ProjectGetRequestADM, - ProjectGetResponseADM, - ProjectIdentifierADM -} +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetRequestADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetResponseADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM import org.knora.webapi.messages.admin.responder.usersmessages.UserADM -import org.knora.webapi.messages.store.triplestoremessages.{ - SmartIriLiteralV2, - SparqlUpdateRequest, - SparqlUpdateResponse, - StringLiteralV2 -} -import org.knora.webapi.messages.util.{ErrorHandlingMap, ResponderData} +import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 +import org.knora.webapi.messages.store.triplestoremessages.SparqlUpdateRequest +import org.knora.webapi.messages.store.triplestoremessages.SparqlUpdateResponse +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 +import org.knora.webapi.messages.util.ErrorHandlingMap +import org.knora.webapi.messages.util.ResponderData +import org.knora.webapi.messages.v2.responder.CanDoResponseV2 +import org.knora.webapi.messages.v2.responder.SuccessResponseV2 import org.knora.webapi.messages.v2.responder.ontologymessages.Cardinality.KnoraCardinalityInfo import org.knora.webapi.messages.v2.responder.ontologymessages._ -import org.knora.webapi.messages.v2.responder.{CanDoResponseV2, SuccessResponseV2} -import org.knora.webapi.messages.{OntologyConstants, SmartIri} +import org.knora.webapi.responders.IriLocker +import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage +import org.knora.webapi.responders.v2.ontology.Cache import org.knora.webapi.responders.v2.ontology.Cache.ONTOLOGY_CACHE_LOCK_IRI -import org.knora.webapi.responders.v2.ontology.{Cache, Cardinalities, OntologyHelpers} -import org.knora.webapi.responders.{IriLocker, Responder} +import org.knora.webapi.responders.v2.ontology.Cardinalities +import org.knora.webapi.responders.v2.ontology.OntologyHelpers import org.knora.webapi.util._ -import org.knora.webapi._ import java.time.Instant -import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.ExecutionContext +import scala.concurrent.Future /** * Responds to requests dealing with ontologies. @@ -535,7 +538,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon createOntologySparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .createOntology( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, projectIri = createOntologyRequest.projectIri, @@ -671,7 +673,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .changeOntologyMetadata( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, newLabel = changeOntologyMetadataRequest.label, @@ -790,7 +791,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .changeOntologyMetadata( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, newLabel = None, @@ -992,7 +992,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .createClass( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, classDef = internalClassDefWithLinkValueProps, @@ -1181,7 +1180,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .replaceClassCardinalities( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, classIri = internalClassIri, @@ -1430,7 +1428,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .addCardinalitiesToClass( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, classIri = internalClassIri, @@ -1689,7 +1686,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .replaceClassCardinalities( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, classIri = internalClassIri, @@ -1931,7 +1927,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .deleteClass( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, classIri = internalClassIri, @@ -2113,7 +2108,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .deleteProperty( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, propertyIri = internalPropertyIri, @@ -2250,7 +2244,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .deleteOntology( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri ) .toString() @@ -2549,7 +2542,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .createProperty( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, propertyDef = internalPropertyDef, @@ -2758,7 +2750,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .changePropertyGuiElement( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, propertyIri = internalPropertyIri, @@ -2985,7 +2976,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .changePropertyLabelsOrComments( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, propertyIri = internalPropertyIri, @@ -3174,7 +3164,6 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .changeClassLabelsOrComments( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, classIri = internalClassIri, diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala index 3ecbc2538d..0c175e5292 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala @@ -5,9 +5,6 @@ package org.knora.webapi.responders.v2 -import java.time.Instant -import java.util.UUID - import akka.http.scaladsl.util.FastFuture import akka.pattern._ import akka.stream.Materializer @@ -15,55 +12,53 @@ import org.knora.webapi._ import org.knora.webapi.exceptions._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.admin.responder.permissionsmessages.{ - DefaultObjectAccessPermissionsStringForResourceClassGetADM, - DefaultObjectAccessPermissionsStringResponseADM, - ResourceCreateOperation -} +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringForResourceClassGetADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringResponseADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.ResourceCreateOperation import org.knora.webapi.messages.admin.responder.projectsmessages._ import org.knora.webapi.messages.admin.responder.usersmessages.UserADM -import org.knora.webapi.messages.store.sipimessages.{SipiGetTextFileRequest, SipiGetTextFileResponse} +import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest +import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileResponse import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.twirl.SparqlTemplateResourceToCreate import org.knora.webapi.messages.util.ConstructResponseUtilV2.MappingAndXSLTransformation -import org.knora.webapi.messages.util.PermissionUtilADM.{ - AGreaterThanB, - DeletePermission, - ModifyPermission, - PermissionComparisonResult -} +import org.knora.webapi.messages.util.PermissionUtilADM.AGreaterThanB +import org.knora.webapi.messages.util.PermissionUtilADM.DeletePermission +import org.knora.webapi.messages.util.PermissionUtilADM.ModifyPermission +import org.knora.webapi.messages.util.PermissionUtilADM.PermissionComparisonResult import org.knora.webapi.messages.util._ -import org.knora.webapi.messages.util.rdf.{ - JsonLDArray, - JsonLDDocument, - JsonLDInt, - JsonLDKeywords, - JsonLDObject, - JsonLDString, - SparqlSelectResult, - VariableResultsRow -} +import org.knora.webapi.messages.util.rdf.JsonLDArray +import org.knora.webapi.messages.util.rdf.JsonLDDocument +import org.knora.webapi.messages.util.rdf.JsonLDInt +import org.knora.webapi.messages.util.rdf.JsonLDKeywords +import org.knora.webapi.messages.util.rdf.JsonLDObject +import org.knora.webapi.messages.util.rdf.JsonLDString +import org.knora.webapi.messages.util.rdf.SparqlSelectResult +import org.knora.webapi.messages.util.rdf.VariableResultsRow import org.knora.webapi.messages.util.search.ConstructQuery import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 +import org.knora.webapi.messages.v2.responder.SuccessResponseV2 +import org.knora.webapi.messages.v2.responder.UpdateResultInProject import org.knora.webapi.messages.v2.responder.ontologymessages._ import org.knora.webapi.messages.v2.responder.resourcemessages._ import org.knora.webapi.messages.v2.responder.searchmessages.GravsearchRequestV2 -import org.knora.webapi.messages.v2.responder.standoffmessages.{ - GetMappingRequestV2, - GetMappingResponseV2, - GetXSLTransformationRequestV2, - GetXSLTransformationResponseV2 -} +import org.knora.webapi.messages.v2.responder.standoffmessages.GetMappingRequestV2 +import org.knora.webapi.messages.v2.responder.standoffmessages.GetMappingResponseV2 +import org.knora.webapi.messages.v2.responder.standoffmessages.GetXSLTransformationRequestV2 +import org.knora.webapi.messages.v2.responder.standoffmessages.GetXSLTransformationResponseV2 import org.knora.webapi.messages.v2.responder.valuemessages._ -import org.knora.webapi.messages.v2.responder.{SuccessResponseV2, UpdateResultInProject} -import org.knora.webapi.messages.{OntologyConstants, SmartIri} import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.Responder.handleUnexpectedMessage import org.knora.webapi.util._ +import java.time.Instant +import java.util.UUID import scala.concurrent.Future -import scala.util.{Failure, Success} +import scala.util.Failure +import scala.util.Success class ResourcesResponderV2(responderData: ResponderData) extends ResponderWithStandoffV2(responderData) { @@ -273,7 +268,6 @@ class ResourcesResponderV2(responderData: ResponderData) extends ResponderWithSt sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .createNewResources( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, resourcesToCreate = Seq(resourceReadyToCreate.sparqlTemplateResourceToCreate), projectIri = createResourceRequestV2.createResource.projectADM.id, creatorIri = createResourceRequestV2.requestingUser.id @@ -446,7 +440,6 @@ class ResourcesResponderV2(responderData: ResponderData) extends ResponderWithSt // Generate SPARQL for updating the resource. sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .changeResourceMetadata( - triplestore = settings.triplestoreType, dataNamedGraph = dataNamedGraph, resourceIri = updateResourceMetadataRequestV2.resourceIri, resourceClassIri = internalResourceClassIri, @@ -602,7 +595,6 @@ class ResourcesResponderV2(responderData: ResponderData) extends ResponderWithSt // Generate SPARQL for marking the resource as deleted. sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .deleteResource( - triplestore = settings.triplestoreType, dataNamedGraph = dataNamedGraph, resourceIri = deleteResourceV2.resourceIri, maybeDeleteComment = deleteResourceV2.maybeDeleteComment, @@ -618,7 +610,6 @@ class ResourcesResponderV2(responderData: ResponderData) extends ResponderWithSt sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .checkResourceDeletion( - triplestore = settings.triplestoreType, resourceIri = deleteResourceV2.resourceIri ) .toString() @@ -717,7 +708,6 @@ class ResourcesResponderV2(responderData: ResponderData) extends ResponderWithSt // Generate SPARQL for erasing the resource. sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .eraseResource( - triplestore = settings.triplestoreType, dataNamedGraph = dataNamedGraph, resourceIri = eraseResourceV2.resourceIri ) @@ -1492,7 +1482,6 @@ class ResourcesResponderV2(responderData: ResponderData) extends ResponderWithSt resourceRequestSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getResourcePropertiesAndValues( - triplestore = settings.triplestoreType, resourceIris = resourceIrisDistinct, preview = preview, withDeleted = withDeleted, @@ -2131,7 +2120,6 @@ class ResourcesResponderV2(responderData: ResponderData) extends ResponderWithSt sparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getGraphData( - triplestore = settings.triplestoreType, startNodeIri = startNode.nodeIri, startNodeOnly = false, maybeExcludeLinkProperty = excludePropertyInternal, @@ -2273,7 +2261,6 @@ class ResourcesResponderV2(responderData: ResponderData) extends ResponderWithSt sparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getGraphData( - triplestore = settings.triplestoreType, startNodeIri = graphDataGetRequest.resourceIri, maybeExcludeLinkProperty = excludePropertyInternal, startNodeOnly = true, @@ -2398,7 +2385,6 @@ class ResourcesResponderV2(responderData: ResponderData) extends ResponderWithSt historyRequestSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getResourceValueVersionHistory( - triplestore = settings.triplestoreType, withDeletedResource = resourceHistoryRequest.withDeletedResource, resourceIri = resourceHistoryRequest.resourceIri, maybeStartDate = resourceHistoryRequest.startDate, @@ -2638,7 +2624,6 @@ class ResourcesResponderV2(responderData: ResponderData) extends ResponderWithSt // Do a SELECT prequery to get the IRIs of the resources that belong to the project. prequery = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getAllResourcesInProjectPrequery( - triplestore = settings.triplestoreType, projectIri = projectInfoResponse.project.id ) .toString diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala index 755172557a..c876925d2f 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala @@ -8,38 +8,38 @@ package org.knora.webapi.responders.v2 import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.{ - AssertionException, - BadRequestException, - GravsearchException, - InconsistentRepositoryDataException -} +import org.knora.webapi.exceptions.AssertionException +import org.knora.webapi.exceptions.BadRequestException +import org.knora.webapi.exceptions.GravsearchException +import org.knora.webapi.exceptions.InconsistentRepositoryDataException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.util.ConstructResponseUtilV2 import org.knora.webapi.messages.util.ConstructResponseUtilV2.MappingAndXSLTransformation -import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, SparqlSelectResultBody, VariableResultsRow} +import org.knora.webapi.messages.util.ErrorHandlingMap +import org.knora.webapi.messages.util.ResponderData +import org.knora.webapi.messages.util.rdf.SparqlSelectResult +import org.knora.webapi.messages.util.rdf.SparqlSelectResultBody +import org.knora.webapi.messages.util.rdf.VariableResultsRow import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.GravsearchQueryChecker -import org.knora.webapi.messages.util.search.gravsearch.prequery.{ - AbstractPrequeryGenerator, - NonTriplestoreSpecificGravsearchToCountPrequeryTransformer, - NonTriplestoreSpecificGravsearchToPrequeryTransformer -} +import org.knora.webapi.messages.util.search.gravsearch.prequery.AbstractPrequeryGenerator +import org.knora.webapi.messages.util.search.gravsearch.prequery.NonTriplestoreSpecificGravsearchToCountPrequeryTransformer +import org.knora.webapi.messages.util.search.gravsearch.prequery.NonTriplestoreSpecificGravsearchToPrequeryTransformer import org.knora.webapi.messages.util.search.gravsearch.types._ import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 -import org.knora.webapi.messages.util.{ConstructResponseUtilV2, ErrorHandlingMap, ResponderData} import org.knora.webapi.messages.v2.responder.KnoraJsonLDResponseV2 -import org.knora.webapi.messages.v2.responder.ontologymessages.{ - EntityInfoGetRequestV2, - EntityInfoGetResponseV2, - ReadClassInfoV2, - ReadPropertyInfoV2 -} +import org.knora.webapi.messages.v2.responder.ontologymessages.EntityInfoGetRequestV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.EntityInfoGetResponseV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.ReadClassInfoV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.ReadPropertyInfoV2 import org.knora.webapi.messages.v2.responder.resourcemessages._ import org.knora.webapi.messages.v2.responder.searchmessages._ -import org.knora.webapi.messages.{OntologyConstants, SmartIri, StringFormatter} import org.knora.webapi.responders.Responder.handleUnexpectedMessage import org.knora.webapi.util.ApacheLuceneSupport._ @@ -180,7 +180,6 @@ class SearchResponderV2(responderData: ResponderData) extends ResponderWithStand countSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .searchFulltext( - triplestore = settings.triplestoreType, searchTerms = searchTerms, limitToProject = limitToProject, limitToResourceClass = limitToResourceClass.map(_.toString), @@ -246,7 +245,6 @@ class SearchResponderV2(responderData: ResponderData) extends ResponderWithStand searchSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .searchFulltext( - triplestore = settings.triplestoreType, searchTerms = searchTerms, limitToProject = limitToProject, limitToResourceClass = limitToResourceClass.map(_.toString), @@ -774,7 +772,6 @@ class SearchResponderV2(responderData: ResponderData) extends ResponderWithStand // Do a SELECT prequery to get the IRIs of the requested page of resources. prequery = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getResourcesByClassInProjectPrequery( - triplestore = settings.triplestoreType, projectIri = resourcesInProjectGetRequestV2.projectIri.toString, resourceClassIri = internalClassIri, maybeOrderByProperty = maybeInternalOrderByPropertyIri, @@ -811,7 +808,6 @@ class SearchResponderV2(responderData: ResponderData) extends ResponderWithStand resourceRequestSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getResourcePropertiesAndValues( - triplestore = settings.triplestoreType, resourceIris = mainResourceIris, preview = false, withDeleted = false, @@ -896,7 +892,6 @@ class SearchResponderV2(responderData: ResponderData) extends ResponderWithStand countSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .searchResourceByLabel( - triplestore = settings.triplestoreType, searchTerm = searchPhrase, limitToProject = limitToProject, limitToResourceClass = limitToResourceClass.map(_.toString), @@ -954,7 +949,6 @@ class SearchResponderV2(responderData: ResponderData) extends ResponderWithStand searchResourceByLabelSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .searchResourceByLabel( - triplestore = settings.triplestoreType, searchTerm = searchPhrase, limitToProject = limitToProject, limitToResourceClass = limitToResourceClass.map(_.toString), diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala index 3a62dc53f9..65bbc6db0d 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala @@ -5,46 +5,59 @@ package org.knora.webapi.responders.v2 -import java.io._ -import java.util.UUID - import akka.pattern._ import akka.stream.Materializer import akka.util.Timeout -import javax.xml.XMLConstants -import javax.xml.transform.stream.StreamSource -import javax.xml.validation.{Schema, SchemaFactory, Validator => JValidator} import org.knora.webapi._ import org.knora.webapi.exceptions._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.admin.responder.projectsmessages.{ProjectADM, ProjectGetADM, ProjectIdentifierADM} +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.StringFormatter +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectGetADM +import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM import org.knora.webapi.messages.admin.responder.usersmessages.UserADM -import org.knora.webapi.messages.store.sipimessages.{SipiGetTextFileRequest, SipiGetTextFileResponse} +import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest +import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileResponse import org.knora.webapi.messages.store.triplestoremessages._ -import org.knora.webapi.messages.twirl.{MappingElement, MappingStandoffDatatypeClass, MappingXMLAttribute} +import org.knora.webapi.messages.twirl.MappingElement +import org.knora.webapi.messages.twirl.MappingStandoffDatatypeClass +import org.knora.webapi.messages.twirl.MappingXMLAttribute +import org.knora.webapi.messages.util.ConstructResponseUtilV2 +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.ResponderData import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2 import org.knora.webapi.messages.util.standoff.StandoffTagUtilV2.XMLTagItem -import org.knora.webapi.messages.util.{ConstructResponseUtilV2, KnoraSystemInstances, ResponderData} +import org.knora.webapi.messages.v2.responder.ontologymessages.Cardinality import org.knora.webapi.messages.v2.responder.ontologymessages.Cardinality.KnoraCardinalityInfo -import org.knora.webapi.messages.v2.responder.ontologymessages.{ - Cardinality, - ReadClassInfoV2, - StandoffEntityInfoGetRequestV2, - StandoffEntityInfoGetResponseV2 -} +import org.knora.webapi.messages.v2.responder.ontologymessages.ReadClassInfoV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.StandoffEntityInfoGetRequestV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.StandoffEntityInfoGetResponseV2 import org.knora.webapi.messages.v2.responder.resourcemessages._ import org.knora.webapi.messages.v2.responder.standoffmessages._ import org.knora.webapi.messages.v2.responder.valuemessages._ -import org.knora.webapi.messages.{OntologyConstants, SmartIri, StringFormatter} +import org.knora.webapi.responders.IriLocker +import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage -import org.knora.webapi.responders.{IriLocker, Responder} import org.knora.webapi.util._ import org.knora.webapi.util.cache.CacheUtil import org.xml.sax.SAXException -import scala.concurrent.{ExecutionContext, Future} -import scala.xml.{Elem, Node, NodeSeq, XML} +import java.io._ +import java.util.UUID +import javax.xml.XMLConstants +import javax.xml.transform.stream.StreamSource +import javax.xml.validation.Schema +import javax.xml.validation.SchemaFactory +import javax.xml.validation.{Validator => JValidator} +import scala.concurrent.ExecutionContext +import scala.concurrent.Future +import scala.xml.Elem +import scala.xml.Node +import scala.xml.NodeSeq +import scala.xml.XML /** * Responds to requests relating to the creation of mappings from XML elements and attributes to standoff classes and properties. @@ -92,7 +105,6 @@ class StandoffResponderV2(responderData: ResponderData) extends Responder(respon resourceRequestSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getResourcePropertiesAndValues( - triplestore = settings.triplestoreType, resourceIris = Seq(getStandoffRequestV2.resourceIri), preview = false, withDeleted = false, @@ -482,7 +494,6 @@ class StandoffResponderV2(responderData: ResponderData) extends Responder(respon // check if the mapping IRI already exists getExistingMappingSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getMapping( - triplestore = settings.triplestoreType, mappingIri = mappingIri ) .toString() @@ -498,7 +509,6 @@ class StandoffResponderV2(responderData: ResponderData) extends Responder(respon createNewMappingSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .createNewMapping( - triplestore = settings.triplestoreType, dataNamedGraph = namedGraph, mappingIri = mappingIri, label = label, @@ -820,7 +830,6 @@ class StandoffResponderV2(responderData: ResponderData) extends Responder(respon val getMappingSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getMapping( - triplestore = settings.triplestoreType, mappingIri = mappingIri ) .toString() diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala index d8d95fea60..21a4f444fd 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala @@ -5,33 +5,37 @@ package org.knora.webapi.responders.v2 -import java.time.Instant -import java.util.UUID - import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ import org.knora.webapi.exceptions._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.admin.responder.permissionsmessages.{PermissionADM, PermissionType} +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionType import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.PermissionUtilADM import org.knora.webapi.messages.util.PermissionUtilADM._ +import org.knora.webapi.messages.util.ResponderData import org.knora.webapi.messages.util.rdf.SparqlSelectResult import org.knora.webapi.messages.util.search.gravsearch.GravsearchParser -import org.knora.webapi.messages.util.{KnoraSystemInstances, PermissionUtilADM, ResponderData} import org.knora.webapi.messages.v2.responder.SuccessResponseV2 import org.knora.webapi.messages.v2.responder.ontologymessages._ import org.knora.webapi.messages.v2.responder.resourcemessages._ import org.knora.webapi.messages.v2.responder.searchmessages.GravsearchRequestV2 import org.knora.webapi.messages.v2.responder.valuemessages._ -import org.knora.webapi.messages.{OntologyConstants, SmartIri} +import org.knora.webapi.responders.IriLocker +import org.knora.webapi.responders.Responder import org.knora.webapi.responders.Responder.handleUnexpectedMessage -import org.knora.webapi.responders.{IriLocker, Responder} import org.knora.webapi.util.ActorUtil +import java.time.Instant +import java.util.UUID import scala.concurrent.Future /** @@ -490,7 +494,6 @@ class ValuesResponderV2(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .createValue( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, resourceIri = resourceInfo.resourceIri, propertyIri = propertyIri, newValueIri = newValueIri, @@ -569,7 +572,6 @@ class ValuesResponderV2(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .createLink( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, resourceIri = resourceInfo.resourceIri, linkUpdate = sparqlTemplateLinkUpdate, newValueUUID = newValueUUID, @@ -1038,7 +1040,6 @@ class ValuesResponderV2(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .changeValuePermissions( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, resourceIri = resourceInfo.resourceIri, propertyIri = submittedInternalPropertyIri, currentValueIri = currentValue.valueIri, @@ -1384,7 +1385,6 @@ class ValuesResponderV2(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .addValueVersion( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, resourceIri = resourceInfo.resourceIri, propertyIri = propertyIri, currentValueIri = currentValue.valueIri, @@ -1481,7 +1481,6 @@ class ValuesResponderV2(responderData: ResponderData) extends Responder(responde org.knora.webapi.messages.twirl.queries.sparql.v2.txt .changeLinkTarget( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, linkSourceIri = resourceInfo.resourceIri, linkUpdateForCurrentLink = sparqlTemplateLinkUpdateForCurrentLink, linkUpdateForNewLink = sparqlTemplateLinkUpdateForNewLink, @@ -1527,7 +1526,6 @@ class ValuesResponderV2(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .changeLinkMetadata( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, linkSourceIri = resourceInfo.resourceIri, linkUpdate = sparqlTemplateLinkUpdate, maybeComment = newLinkValue.comment, @@ -1706,7 +1704,6 @@ class ValuesResponderV2(responderData: ResponderData) extends Responder(responde // Check whether the update succeeded. sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .checkValueDeletion( - triplestore = settings.triplestoreType, valueIri = deletedValueIri ) .toString() @@ -1841,7 +1838,6 @@ class ValuesResponderV2(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .deleteLink( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, linkSourceIri = resourceInfo.resourceIri, linkUpdate = sparqlTemplateLinkUpdate, maybeComment = deleteComment, @@ -1907,7 +1903,6 @@ class ValuesResponderV2(responderData: ResponderData) extends Responder(responde sparqlUpdate = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .deleteValue( dataNamedGraph = dataNamedGraph, - triplestore = settings.triplestoreType, resourceIri = resourceInfo.resourceIri, propertyIri = propertyIri, valueIri = currentValue.valueIri, diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cache.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cache.scala index 25b08f2edf..59626bdeef 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cache.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cache.scala @@ -7,47 +7,50 @@ package org.knora.webapi.responders.v2.ontology import akka.actor.ActorRef import akka.http.scaladsl.util.FastFuture -import org.knora.webapi.{ApiV2Complex, InternalSchema, KnoraBaseVersion, OntologySchema} -import org.knora.webapi.exceptions.{ - ApplicationCacheException, - BadRequestException, - MissingLastModificationDateOntologyException, - ForbiddenException, - InconsistentRepositoryDataException -} +import akka.pattern._ +import akka.util.Timeout +import com.typesafe.scalalogging.LazyLogging +import com.typesafe.scalalogging.Logger +import org.knora.webapi.ApiV2Complex +import org.knora.webapi.InternalSchema +import org.knora.webapi.KnoraBaseVersion +import org.knora.webapi.OntologySchema +import org.knora.webapi.app.ApplicationActor +import org.knora.webapi.exceptions.ApplicationCacheException +import org.knora.webapi.exceptions.BadRequestException +import org.knora.webapi.exceptions.ForbiddenException +import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import org.knora.webapi.exceptions.MissingLastModificationDateOntologyException import org.knora.webapi.feature.FeatureFactoryConfig -import org.knora.webapi.util.cache.CacheUtil import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.{OntologyConstants, SmartIri, StringFormatter} +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.StringFormatter.SalsahGuiAttributeDefinition import org.knora.webapi.messages.admin.responder.usersmessages.UserADM -import org.knora.webapi.messages.store.triplestoremessages.{ - SparqlExtendedConstructRequest, - SparqlExtendedConstructResponse, - SparqlSelectRequest -} +import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructRequest +import org.knora.webapi.messages.store.triplestoremessages.SparqlExtendedConstructResponse +import org.knora.webapi.messages.store.triplestoremessages.SparqlSelectRequest +import org.knora.webapi.messages.util.ErrorHandlingMap +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.OntologyUtil import org.knora.webapi.messages.util.rdf.SparqlSelectResult -import org.knora.webapi.messages.util.{ErrorHandlingMap, KnoraSystemInstances, OntologyUtil} import org.knora.webapi.messages.v2.responder.SuccessResponseV2 import org.knora.webapi.messages.v2.responder.ontologymessages.Cardinality.KnoraCardinalityInfo -import org.knora.webapi.messages.v2.responder.ontologymessages.{ - ClassInfoContentV2, - IndividualInfoContentV2, - OntologyMetadataV2, - PropertyInfoContentV2, - ReadClassInfoV2, - ReadOntologyV2, - ReadPropertyInfoV2 -} +import org.knora.webapi.messages.v2.responder.ontologymessages.ClassInfoContentV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.IndividualInfoContentV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.OntologyMetadataV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.PropertyInfoContentV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.ReadClassInfoV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.ReadOntologyV2 +import org.knora.webapi.messages.v2.responder.ontologymessages.ReadPropertyInfoV2 import org.knora.webapi.responders.v2.ontology.OntologyHelpers.OntologyGraph import org.knora.webapi.settings.KnoraSettingsImpl +import org.knora.webapi.util.cache.CacheUtil -import scala.concurrent.{ExecutionContext, Future} -import akka.pattern._ -import akka.util.Timeout -import com.typesafe.scalalogging.{LazyLogging, Logger} import java.time.Instant -import org.knora.webapi.app.ApplicationActor +import scala.concurrent.ExecutionContext +import scala.concurrent.Future object Cache extends LazyLogging { @@ -114,7 +117,7 @@ object Cache extends LazyLogging { // Get all ontology metadata. allOntologyMetadataSparql <- FastFuture.successful( org.knora.webapi.messages.twirl.queries.sparql.v2.txt - .getAllOntologyMetadata(triplestore = settings.triplestoreType) + .getAllOntologyMetadata() .toString() ) allOntologyMetadataResponse: SparqlSelectResult <- (storeManager ? SparqlSelectRequest(allOntologyMetadataSparql)) @@ -162,7 +165,6 @@ object Cache extends LazyLogging { val ontologyGraphConstructQuery = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getOntologyGraph( - triplestore = settings.triplestoreType, ontologyGraph = ontologyIri ) .toString diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cardinalities.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cardinalities.scala index 337a4e5c40..b3eee46d6a 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cardinalities.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cardinalities.scala @@ -10,23 +10,25 @@ import akka.http.scaladsl.util.FastFuture import akka.pattern._ import akka.util.Timeout import org.knora.webapi.InternalSchema -import org.knora.webapi.exceptions.{BadRequestException, InconsistentRepositoryDataException} +import org.knora.webapi.exceptions.BadRequestException +import org.knora.webapi.exceptions.InconsistentRepositoryDataException import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraBase -import org.knora.webapi.messages.store.triplestoremessages.{ - SparqlAskRequest, - SparqlAskResponse, - SparqlUpdateRequest, - SparqlUpdateResponse -} +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.StringFormatter +import org.knora.webapi.messages.store.triplestoremessages.SparqlAskRequest +import org.knora.webapi.messages.store.triplestoremessages.SparqlAskResponse +import org.knora.webapi.messages.store.triplestoremessages.SparqlUpdateRequest +import org.knora.webapi.messages.store.triplestoremessages.SparqlUpdateResponse import org.knora.webapi.messages.v2.responder.CanDoResponseV2 import org.knora.webapi.messages.v2.responder.ontologymessages.Cardinality.KnoraCardinalityInfo import org.knora.webapi.messages.v2.responder.ontologymessages._ -import org.knora.webapi.messages.{OntologyConstants, SmartIri, StringFormatter} import org.knora.webapi.settings.KnoraSettingsImpl import java.time.Instant -import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.ExecutionContext +import scala.concurrent.Future /** * Contains methods used for dealing with cardinalities on a class @@ -387,7 +389,6 @@ object Cardinalities { updateSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .replaceClassCardinalities( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = internalOntologyIri, ontologyIri = internalOntologyIri, classIri = internalClassIri, @@ -473,7 +474,6 @@ object Cardinalities { request <- Future( org.knora.webapi.queries.sparql.v2.txt .isPropertyUsed( - triplestore = settings.triplestoreType, internalPropertyIri = internalPropertyIri.toString, internalClassIri = internalClassIri.toString, ignoreKnoraConstraints = true, diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala index 020051517e..7f62e9b196 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala @@ -9,25 +9,35 @@ import akka.actor.ActorRef import akka.http.scaladsl.util.FastFuture import akka.pattern._ import akka.util.Timeout +import org.knora.webapi.ApiV2Complex +import org.knora.webapi.ApiV2Schema +import org.knora.webapi.ApiV2Simple +import org.knora.webapi.IRI +import org.knora.webapi.InternalSchema +import org.knora.webapi.OntologySchema import org.knora.webapi.exceptions._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.StringFormatter.{SalsahGuiAttribute, SalsahGuiAttributeDefinition} +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.StringFormatter +import org.knora.webapi.messages.StringFormatter.SalsahGuiAttribute +import org.knora.webapi.messages.StringFormatter.SalsahGuiAttributeDefinition import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.util.ErrorHandlingMap -import org.knora.webapi.messages.util.rdf.{SparqlSelectResult, VariableResultsRow} +import org.knora.webapi.messages.util.rdf.SparqlSelectResult +import org.knora.webapi.messages.util.rdf.VariableResultsRow import org.knora.webapi.messages.v2.responder.ontologymessages.Cardinality.KnoraCardinalityInfo import org.knora.webapi.messages.v2.responder.ontologymessages._ import org.knora.webapi.messages.v2.responder.standoffmessages.StandoffDataTypeClasses -import org.knora.webapi.messages.{OntologyConstants, SmartIri, StringFormatter} import org.knora.webapi.responders.v2.ontology.Cache.OntologyCacheData import org.knora.webapi.settings.KnoraSettingsImpl -import org.knora.webapi.{ApiV2Complex, ApiV2Schema, ApiV2Simple, IRI, InternalSchema, OntologySchema} import java.time.Instant import scala.collection.immutable -import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.ExecutionContext +import scala.concurrent.Future object OntologyHelpers { @@ -131,7 +141,6 @@ object OntologyHelpers { getOntologyInfoSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getOntologyInfo( - triplestore = settings.triplestoreType, ontologyIri = internalOntologyIri ) .toString() @@ -1073,7 +1082,6 @@ object OntologyHelpers { isOntologyUsedSparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .isOntologyUsed( - triplestore = settings.triplestoreType, ontologyNamedGraphIri = ontology.ontologyMetadata.ontologyIri, classIris = ontology.classes.keySet, propertyIris = ontology.properties.keySet @@ -1128,7 +1136,6 @@ object OntologyHelpers { sparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getPropertyDefinition( - triplestore = settings.triplestoreType, propertyIri = propertyIri ) .toString() @@ -1572,7 +1579,6 @@ object OntologyHelpers { sparql <- Future( org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getClassDefinition( - triplestore = settings.triplestoreType, classIri = classIri ) .toString() diff --git a/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala b/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala index 08386b50ef..4f34f27c2d 100644 --- a/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala +++ b/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala @@ -5,19 +5,29 @@ package org.knora.webapi.settings -import java.nio.file.{Files, Path, Paths} -import java.time.Instant - import akka.ConfigurationException -import akka.actor.{ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider} +import akka.actor.ActorSystem +import akka.actor.ExtendedActorSystem +import akka.actor.Extension +import akka.actor.ExtensionId +import akka.actor.ExtensionIdProvider import akka.event.LoggingAdapter -import com.typesafe.config.{Config, ConfigObject, ConfigValue} -import org.knora.webapi.exceptions.{FeatureToggleException, FileWriteException} +import com.typesafe.config.Config +import com.typesafe.config.ConfigObject +import com.typesafe.config.ConfigValue +import org.knora.webapi.exceptions.FeatureToggleException +import org.knora.webapi.exceptions.FileWriteException import org.knora.webapi.util.cache.CacheUtil.KnoraCacheConfig -import scala.jdk.CollectionConverters._ +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths +import java.time.Instant import scala.concurrent.duration._ -import scala.util.{Failure, Success, Try} +import scala.jdk.CollectionConverters._ +import scala.util.Failure +import scala.util.Success +import scala.util.Try /** * Reads application settings that come from `application.conf`. @@ -205,25 +215,10 @@ class KnoraSettingsImpl(config: Config, log: LoggingAdapter) extends Extension { val triplestoreAutoInit: Boolean = config.getBoolean("app.triplestore.auto-init") - val triplestorePort: Int = triplestoreType match { - case TriplestoreTypes.HttpFuseki => config.getInt("app.triplestore.fuseki.port") - case _ => 9999 - } - - val triplestoreDatabaseName: String = triplestoreType match { - case TriplestoreTypes.HttpFuseki => config.getString("app.triplestore.fuseki.repository-name") - case _ => "" - } - - val triplestoreUsername: String = triplestoreType match { - case TriplestoreTypes.HttpFuseki => config.getString("app.triplestore.fuseki.username") - case _ => "" - } - - val triplestorePassword: String = triplestoreType match { - case TriplestoreTypes.HttpFuseki => config.getString("app.triplestore.fuseki.password") - case _ => "" - } + val triplestorePort: Int = config.getInt("app.triplestore.fuseki.port") + val triplestoreDatabaseName: String = config.getString("app.triplestore.fuseki.repository-name") + val triplestoreUsername: String = config.getString("app.triplestore.fuseki.username") + val triplestorePassword: String = config.getString("app.triplestore.fuseki.password") //used in the store package val tripleStoreConfig: Config = config.getConfig("app.triplestore") diff --git a/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettingsConstants.scala b/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettingsConstants.scala index 1563cf80e9..e282c9eeea 100644 --- a/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettingsConstants.scala +++ b/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettingsConstants.scala @@ -5,15 +5,6 @@ package org.knora.webapi.settings -/** - * 'SettingsConstants' contains constants of strings, we would generally expect to find in - * the 'application.conf' file, which can be accessed by the application 'Settings' - */ -object TriplestoreTypes { - val EmbeddedJenaTdb = "embedded-jena-tdb" - val HttpFuseki = "fuseki" -} - object KnoraDispatchers { /** diff --git a/webapi/src/main/scala/org/knora/webapi/settings/package.scala b/webapi/src/main/scala/org/knora/webapi/settings/package.scala index a276770d2d..ec87ce883e 100644 --- a/webapi/src/main/scala/org/knora/webapi/settings/package.scala +++ b/webapi/src/main/scala/org/knora/webapi/settings/package.scala @@ -105,7 +105,6 @@ package object settings { val TriplestoreManagerActorPath: String = StoreManagerActorPath + "/" + TriplestoreManagerActorName val HttpTriplestoreActorName: String = "httpTriplestoreRouter" - val EmbeddedJenaActorName: String = "embeddedJenaTDB" val FakeTriplestoreActorName: String = "fakeTriplestore" /* Sipi */ diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/TriplestoreManager.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/TriplestoreManager.scala index e6e47cfe8e..1a778a2ec3 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/TriplestoreManager.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/TriplestoreManager.scala @@ -5,7 +5,10 @@ package org.knora.webapi.store.triplestore -import akka.actor.{Actor, ActorLogging, ActorRef, Props} +import akka.actor.Actor +import akka.actor.ActorLogging +import akka.actor.ActorRef +import akka.actor.Props import akka.event.LoggingReceive import akka.routing.FromConfig import org.knora.webapi.core.ActorMaker @@ -14,7 +17,6 @@ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.store.triplestoremessages.UpdateRepositoryRequest import org.knora.webapi.messages.util.FakeTriplestore import org.knora.webapi.settings._ -import org.knora.webapi.store.triplestore.embedded.JenaTDBActor import org.knora.webapi.store.triplestore.http.HttpTriplestoreConnector import org.knora.webapi.store.triplestore.upgrade.RepositoryUpdater import org.knora.webapi.util.ActorUtil._ @@ -70,15 +72,10 @@ class TriplestoreManager( override def preStart(): Unit = { log.debug("TriplestoreManagerActor: start with preStart") - storeActorRef = settings.triplestoreType match { - case TriplestoreTypes.HttpFuseki => - makeActor( - FromConfig.props(Props[HttpTriplestoreConnector]()).withDispatcher(KnoraDispatchers.KnoraActorDispatcher), - name = HttpTriplestoreActorName - ) - case TriplestoreTypes.EmbeddedJenaTdb => makeActor(Props[JenaTDBActor](), name = EmbeddedJenaActorName) - case unknownType => throw UnsupportedTriplestoreException(s"Embedded triplestore type $unknownType not supported") - } + storeActorRef = makeActor( + FromConfig.props(Props[HttpTriplestoreConnector]()).withDispatcher(KnoraDispatchers.KnoraActorDispatcher), + name = HttpTriplestoreActorName + ) log.debug("TriplestoreManagerActor: finished with preStart") } diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/embedded/JenaTDBActor.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/embedded/JenaTDBActor.scala deleted file mode 100644 index d6d0c9d90c..0000000000 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/embedded/JenaTDBActor.scala +++ /dev/null @@ -1,465 +0,0 @@ -/* - * Copyright © 2021 - 2022 Swiss National Data and Service Center for the Humanities and/or DaSCH Service Platform contributors. - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.knora.webapi.store.triplestore.embedded - -import java.nio.file.{Files, Paths} - -import akka.actor.{Actor, ActorLogging, Status} -import org.apache.commons.io.FileUtils -import org.apache.jena.graph.Node -import org.apache.jena.query._ -import org.apache.jena.query.text._ -import org.apache.jena.rdf.model.{Literal, ResourceFactory} -import org.apache.jena.sparql.core.Quad -import org.apache.jena.tdb.{TDB, TDBFactory} -import org.apache.jena.update.{UpdateAction, UpdateFactory, UpdateRequest} -import org.apache.lucene.store._ -import org.knora.webapi.exceptions.{ - TriplestoreInternalException, - TriplestoreResponseException, - UnexpectedMessageException -} -import org.knora.webapi.messages.store.triplestoremessages._ -import org.knora.webapi.messages.util.ErrorHandlingMap -import org.knora.webapi.messages.util.rdf.{ - SparqlSelectResult, - SparqlSelectResultBody, - SparqlSelectResultHeader, - VariableResultsRow -} -import org.knora.webapi.settings.KnoraSettings -import org.knora.webapi.store.triplestore.RdfDataObjectFactory -import org.knora.webapi.util.ActorUtil._ - -import scala.jdk.CollectionConverters._ -import scala.concurrent.{ExecutionContextExecutor, Future} - -/** - * Performs SPARQL queries and updates using an embedded Jena TDB triplestore. - */ -class JenaTDBActor extends Actor with ActorLogging { - - private val system = context.system - private implicit val executionContext: ExecutionContextExecutor = system.dispatcher - private val settings = KnoraSettings(system) - - private val persist = settings.tripleStoreConfig.getBoolean("embedded-jena-tdb.persisted") - private val loadExistingData = settings.tripleStoreConfig.getBoolean("embedded-jena-tdb.loadExistingData") - private val storagePath = Paths.get(settings.tripleStoreConfig.getString("embedded-jena-tdb.storage-path")) - private val tdbStoragePath = Paths.get(storagePath.toString + "/db") - - private val tsType = settings.triplestoreType - - private val reloadDataOnStart = if (settings.tripleStoreConfig.getBoolean("reload-on-start")) { - true - } else if (tsType == "fake-triplestore") { - // always reload if run as part of the fake-triplestore - true - } else { - false - } - - // Jena prefers to have 1 global dataset - lazy val dataset: Dataset = getDataset - - var initialized: Boolean = false - - /** - * The actor waits with processing messages until preStart is finished, so that the loading of data can finish - * before any requests are processed. - */ - override def preStart(): Unit = { - if (persist) { - if (reloadDataOnStart || !loadExistingData) { - log.debug(s"Disk backed store. Delete and Create: ${tdbStoragePath.toAbsolutePath}") - - // only allowed, because the dataset gets created later on. - FileUtils.deleteQuietly(tdbStoragePath.toFile) - } else { - log.debug(s"Disk backed store. Using: ${tdbStoragePath.toAbsolutePath}") - } - - Files.createDirectories(tdbStoragePath) - } else { - log.debug(s"In-memory store: will reload data") - } - - if (reloadDataOnStart) { - - val configList = settings.tripleStoreConfig.getConfigList("rdf-data") - val rdfDataObjectList = configList.asScala.map { config => - RdfDataObjectFactory(config) - } - - // remove everything - dropAllTriplestoreContent() - - // insert data - insertDataIntoTriplestore(rdfDataObjectList.toSeq) - } - this.initialized = true - } - - /** - * Receives a message requesting a SPARQL query or update, and returns an appropriate response message or - * [[Status.Failure]]. If a serious error occurs (i.e. an error that isn't the client's fault), this - * method first returns `Failure` to the sender, then throws an exception. - */ - def receive: Receive = { - case SparqlSelectRequest(sparqlSelectString) => - future2Message(sender(), executeSparqlSelectQuery(sparqlSelectString), log) - case SparqlUpdateRequest(sparqlUpdateString) => - future2Message(sender(), executeSparqlUpdateQuery(sparqlUpdateString), log) - case ResetRepositoryContent(rdfDataObjects, prependDefaults) => - future2Message(sender(), resetTripleStoreContent(rdfDataObjects, prependDefaults), log) - case DropAllTRepositoryContent() => future2Message(sender(), Future(dropAllTriplestoreContent()), log) - case InsertRepositoryContent(rdfDataObjects) => - future2Message(sender(), Future(insertDataIntoTriplestore(rdfDataObjects)), log) - case HelloTriplestore(msg) if msg == tsType => sender() ! HelloTriplestore(tsType) - case other => - sender() ! Status.Failure( - UnexpectedMessageException(s"Unexpected message $other of type ${other.getClass.getCanonicalName}") - ) - } - - /** - * Submits a SPARQL query to the embedded Jena TDB store and returns the response as a [[SparqlSelectResult]]. - * - * @param queryString the SPARQL request to be submitted. - * @return [[SparqlSelectResult]]. - */ - private def executeSparqlSelectQuery(queryString: String): Future[SparqlSelectResult] = { - - // Start read transaction - this.dataset.begin(ReadWrite.READ) - - try { - //println("==>> SparqlSelect Start") - //println("# Content of dataset at beginning of query") - //SSE.write(this.dataset) - - val query: Query = QueryFactory.create(queryString) - val qExec: QueryExecution = QueryExecutionFactory.create(query, this.dataset) - val resultSet: ResultSet = qExec.execSelect() - - /* - Attention: the ResultSet can be only used once, i.e. it is not there anymore after use! - println(s"# Query string: $queryString") - println("# Content of ResultSet: ") - println(ResultSetFormatter.asText(resultSet)) - println(ResultSetFormatter.asText(resultSet)) - */ - - val resultVars = resultSet.getResultVars - - // Convert the results to a list of VariableResultsRows. - val variableResultsRows = resultSet.asScala.foldLeft(Vector.empty[VariableResultsRow]) { (rowAcc, row) => - val mapToWrap = resultVars.asScala.foldLeft(Map.empty[String, String]) { case (varAcc, varName) => - Option(row.get(varName)) match { - case Some(literal: Literal) if literal.getLexicalForm.isEmpty => - varAcc // Omit variables with empty values. - - case Some(literal: Literal) => - varAcc + (varName -> literal.getLexicalForm) - - case Some(otherValue) => - varAcc + (varName -> otherValue.toString) - - case None => varAcc - } - } - - // Omit empty rows. - if (mapToWrap.nonEmpty) { - rowAcc :+ VariableResultsRow( - new ErrorHandlingMap( - mapToWrap, - { key: String => - s"No value found for SPARQL query variable '$key' in query result row" - } - ) - ) - } else { - rowAcc - } - } - - qExec.close() - - // Commit transaction - this.dataset.commit() - - //println("==>> SparqlSelect End") - - Future.successful( - SparqlSelectResult( - SparqlSelectResultHeader(resultVars.asScala.toSeq), - SparqlSelectResultBody(variableResultsRows) - ) - ) - } catch { - case ex: Throwable => - this.dataset.abort() - /* - println("================") - println(queryString) - println("================") - */ - Future.failed(TriplestoreResponseException("Triplestore transaction failed", ex, log)) - } finally { - this.dataset.end() - } - } - - /** - * Submits a SPARQL update request to the embedded Jena TDB store, and returns a [[SparqlUpdateResponse]] if the - * operation completed successfully. - * - * @param updateString the SPARQL update to be submitted. - * @return a [[SparqlUpdateResponse]]. - */ - private def executeSparqlUpdateQuery(updateString: String): Future[SparqlUpdateResponse] = { - // println("=============================") - // println(updateString) - // println() - - // Start write transaction - this.dataset.begin(ReadWrite.WRITE) - - try { - //println("==>> SparqlUpdate Start") - - //println("#state of dataset BEFORE update") - //SSE.write(this.dataset) - - //println(s"executing update for: $updateString") - UpdateAction.parseExecute(updateString, this.dataset) - - // Commit transaction - this.dataset.commit() - - //println("#state of dataset AFTER update") - //SSE.write(this.dataset) - - //println("==>> SparqlUpdate End") - - Future.successful(SparqlUpdateResponse()) - } catch { - case ex: Throwable => - this.dataset.abort() - Future.failed(TriplestoreResponseException("Triplestore transaction failed", ex, log)) - } finally { - this.dataset.end() - } - } - - /** - * Reloads the contents of the triplestore from RDF data files. - * - * @param rdfDataObjects a list of [[RdfDataObject]] instances describing the files to be loaded. - * @return an [[ResetRepositoryContentACK]] indicating that the operation completed successfully. - */ - private def resetTripleStoreContent( - rdfDataObjects: Seq[RdfDataObject], - prependDefaults: Boolean = true - ): Future[ResetRepositoryContentACK] = { - - val resetTriplestoreResult = for { - - // drop old content - dropResult <- Future(dropAllTriplestoreContent()) - - // insert new content - insertResult <- Future(insertDataIntoTriplestore(rdfDataObjects)) - - // manually rebuild the Lucene index - indexUpdateResult <- Future(updateIndex()) - - // any errors throwing exceptions until now are already covered so we can ACK the request - result = ResetRepositoryContentACK() - } yield result - - resetTriplestoreResult - } - - /** - * Drops all content from the triplestore. - * - * @return a [[DropAllRepositoryContentACK]] - */ - private def dropAllTriplestoreContent(): DropAllRepositoryContentACK = { - - // log.debug("ResetTripleStoreContent ...") - - // Start write transaction - this.dataset.begin(ReadWrite.WRITE) - try { - //println("==>> dropAllTriplestoreContent Start") - - // instantiate update request - val updateRequest: UpdateRequest = UpdateFactory.create() - - // add: drop everything - updateRequest.add("DROP ALL") - - // perform the operations. - UpdateAction.execute(updateRequest, this.dataset) - - //println("# State of dataset after reset") - //SSE.write(this.dataset) - //println("==>> dropAllTriplestoreContent End") - - // Commit transaction - this.dataset.commit() - - DropAllRepositoryContentACK() - } catch { - case ex: Throwable => - this.dataset.abort() - throw TriplestoreResponseException("Triplestore transaction failed", ex, log) - } finally { - this.dataset.end() - } - - } - - /** - * Inserts the data referenced in each [[RdfDataObject]] - * - * @param rdfDataObjects a sequence holding [[RdfDataObject]] - * @return a [[InsertTriplestoreContentACK]] - */ - private def insertDataIntoTriplestore(rdfDataObjects: Seq[RdfDataObject]): InsertTriplestoreContentACK = { - - // log.debug("ResetTripleStoreContent ...") - - // Start write transaction - this.dataset.begin(ReadWrite.WRITE) - try { - - log.debug("==>> Loading Data Start") - - // instantiate update request - val updateRequest: UpdateRequest = UpdateFactory.create() - - // add: data - for (elem <- rdfDataObjects) { - log.debug(s"Adding: ${elem.name} - ${elem.path}") - updateRequest.add(s"CREATE GRAPH <${elem.name}>") - updateRequest.add(s"LOAD INTO GRAPH <${elem.name}>") - } - - // perform the operations. - log.debug("===>> Executing") - UpdateAction.execute(updateRequest, this.dataset) - - //println("# State of dataset after reset") - //SSE.write(this.dataset) - log.debug("==>> Loading Data End") - - // Commit transaction - this.dataset.commit() - - InsertTriplestoreContentACK() - } catch { - case ex: Throwable => - this.dataset.abort() - throw TriplestoreResponseException("Triplestore transaction failed", ex, log) - } finally { - this.dataset.end() - } - - } - - /** - * Used to manually refresh the Lucene index after changing data in the triplestore. - * - * @return a [[Boolean]] denoting if the update was successful - */ - private def updateIndex(): Boolean = { - - this.dataset.begin(ReadWrite.WRITE) - try { - // get index. - val dgt: DatasetGraphText = dataset.asDatasetGraph().asInstanceOf[DatasetGraphText] - val textIndex = dgt.getTextIndex - - // get entity definitions from index - val entityDefinition = textIndex.getDocDef - - // get the indexed fields - val fields: List[String] = entityDefinition.fields().asScala.toList - - // go over all properties and find them in the dataset and add them to the index - for (field: String <- fields) { - for (prop: Node <- entityDefinition.getPredicates(field).asScala) { - val quadIter: Iterator[Quad] = dgt.find(Node.ANY, Node.ANY, prop, Node.ANY).asScala - while (quadIter.hasNext) { - val quad: Quad = quadIter.next() - val entity: Entity = TextQueryFuncs.entityFromQuad(entityDefinition, quad) - if (entity != null) { - textIndex.addEntity(entity) - } - } - } - } - textIndex.commit() - this.dataset.commit() - true - } catch { - case ex: Throwable => - this.dataset.abort() - throw TriplestoreInternalException("Exception thrown during Lucene index update", ex, log) - false - } finally { - this.dataset.end() - } - } - - /** - * Creates the dataset with a Lucene index attached. The triplestore dataset is either disk-backed or in-memory, - * depending on the settings. The Lucene index is always in-memory. - * - * @return a [[Dataset]] - */ - private def getDataset: Dataset = { - - // Define which fields should be indexed by lucene - val knoraBase = "http://www.knora.org/ontology/knora-base#" - val rdfs = "http://www.w3.org/2000/01/rdf-schema#" - val entDef = new EntityDefinition("uri", "text", ResourceFactory.createProperty(knoraBase, "valueHasString")) - entDef.setPrimaryPredicate(ResourceFactory.createProperty(rdfs, "label")) - entDef.setPrimaryPredicate(ResourceFactory.createProperty(knoraBase, "valueHasComment")) - - // Add a UUID for each entry so that when a triple is removed then also the index entry can be removed - entDef.setUidField("uid") - - if (persist) { - - // Set UnionDefaultGraph globally - TDB.getContext.set(TDB.symUnionDefaultGraph, true) - - val ds = TDBFactory.createDataset(tdbStoragePath.toAbsolutePath.toString) - - // Lucene, on disk - //val indexDirectory: Directory = new SimpleFSDirectory(new File(luceneIndexPath.getAbsolutePath)) - val indexDirectory: Directory = new ByteBuffersDirectory() - - TextDatasetFactory.createLucene(ds, indexDirectory, entDef, null) - } else { - - // Set UnionDefaultGraph globally - TDB.getContext.set(TDB.symUnionDefaultGraph, true) - - val ds = TDBFactory.createDataset() - - // Lucene, in memory. - val indexDirectory: Directory = new ByteBuffersDirectory() - - TextDatasetFactory.createLucene(ds, indexDirectory, entDef, null) - } - } -} diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala index 5cec34bc38..77fc37d29c 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala @@ -47,7 +47,6 @@ import org.knora.webapi.messages.util.FakeTriplestore import org.knora.webapi.messages.util.rdf._ import org.knora.webapi.settings.KnoraDispatchers import org.knora.webapi.settings.KnoraSettings -import org.knora.webapi.settings.TriplestoreTypes import org.knora.webapi.store.triplestore.RdfDataObjectFactory import org.knora.webapi.util.ActorUtil._ import org.knora.webapi.util.FileUtil @@ -86,8 +85,6 @@ class HttpTriplestoreConnector extends Actor with ActorLogging with Instrumentat implicit val executionContext: ExecutionContext = system.dispatchers.lookup(KnoraDispatchers.KnoraBlockingDispatcher) override val log: LoggingAdapter = akka.event.Logging(system, this.getClass.getName) - private val triplestoreType = settings.triplestoreType - private val targetHost: HttpHost = new HttpHost(settings.triplestoreHost, settings.triplestorePort, "http") private val credsProvider: BasicCredentialsProvider = new BasicCredentialsProvider @@ -141,51 +138,21 @@ class HttpTriplestoreConnector extends Actor with ActorLogging with Instrumentat .setDefaultRequestConfig(longRequestConfig) .build - private val queryPath: String = - if (triplestoreType == TriplestoreTypes.HttpFuseki) { - s"/${settings.triplestoreDatabaseName}/query" - } else { - throw UnsupportedTriplestoreException(s"Unsupported triplestore type: $triplestoreType") - } + private val queryPath: String = s"/${settings.triplestoreDatabaseName}/query" - private val sparqlUpdatePath: String = - if (triplestoreType == TriplestoreTypes.HttpFuseki) { - s"/${settings.triplestoreDatabaseName}/update" - } else { - throw UnsupportedTriplestoreException(s"Unsupported triplestore type: $triplestoreType") - } + private val sparqlUpdatePath: String = s"/${settings.triplestoreDatabaseName}/update" - private val checkRepositoryPath: String = - if (triplestoreType == TriplestoreTypes.HttpFuseki) { - "/$/server" - } else { - throw UnsupportedTriplestoreException(s"Unsupported triplestore type: $triplestoreType") - } + private val checkRepositoryPath: String = "/$/server" - private val graphPath: String = - if (triplestoreType == TriplestoreTypes.HttpFuseki) { - s"/${settings.triplestoreDatabaseName}/get" - } else { - throw UnsupportedTriplestoreException(s"Unsupported triplestore type: $triplestoreType") - } + private val graphPath: String = s"/${settings.triplestoreDatabaseName}/get" - private val repositoryDownloadPath = - if (triplestoreType == TriplestoreTypes.HttpFuseki) { - s"/${settings.triplestoreDatabaseName}" - } else { - throw UnsupportedTriplestoreException(s"Unsupported triplestore type: $triplestoreType") - } + private val repositoryDownloadPath = s"/${settings.triplestoreDatabaseName}" private val repositoryUploadPath = repositoryDownloadPath private val logDelimiter = "\n" + StringUtils.repeat('=', 80) + "\n" - private val dataInsertPath = - if (triplestoreType == TriplestoreTypes.HttpFuseki) { - s"/${settings.triplestoreDatabaseName}/data" - } else { - throw TriplestoreUnsupportedFeatureException(s"$triplestoreType is not supported!") - } + private val dataInsertPath = s"/${settings.triplestoreDatabaseName}/data" /** * Receives a message requesting a SPARQL select or update, and returns an appropriate response message or @@ -225,7 +192,7 @@ class HttpTriplestoreConnector extends Actor with ActorLogging with Instrumentat case DropAllTRepositoryContent() => try2Message(sender(), dropAllTriplestoreContent(), log) case InsertRepositoryContent(rdfDataObjects: Seq[RdfDataObject]) => try2Message(sender(), insertDataIntoTriplestore(rdfDataObjects), log) - case HelloTriplestore(msg: String) if msg == triplestoreType => sender() ! HelloTriplestore(triplestoreType) + case HelloTriplestore(msg: String) if msg == settings.triplestoreType => sender() ! HelloTriplestore(settings.triplestoreType) case CheckTriplestoreRequest() => try2Message(sender(), checkTriplestore(), log) case SearchIndexUpdateRequest(subjectIri: Option[String]) => try2Message(sender(), Success(SparqlUpdateResponse()), log) @@ -569,12 +536,7 @@ class HttpTriplestoreConnector extends Actor with ActorLogging with Instrumentat /** * Checks connection to the triplestore. */ - private def checkTriplestore(): Try[CheckTriplestoreResponse] = - if (triplestoreType == TriplestoreTypes.HttpFuseki) { - checkFusekiTriplestore() - } else { - throw UnsupportedTriplestoreException(s"Unsupported triplestore type: $triplestoreType") - } + private def checkTriplestore(): Try[CheckTriplestoreResponse] = checkFusekiTriplestore() /** * Checks the Fuseki triplestore if it is available and configured correctly. If the it is not @@ -706,13 +668,7 @@ class HttpTriplestoreConnector extends Actor with ActorLogging with Instrumentat */ private def makeNamedGraphDownloadUri(graphIri: IRI): URI = { val uriBuilder: URIBuilder = new URIBuilder(graphPath) - - if (triplestoreType == TriplestoreTypes.HttpFuseki) { - uriBuilder.setParameter("graph", s"$graphIri") - } else { - throw UnsupportedTriplestoreException(s"Unsupported triplestore type: $triplestoreType") - } - + uriBuilder.setParameter("graph", s"$graphIri") uriBuilder.build() } @@ -829,12 +785,6 @@ class HttpTriplestoreConnector extends Actor with ActorLogging with Instrumentat val uriBuilder: URIBuilder = new URIBuilder(repositoryDownloadPath) - if (triplestoreType == TriplestoreTypes.HttpFuseki) { - // do nothing - } else { - throw UnsupportedTriplestoreException(s"Unsupported triplestore type: $triplestoreType") - } - val httpGet = new HttpGet(uriBuilder.build()) httpGet.addHeader("Accept", mimeTypeApplicationNQuads) val queryTimeoutMillis = settings.triplestoreQueryTimeout.toMillis.toInt * 10 diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/canDeleteList.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/canDeleteList.scala.txt index cdb85211fd..c97a0e67aa 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/canDeleteList.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/canDeleteList.scala.txt @@ -8,11 +8,9 @@ @** * Checks if a list can be deleted (none of its nodes is used in data). * - * @param triplestore the name of the triplestore being used. * @param listIri the IRI of the list to be checked. *@ -@(triplestore: String, - listIri: IRI) +@(listIri: IRI) PREFIX knora-base: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/changeParentNode.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/changeParentNode.scala.txt index 822d3634f5..669a28beb5 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/changeParentNode.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/changeParentNode.scala.txt @@ -9,15 +9,12 @@ @** * Changes the parent node of an existing node. * - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param dataNamedGraph the named graph to update. * @param nodeIri the IRI of the list we want to update. * @param currentParentIri the IRI of the current parent node. * @param newParentIri the IRI of the new parent node. *@ -@(triplestore: String, - dataNamedGraph: IRI, +@(dataNamedGraph: IRI, nodeIri: IRI, currentParentIri: IRI, newParentIri: IRI diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewAdministrativePermission.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewAdministrativePermission.scala.txt index 7322f9fa36..17476d62ea 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewAdministrativePermission.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewAdministrativePermission.scala.txt @@ -8,8 +8,6 @@ @* * Creates a new administrative permission. * @param namedGraphIri the name of the graph into which the new permission will be created. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param permissionIri the Iri of the new administrative permission. * @param permissionClassIri the IRI of the OWL class that the new administrative permission should belong to. * @param projectIri the project. @@ -18,7 +16,6 @@ * *@ @(namedGraphIri: IRI, - triplestore: String, permissionIri: IRI, permissionClassIri: IRI, projectIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewDefaultObjectAccessPermission.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewDefaultObjectAccessPermission.scala.txt index 6fbca33d34..28d650bcd6 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewDefaultObjectAccessPermission.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewDefaultObjectAccessPermission.scala.txt @@ -8,8 +8,6 @@ @* * Creates a new default object access permission. * @param namedGraphIri the name of the graph into which the new permission will be created. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param permissionIri the Iri of the new administrative permission. * @param permissionClassIri the IRI of the OWL class that the new administrative permission should belong to. * @param projectIri the project. @@ -20,7 +18,6 @@ * *@ @(namedGraphIri: IRI, - triplestore: String, permissionIri: IRI, permissionClassIri: IRI, projectIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewGroup.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewGroup.scala.txt index bb958f49a7..d57696ce5a 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewGroup.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewGroup.scala.txt @@ -10,8 +10,6 @@ * Creates a new group. * * @param adminNamedGraphIri the IRI of the admin graph. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param groupIri the Iri of the new group * @param groupClassIri the IRI of the OWL class that the new group should belong to. * @param name the new group's name. @@ -21,7 +19,6 @@ * @param hasSelfJoinEnabled the new group's self-join status. *@ @(adminNamedGraphIri: IRI, - triplestore: String, groupIri: IRI, groupClassIri: IRI, name: String, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewListNode.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewListNode.scala.txt index e1a01cc0c8..3e26354e23 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewListNode.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewListNode.scala.txt @@ -10,8 +10,6 @@ * Creates a new root list node. * * @param dataNamedGraph the name of the graph into which the new list node will be created. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param listClassIri the IRI of the OWL class that the list should belong to. * @param projectIri the IRI of the list's project. * @param nodeIri the IRI of the new list node. @@ -24,7 +22,6 @@ * *@ @(dataNamedGraph: IRI, - triplestore: String, listClassIri: IRI, projectIri : IRI, nodeIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewProject.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewProject.scala.txt index cac732bf07..f82a3f7539 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewProject.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewProject.scala.txt @@ -10,8 +10,6 @@ * Creates a new project. * * @param adminNamedGraphIri the name of the graph into which the new project will be created. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param projectIri the IRI of the new project * @param projectClassIri the IRI of the OWL class that the new project should belong to. * @param shortname the new project's shortname (required / unique). @@ -25,7 +23,6 @@ * *@ @(adminNamedGraphIri: IRI, - triplestore: String, projectIri: IRI, projectClassIri: IRI, shortname: String, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewUser.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewUser.scala.txt index 0501cefca4..6ffe739c69 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewUser.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewUser.scala.txt @@ -8,8 +8,6 @@ @* * Creates a new user. * - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param userIri the Iri of the new user * @param userClassIri the IRI of the OWL class that the new user should belong to. * @param username the new user's username. @@ -23,7 +21,6 @@ * *@ @(adminNamedGraphIri: IRI, - triplestore: String, userIri: IRI, userClassIri: IRI, username: String, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deleteNode.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deleteNode.scala.txt index ad69549805..a5be517b77 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deleteNode.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deleteNode.scala.txt @@ -10,13 +10,10 @@ * Delete a node (root or child). If a child node is deleted, remove it from the list of its parent's sublist nodes. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param nodeIri the IRI of the list we want to update. * @param isRootNode flag to identify node type. *@ @(dataNamedGraph: IRI, - triplestore: String, nodeIri: IRI, isRootNode: Boolean ) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deletePermission.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deletePermission.scala.txt index 097c231e25..31a5607289 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deletePermission.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deletePermission.scala.txt @@ -10,13 +10,10 @@ * Delete an existing permission. * * @param namedGraphIri the named graph to update. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude - inferred results from the WHERE clause of the update. * @param permissionIri the IRI of the permission we want to delete. *@ @(namedGraphIri: IRI, - triplestore: String, permissionIri: IRI ) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getFileValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getFileValue.scala.txt index 8fa3f12aa7..17d5eff8d3 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getFileValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getFileValue.scala.txt @@ -9,11 +9,9 @@ * Given a knora:base:internalFilename, retrieves the file value and information * attached to it using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param fileValueIri the IRI of the file value. *@ -@(triplestore: String, - filename: String) +@(filename: String) PREFIX xsd: PREFIX rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getGroups.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getGroups.scala.txt index 069099adf2..49f5faeb04 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getGroups.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getGroups.scala.txt @@ -8,11 +8,9 @@ @** * Gets information about a single or all groups. * - * @param triplestore the name of the triplestore being used. * @param maybeIri the IRI of the group. *@ -@(triplestore: String, - maybeIri: Option[IRI]) +@(maybeIri: Option[IRI]) PREFIX xsd: PREFIX rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getListNode.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getListNode.scala.txt index 41b90dfd2a..8a77f26e20 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getListNode.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getListNode.scala.txt @@ -8,11 +8,9 @@ @** * Given the node IRI of a list node, returns all information about that node. * - * @param triplestore the name of the triplestore being used. * @param nodeIri the IRI of node. *@ -@(triplestore: String, - nodeIri: IRI) +@(nodeIri: IRI) PREFIX xsd: PREFIX rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getListNodeWithChildren.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getListNodeWithChildren.scala.txt index 72a4ffe88a..27adcd491d 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getListNodeWithChildren.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getListNodeWithChildren.scala.txt @@ -8,13 +8,11 @@ @** * Given the start node, returns that node and all its children. * - * @param triplestore the name of the triplestore being used. * @param rootNodeIri the IRI of the root node of the list. * @param preferredLanguage the language code of the user's preferred language. * @param fallbackLanguage the language code of the application's default language. *@ -@(triplestore: String, - startNodeIri: IRI) +@(startNodeIri: IRI) PREFIX xsd: PREFIX rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getLists.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getLists.scala.txt index 1fe01bcb7e..36e00ff592 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getLists.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getLists.scala.txt @@ -9,11 +9,9 @@ * Gets basic information about all lists. If the IRI of a project is supplied, * then only lists belonging to this project are returned. * - * @param triplestore the name of the triplestore being used. * @param maybeProjectIri the IRI of the project the list belongs to. *@ -@(triplestore: String, - maybeProjectIri: Option[IRI]) +@(maybeProjectIri: Option[IRI]) PREFIX xsd: PREFIX rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getNodePath.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getNodePath.scala.txt index 42f8c1a07e..a21142b00b 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getNodePath.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getNodePath.scala.txt @@ -9,13 +9,11 @@ * Given a node in a hierarchical list, returns the nodes in the path from the root node to the specified node, * not including the root node. * - * @param triplestore the name of the triplestore being used. * @param queryNodeIri the node whose path is to be queried. * @param preferredLanguage the language code of the user's preferred language. * @param fallbackLanguage the language code of the application's default language. *@ -@(triplestore: String, - queryNodeIri: IRI, +@(queryNodeIri: IRI, preferredLanguage: String, fallbackLanguage: String) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getParentNode.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getParentNode.scala.txt index 27dd4c1031..f1e33f37ad 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getParentNode.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getParentNode.scala.txt @@ -8,11 +8,9 @@ @** * Given the node IRI of a list node, returns all information about that node. * - * @param triplestore the name of the triplestore being used. * @param nodeIri the IRI of node. *@ -@(triplestore: String, - nodeIri: IRI) +@(nodeIri: IRI) PREFIX xsd: PREFIX rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getPermissionByIRI.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getPermissionByIRI.scala.txt index 671b7e1da4..a324394bba 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getPermissionByIRI.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getPermissionByIRI.scala.txt @@ -8,11 +8,9 @@ @** * Given the IRI of a permission, returns all information about it. * - * @param triplestore the name of the triplestore being used. * @param permissionIri the IRI of permission. *@ -@(triplestore: String, - permissionIri: IRI) +@(permissionIri: IRI) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectAdminData.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectAdminData.scala.txt index 0033511db5..0f7df3b721 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectAdminData.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectAdminData.scala.txt @@ -8,11 +8,9 @@ @** * Given a project IRI, returns all the admin data for that project. * - * @param triplestore the name of the triplestore being used. * @param projectIri the project IRI. *@ -@(triplestore: String, - projectIri: IRI) +@(projectIri: IRI) prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectAdminMembers.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectAdminMembers.scala.txt index 41b96f14ac..ba301fa936 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectAdminMembers.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectAdminMembers.scala.txt @@ -9,13 +9,11 @@ @** * Gets all admin members of a project, given the project's IRI, shortname, and/or shortcode. * - * @param triplestore the name of the triplestore being used. * @param maybeIri the project's IRI. * @param maybeShortname the project's shortname. * @param maybeShortcode the project's shortcode. *@ -@(triplestore: String, - maybeIri: Option[IRI], +@(maybeIri: Option[IRI], maybeShortname: Option[String], maybeShortcode: Option[String]) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectMembers.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectMembers.scala.txt index 2620fd34db..424d65b61c 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectMembers.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectMembers.scala.txt @@ -9,13 +9,11 @@ @** * Gets all members of a project, given the project's IRI, shortname, and/or shortcode. * - * @param triplestore the name of the triplestore being used. * @param maybeIri the project's IRI. * @param maybeShortname the project's shortname. * @param maybeShortcode the project's shortcode. *@ -@(triplestore: String, - maybeIri: Option[IRI], +@(maybeIri: Option[IRI], maybeShortname: Option[String], maybeShortcode: Option[String]) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectOfEntity.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectOfEntity.scala.txt index 934ed2b2ea..55f1d0c20f 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectOfEntity.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectOfEntity.scala.txt @@ -9,11 +9,9 @@ @** * Gets the project an entity (resource or value) is attached to. * - * @param triplestore the name of the triplestore being used. * @param entityIri the IRI of the resource/value to be queried. *@ -@(triplestore: String, - entityIri: IRI) +@(entityIri: IRI) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectPermissions.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectPermissions.scala.txt index 63b91d60e4..03d1fc1165 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectPermissions.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectPermissions.scala.txt @@ -8,11 +8,9 @@ @** * Given a project IRI, returns the permissions for that project. * - * @param triplestore the name of the triplestore being used. * @param projectIri the project IRI. *@ -@(triplestore: String, - projectIri: IRI) +@(projectIri: IRI) prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjects.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjects.scala.txt index 2a02a8235d..34e934ef15 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjects.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjects.scala.txt @@ -8,13 +8,11 @@ @** * Gets all information about a single project or all projects. Selection either through the project's IRI, shortname, or shortcode. * - * @param triplestore the name of the triplestore being used. * @param maybeIri the project's IRI. * @param maybeShortname the project's shortname. * @param maybeShortcode the project's shortcode. *@ -@(triplestore: String, - maybeIri: Option[IRI], +@(maybeIri: Option[IRI], maybeShortname: Option[String], maybeShortcode: Option[String]) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getUsers.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getUsers.scala.txt index 3bc13420d6..f9f4073622 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getUsers.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getUsers.scala.txt @@ -10,12 +10,10 @@ @** * Gets all information about a single or all user. * - * @param triplestore the name of the triplestore being used. * @param maybeIri the users's IRI. * @param maybeEmail the users's email. *@ -@(triplestore: String, - maybeIri: Option[IRI], +@(maybeIri: Option[IRI], maybeUsername: Option[String], maybeEmail: Option[String]) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/isEntityUsed.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/isEntityUsed.scala.txt index ded61726a0..8928fe956a 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/isEntityUsed.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/isEntityUsed.scala.txt @@ -8,11 +8,9 @@ @* * Checks whether a node is used (i.e. is the object of any statements). * - * @param triplestore the name of the triplestore being used. * @param entityIri the IRI of the entity. *@ -@(triplestore: String, - entityIri: IRI) +@(entityIri: IRI) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/isNodeUsed.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/isNodeUsed.scala.txt index 2295919c13..38ae7ad8d4 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/isNodeUsed.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/isNodeUsed.scala.txt @@ -8,11 +8,9 @@ @* * Checks whether a node is used (i.e. is the object of any statements). * - * @param triplestore the name of the triplestore being used. * @param nodeIri the IRI of the node. *@ -@(triplestore: String, - nodeIri: IRI) +@(nodeIri: IRI) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateGroup.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateGroup.scala.txt index e55aea4f03..143cbc2b04 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateGroup.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateGroup.scala.txt @@ -10,8 +10,6 @@ * Updates an existing group with the provided values. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param groupIri the IRI of the group we want to update. * @param maybeName the new optional value for name. * @param maybeDescriptions the new optional value for descriptions. @@ -20,7 +18,6 @@ * @param maybeSelfjoin the new optional value for selfjoin. *@ @(adminNamedGraphIri: IRI, - triplestore: String, groupIri: IRI, maybeName: Option[String], maybeDescriptions: Option[Seq[StringLiteralV2]], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateListInfo.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateListInfo.scala.txt index 221bde4e8b..547333e9f5 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateListInfo.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateListInfo.scala.txt @@ -10,8 +10,6 @@ * Updates an existing list with the provided values. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param nodeIri the IRI of the list we want to update. * @param projectIri the IRI of the list's project. * @param listClassIri the IRI of the OWL class that the list should belong to. @@ -22,7 +20,6 @@ * @param maybeComments the new optional comment values. *@ @(dataNamedGraph: IRI, - triplestore: String, nodeIri: IRI, projectIri: IRI, listClassIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateNodePosition.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateNodePosition.scala.txt index d0d266273e..82e5e673d4 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateNodePosition.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateNodePosition.scala.txt @@ -10,14 +10,11 @@ * Updates an existing node's position. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param nodeIri the IRI of the list we want to update. * @param newPosition the new position of the node. *@ @(dataNamedGraph: IRI, - triplestore: String, nodeIri: IRI, newPosition: Int) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updatePermission.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updatePermission.scala.txt index 9b0044b942..25d956fede 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updatePermission.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updatePermission.scala.txt @@ -10,8 +10,6 @@ * Updates an existing permission's properties. * * @param namedGraphIri the named graph to update. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude - inferred results from the WHERE clause of the update. * @param permissionIri the IRI of the permission we want to update. * @param maybeGroup the IRI of the new group. * @param maybeHasPermissions the new set of permission values as string. @@ -20,7 +18,6 @@ *@ @(namedGraphIri: IRI, - triplestore: String, permissionIri: IRI, maybeGroup: Option[IRI], maybeHasPermissions: Option[String], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateProject.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateProject.scala.txt index 4daaaf8e79..7bc16ad15d 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateProject.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateProject.scala.txt @@ -10,8 +10,6 @@ * Updates an existing project with the provided values. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param projectIri the IRI of the project we want to update. * @param maybeShortname the new optional value for shortname. * @param maybeLongname the new optional value for longname. @@ -22,7 +20,6 @@ * @param maybeSelfjoin the new optional value for selfjoin. *@ @(adminNamedGraphIri: IRI, - triplestore: String, projectIri: IRI, maybeShortname: Option[String], maybeLongname: Option[String], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateUser.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateUser.scala.txt index 1ff6fa1a96..e51b519e6e 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateUser.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateUser.scala.txt @@ -10,8 +10,6 @@ * Updates an existing user with the provided values. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param userIri the IRI of the user we want to update. * @param maybeUsername the new optional value for username. * @param maybeEmail the new optional value for email. @@ -25,7 +23,6 @@ * @param maybeSystemAdmin the new optional value for system admin. *@ @(adminNamedGraphIri: IRI, - triplestore: String, userIri: IRI, maybeUsername: Option[String], maybeEmail: Option[String], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateUserPassword.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateUserPassword.scala.txt index e99acd56d9..1853cc10be 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateUserPassword.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateUserPassword.scala.txt @@ -10,13 +10,10 @@ * Updates an existing user with the provided values. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. The template uses this value to exclude inferred - results from the WHERE clause of the update. * @param userIri the IRI of the user we want to update. * @param newPassword the new optional value for value for password. *@ @(adminNamedGraphIri: IRI, - triplestore: String, userIri: IRI, newPassword: String) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/addValueVersion.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/addValueVersion.scala.txt index e06226726e..83defc177a 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/addValueVersion.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/addValueVersion.scala.txt @@ -14,7 +14,6 @@ * Inserts a new version of an existing value of a resource property. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. * @param resourceIri the resource to update. * @param propertyIri the IRI of the property that points from the resource to the value. * @param currentValueIri the most recent existing version of the value. @@ -35,7 +34,6 @@ * find out whether the operation succeeded, the application must query the property's version history. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, propertyIri: IRI, currentValueIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeComment.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeComment.scala.txt index 8e64d50162..ad3be5edbb 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeComment.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeComment.scala.txt @@ -9,7 +9,6 @@ * Creates a new version of a value, with identical content except for a new comment. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource containing the value. * @param propertyIri the IRI of the property that points from the resource to the value. * @param currentValueIri the IRI of the current version of the value. @@ -18,7 +17,6 @@ * @param currentTime a timestamp that will be attached to the value. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, propertyIri: IRI, currentValueIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeLink.scala.txt index d53d4dce71..79ba368215 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeLink.scala.txt @@ -14,7 +14,6 @@ * Deletes an existing link between two resources and replaces it with a link to a different target resource. * * @param dataNamedGraph the named graph in which the project stores its data. - * @param triplestore the name of the triplestore being used. * @param linkSourceIri the resource that is the source of the links. * @param linkUpdateForCurrentLink a [[SparqlTemplateLinkUpdate]] specifying how to update the current link. * @param linkUpdateForNewLink a [[SparqlTemplateLinkUpdate]] specifying how to update the new link. @@ -26,7 +25,6 @@ * To find out whether the update succeeded, the application must query the changed links. *@ @(dataNamedGraph: IRI, - triplestore: String, linkSourceIri: IRI, linkUpdateForCurrentLink: SparqlTemplateLinkUpdate, linkUpdateForNewLink: SparqlTemplateLinkUpdate, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeResourceLabel.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeResourceLabel.scala.txt index 54ac03054f..48ca4cba26 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeResourceLabel.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeResourceLabel.scala.txt @@ -9,13 +9,11 @@ * Modifies a resource's rdfs:label. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource containing the value. * @param label the resource's new label. * @param currentTime an xsd:dateTimeStamp that will be attached to the resources. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, label: String, currentTime: String) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkResourceDeletion.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkResourceDeletion.scala.txt index a8f8264eae..70b3812db8 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkResourceDeletion.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkResourceDeletion.scala.txt @@ -8,11 +8,9 @@ @** * Checks whether a knora-base:Resource exists and is deleted. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource. *@ -@(triplestore: String, - resourceIri: IRI) +@(resourceIri: IRI) prefix rdf: prefix rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkResourceLabelChange.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkResourceLabelChange.scala.txt index f2a1d68a3f..e5e432829b 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkResourceLabelChange.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkResourceLabelChange.scala.txt @@ -8,12 +8,10 @@ @** * Checks whether the rdfs:label of a resource has been updated correctly. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource. * @param the resource's new label that is expected to exist in the triplestore. *@ -@(triplestore: String, - resourceIri: IRI, +@(resourceIri: IRI, label: String) prefix rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkValueDeletion.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkValueDeletion.scala.txt index 35f441f796..3384f00345 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkValueDeletion.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkValueDeletion.scala.txt @@ -8,11 +8,9 @@ @** * Checks whether a knora-base:Value exists and is deleted. * - * @param triplestore the name of the triplestore being used. * @param valueIri the IRI of the value. *@ -@(triplestore: String, - valueIri: IRI) +@(valueIri: IRI) prefix rdf: prefix rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/ckanDokubib.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/ckanDokubib.scala.txt index a28d1381b2..c8c1974204 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/ckanDokubib.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/ckanDokubib.scala.txt @@ -8,12 +8,10 @@ @** * Gets all images that are part of the Dokubib project. * - * @param triplestore the name of the triplestore being used. * @param projectIri the IRI of the Dokubib project. * @param limitOption the maximum number of rows to return. *@ -@(triplestore: String, - projectIri: IRI, +@(projectIri: IRI, limitOption: Option[Int]) prefix rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/ckanIncunabula.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/ckanIncunabula.scala.txt index d505a6c306..bb3df64faa 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/ckanIncunabula.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/ckanIncunabula.scala.txt @@ -8,12 +8,10 @@ @** * Gets all Incunabula books with their pages. * - * @param triplestore the name of the triplestore being used. * @param projectIri the IRI of the Incunabula project. * @param limitOption the maximum number of rows to return. *@ -@(triplestore: String, - projectIri: IRI, +@(projectIri: IRI, limitOption: Option[Int]) prefix rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createLink.scala.txt index e683624f48..7bbcca2706 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createLink.scala.txt @@ -14,7 +14,6 @@ * Inserts a new link between resources. * * @param dataNamedGraph the named graph in which the project stores its data. - * @param triplestore the name of the triplestore being used. * @param resourceIri the resource that is the source of the link. * @param linkUpdate a [[LinkUpdate]] object describing the link to insert. * @param creationDate an xsd:dateTimeStamp to be attached to the link value. @@ -24,7 +23,6 @@ * To find out whether the update succeeded, the application must query the link. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, linkUpdate: SparqlTemplateLinkUpdate, creationDate: Instant, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createNewResources.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createNewResources.scala.txt index 19c500321b..35afe0ca3a 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createNewResources.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createNewResources.scala.txt @@ -13,13 +13,11 @@ * Creates new resources. * * @param dataNamedGraph the named graph in which the project stores its data. - * @param triplestore the name of the triplestore being used. * @param resourcesToCreate a collection of resources to be created. * @param projectIri the IRI of the project in which the resources are to be created. * @param creatorIri the IRI of the creator of the resources. *@ @(dataNamedGraph: IRI, - triplestore: String, resourcesToCreate: Seq[SparqlTemplateResourceToCreate], projectIri: IRI, creatorIri: IRI) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createValue.scala.txt index 1be7c370c5..7f073dd61d 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createValue.scala.txt @@ -14,7 +14,6 @@ * when creating a single value in an existing resource. * * @param dataNamedGraph the named graph in which the project stores its data. - * @param triplestore the name of the triplestore being used. * @param resourceIri the resource to update. * @param propertyIri the resource property to update. * @param newValueIri the new value IRI. @@ -29,7 +28,6 @@ * @param stringFormatter a [[StringFormatter]]. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, propertyIri: IRI, newValueIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteLink.scala.txt index 29524b712d..6c53ed1eb7 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteLink.scala.txt @@ -12,7 +12,6 @@ * Deletes an existing link between two resources. * * @param dataNamedGraph the named graph in which the project stores its data. - * @param triplestore the name of the triplestore being used. * @param linkSourceIri the resource that is the source of the link. * @param linkUpdate a [[SparqlTemplateLinkUpdate]] specifying how to update the link. * @param maybeComment an optional comment explaining why the link is being deleted. @@ -22,7 +21,6 @@ * To find out whether the update succeeded, the application must query the deleted link. *@ @(dataNamedGraph: IRI, - triplestore: String, linkSourceIri: IRI, linkUpdate: SparqlTemplateLinkUpdate, maybeComment: Option[String], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteResource.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteResource.scala.txt index d4caf91947..ef3e51b988 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteResource.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteResource.scala.txt @@ -9,14 +9,12 @@ * Marks a resource as deleted. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource to be marked as deleted. * @param maybeDeleteComment an optional comment explaining why the value is being deleted. * @param currentTime an xsd:dateTimeStamp that will be attached to the resources. * @param requestingUser the IRI of the user making the request. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, maybeDeleteComment: Option[String], currentTime: String, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteValue.scala.txt index dcdc9eb8b9..ba491286f8 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteValue.scala.txt @@ -13,7 +13,6 @@ * Marks a value as deleted. This template is used for all value types except links. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource containing the value. * @param propertyIri the IRI of the property that points from the resource to the value. * @param valueIri the IRI of the value to be marked as deleted. @@ -25,7 +24,6 @@ * @param stringFormatter a [[StringFormatter]]. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, propertyIri: IRI, valueIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findLinkValueByIri.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findLinkValueByIri.scala.txt index 983944b0e1..5df8f246e7 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findLinkValueByIri.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findLinkValueByIri.scala.txt @@ -9,14 +9,12 @@ * Looks for a `knora-base:LinkValue` given its IRI, returns all information about it, and checks whether the * corresponding direct link also exists. * - * @param triplestore the name of the triplestore being used. * @param subjectIri the IRI of the resource that is the source of the link. * @param predicateIri the IRI of the property that links the two resources. * @param maybeObjectIRI if provided, the IRI of the target resource. * @param linkValueIri the IRI of the `LinkValue`. *@ -@(triplestore: String, - subjectIri: IRI, +@(subjectIri: IRI, predicateIri: IRI, maybeObjectIri: Option[IRI], linkValueIri: IRI) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findLinkValueByObject.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findLinkValueByObject.scala.txt index 6121d114ce..f39fc85225 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findLinkValueByObject.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findLinkValueByObject.scala.txt @@ -9,7 +9,6 @@ * Looks for a `knora-base:LinkValue` describing a direct link between two resources, returns all information * about it, and checks whether the direct link also exists. * - * @param triplestore the name of the triplestore being used. * @param subjectIri the IRI of the resource that is the source of the link. * @param predicateIri the IRI of the property that links the two resources. * @param maybeObjectIri if provided, the IRI of the resource that is the target of the link. @@ -17,8 +16,7 @@ * @param includeDeleted if true, a `LinkValue` will be returned even if it is deleted. Currently this is * only for testing purposes. *@ -@(triplestore: String, - subjectIri: IRI, +@(subjectIri: IRI, predicateIri: IRI, objectIri: IRI, includeDeleted: Boolean = false) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findResourceWithValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findResourceWithValue.scala.txt index bbb3f9ba7c..d224c82357 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findResourceWithValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findResourceWithValue.scala.txt @@ -8,11 +8,9 @@ @** * Searches for a resource that has a given value. * - * @param triplestore the name of the triplestore being used. * @param searchValueIri the IRI of the value to look for. *@ -@(triplestore: String, - searchValueIri: IRI) +@(searchValueIri: IRI) prefix rdf: prefix rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findValueInVersions.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findValueInVersions.scala.txt index e2b0321bc3..0f128782d4 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findValueInVersions.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findValueInVersions.scala.txt @@ -9,13 +9,11 @@ * Searches for a value in the version history of the values of a resource property. If the value is found, returns * all assertions about it. If the value is not found, returns no rows. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the resource to search. * @param propertyIri the property to search. * @param searchValueIri the IRI of the value to look for. *@ -@(triplestore: String, - resourceIri: IRI, +@(resourceIri: IRI, propertyIri: IRI, searchValueIri: IRI) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionByIri.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionByIri.scala.txt index 2407efc809..1583776705 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionByIri.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionByIri.scala.txt @@ -8,11 +8,9 @@ @** * Gets the administrative permission object identified by IRI. * - * @param triplestore the name of the triplestore being used. * @param administrativePermissionIri the permission's IRI. *@ -@(triplestore: String, - administrativePermissionIri: IRI) +@(administrativePermissionIri: IRI) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionForProjectAndGroup.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionForProjectAndGroup.scala.txt index 11949de1cd..6429b1294a 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionForProjectAndGroup.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionForProjectAndGroup.scala.txt @@ -8,11 +8,9 @@ @** * Gets the administrative permission object identified by IRI. * - * @param triplestore the name of the triplestore being used. * @param administrativePermissionIri the permission's IRI. *@ -@(triplestore: String, - projectIri: IRI, +@(projectIri: IRI, groupIri: IRI) prefix rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionsForProject.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionsForProject.scala.txt index b39ec03e88..b7e134079a 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionsForProject.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionsForProject.scala.txt @@ -8,11 +8,9 @@ @** * Gets the IRIs of administrative permissions defined inside a project. * - * @param triplestore the name of the triplestore being used. * @param projectIri the project's IRI. *@ -@(triplestore: String, - projectIri: IRI) +@(projectIri: IRI) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getContext.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getContext.scala.txt index f0b2587945..dc69733330 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getContext.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getContext.scala.txt @@ -9,11 +9,9 @@ * Given the IRI of a resource, gets information about the resources that are part of that resource * using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource. *@ -@(triplestore: String, - resourceIri: IRI) +@(resourceIri: IRI) prefix rdf: prefix rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getCreatedResource.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getCreatedResource.scala.txt index 9979149493..7d1c6c33fe 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getCreatedResource.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getCreatedResource.scala.txt @@ -8,11 +8,9 @@ @** * Query a newly created resource. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the Iri of the resource. *@ -@(triplestore: String, - resourceIri: IRI) +@(resourceIri: IRI) SELECT ?p ?o diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermission.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermission.scala.txt index 16768a4b0d..209d7ecfec 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermission.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermission.scala.txt @@ -8,14 +8,12 @@ @** * Gets the administrative permission object identified by project and either group / resource class / property. * - * @param triplestore the name of the triplestore being used. * @param projectIri the project's IRI. * @param maybeGroupIri the group's IRI. * @param maybeResourceClassIri the resource's class IRI. * @param maybePropertyIri the property's IRI. *@ -@(triplestore: String, - projectIri: IRI, +@(projectIri: IRI, maybeGroupIri: Option[IRI], maybeResourceClassIri: Option[IRI], maybePropertyIri: Option[IRI]) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermissionByIri.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermissionByIri.scala.txt index 09ab5b6485..f0d29e2eda 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermissionByIri.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermissionByIri.scala.txt @@ -8,11 +8,9 @@ @** * Gets the default object access permission identified by IRI. * - * @param triplestore the name of the triplestore being used. * @param defaultObjectAccessPermissionIri the permission's IRI. *@ -@(triplestore: String, - defaultObjectAccessPermissionIri: IRI) +@(defaultObjectAccessPermissionIri: IRI) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermissionsForProject.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermissionsForProject.scala.txt index 157c7cf6e5..38112732cc 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermissionsForProject.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermissionsForProject.scala.txt @@ -8,11 +8,9 @@ @** * Gets the IRIs of administrative permissions defined inside a project. * - * @param triplestore the name of the triplestore being used. * @param projectIri the project's IRI. *@ -@(triplestore: String, - projectIri: IRI) +@(projectIri: IRI) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getFileValuesForResource.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getFileValuesForResource.scala.txt index 0b9f09c261..b988d4497c 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getFileValuesForResource.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getFileValuesForResource.scala.txt @@ -8,11 +8,9 @@ @** * Gets the file value Iris of a resource and their quality level. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource. *@ -@(triplestore: String, - resourceIri: IRI) +@(resourceIri: IRI) PREFIX knora-base: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGraphData.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGraphData.scala.txt index 5c9b98af3c..8bbcda5c13 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGraphData.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGraphData.scala.txt @@ -9,13 +9,11 @@ * Gets the outbound or inbound links from/to a resource, using SPARQL w/o inference. This query is used * recursively to get a graph of resources reachable from a given resource. * - * @param triplestore the name of the triplestore being used. * @param startNodeIri the IRI of the resource to use as the starting point of the query. * @param startNodeOnly if true, returns information only about the start node. * @param outbound true to get outbound links, false to get inbound links. *@ -@(triplestore: String, - startNodeIri: IRI, +@(startNodeIri: IRI, startNodeOnly: Boolean, outbound: Boolean = true) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupByIri.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupByIri.scala.txt index 9632fe09db..a5b409ea9f 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupByIri.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupByIri.scala.txt @@ -8,11 +8,9 @@ @** * Gets all information about a single project, given the project's IRI. * - * @param triplestore the name of the triplestore being used. * @param groupIri the project's IRI. *@ -@(triplestore: String, - groupIri: IRI) +@(groupIri: IRI) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupByName.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupByName.scala.txt index 5b375b7182..51207a720d 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupByName.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupByName.scala.txt @@ -8,12 +8,10 @@ @** * Gets all information about a single group, given the group's name and project association. * - * @param triplestore the name of the triplestore being used. * @param name the group's ``. * @param projectIri the group's `` project association. *@ -@(triplestore: String, - name: String, +@(name: String, projectIri: IRI) prefix xsd: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupMembersByIri.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupMembersByIri.scala.txt index 1eee42731d..647f33e357 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupMembersByIri.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupMembersByIri.scala.txt @@ -8,11 +8,9 @@ @** * Gets all members of a group, given the group's IRI. * - * @param triplestore the name of the triplestore being used. * @param groupIri the group's IRI. *@ -@(triplestore: String, - groupIri: IRI) +@(groupIri: IRI) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupMembersByName.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupMembersByName.scala.txt index 918b877887..f26912892a 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupMembersByName.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupMembersByName.scala.txt @@ -8,11 +8,9 @@ @** * Gets all members of a group, given the group's knora-admin:groupName. * - * @param triplestore the name of the triplestore being used. * @param name the group's `knora-admin:groupName`. *@ -@(triplestore: String, - projectIri: IRI, +@(projectIri: IRI, name: String) prefix rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroups.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroups.scala.txt index 6166ec831a..700d94c35b 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroups.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroups.scala.txt @@ -7,10 +7,7 @@ @** * Gets information about all projects. - * - * @param triplestore the name of the triplestore being used. *@ -@(triplestore: String) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getIncomingReferences.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getIncomingReferences.scala.txt index 764d4900d3..030c2169c8 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getIncomingReferences.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getIncomingReferences.scala.txt @@ -9,11 +9,9 @@ * Gets information about the incoming references to a resource, as well as about the referring resourceClass * using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource. *@ -@(triplestore: String, - resourceIri: IRI) +@(resourceIri: IRI) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getLastModificationDate.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getLastModificationDate.scala.txt index f5cbd763af..1bd1c62f57 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getLastModificationDate.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getLastModificationDate.scala.txt @@ -8,11 +8,9 @@ @** * Gets the knora-base:lastModificationDate of a resource. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the resource to be queried. *@ -@(triplestore: String, - resourceIri: IRI) +@(resourceIri: IRI) prefix knora-base: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getLinkSourceAndTargetPermissions.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getLinkSourceAndTargetPermissions.scala.txt index edd5ce52ad..451673f4c5 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getLinkSourceAndTargetPermissions.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getLinkSourceAndTargetPermissions.scala.txt @@ -8,11 +8,9 @@ @** * Returns the permission-relevant assertions on the subject and object of a link value. * - * @param triplestore the name of the triplestore being used. * @param linkValueIri the IRI of the link value. *@ -@(triplestore: String, - linkValueIri: IRI) +@(linkValueIri: IRI) prefix rdf: prefix rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getList.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getList.scala.txt index 40f161796e..34812705b8 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getList.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getList.scala.txt @@ -8,13 +8,11 @@ @** * Given the root node of a hierarchical list, returns that node and all its children. * - * @param triplestore the name of the triplestore being used. * @param rootNodeIri the IRI of the root node of the list. * @param preferredLanguage the language code of the user's preferred language. * @param fallbackLanguage the language code of the application's default language. *@ -@(triplestore: String, - rootNodeIri: IRI, +@(rootNodeIri: IRI, preferredLanguage: String, fallbackLanguage: String) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getNodePath.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getNodePath.scala.txt index 60e3d20085..e1c9a1df37 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getNodePath.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getNodePath.scala.txt @@ -9,13 +9,11 @@ * Given a node in a hierarchical list, returns the nodes in the path from the root node to the specified node, * not including the root node. * - * @param triplestore the name of the triplestore being used. * @param queryNodeIri the node whose path is to be queried. * @param preferredLanguage the language code of the user's preferred language. * @param fallbackLanguage the language code of the application's default language. *@ -@(triplestore: String, - queryNodeIri: IRI, +@(queryNodeIri: IRI, preferredLanguage: String, fallbackLanguage: String) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getObjectAccessPermission.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getObjectAccessPermission.scala.txt index 8b94f15a80..8b94c25529 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getObjectAccessPermission.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getObjectAccessPermission.scala.txt @@ -8,12 +8,10 @@ @** * Gets the object access permissions attached to a resource or value. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the resource's IRI. * @param valueIri the value's IRI. *@ -@(triplestore: String, - resourceIri: Option[IRI], +@(resourceIri: Option[IRI], valueIri: Option[IRI] ) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectAdminMembersByIri.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectAdminMembersByIri.scala.txt index f47f77822a..5142fba36d 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectAdminMembersByIri.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectAdminMembersByIri.scala.txt @@ -8,11 +8,9 @@ @** * Gets all admin members of a project, given the project's IRI. * - * @param triplestore the name of the triplestore being used. * @param projectIri the project's IRI. *@ -@(triplestore: String, - projectIri: IRI) +@(projectIri: IRI) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectAdminMembersByShortname.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectAdminMembersByShortname.scala.txt index 78740dbfa3..9a02f12b52 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectAdminMembersByShortname.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectAdminMembersByShortname.scala.txt @@ -8,11 +8,9 @@ @** * Gets all admin members of a project, given the project's knora-admin:projectShortname. * - * @param triplestore the name of the triplestore being used. * @param shortname the project's `knora-admin:projectShortname`. *@ -@(triplestore: String, - shortname: String) +@(shortname: String) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByIri.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByIri.scala.txt index 15deb79993..fe5a8c58e0 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByIri.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByIri.scala.txt @@ -8,11 +8,9 @@ @** * Gets all information about a single project, given the project's IRI. * - * @param triplestore the name of the triplestore being used. * @param projectIri the project's IRI. *@ -@(triplestore: String, - projectIri: IRI) +@(projectIri: IRI) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByShortcode.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByShortcode.scala.txt index 89f6df6a8e..3b06a92349 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByShortcode.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByShortcode.scala.txt @@ -8,11 +8,9 @@ @** * Gets all information about a single project, given the project's knora-admin:projectShortname. * - * @param triplestore the name of the triplestore being used. * @param shortcode the project's `knora-admin:projectShortcode`. *@ -@(triplestore: String, - shortcode: String) +@(shortcode: String) prefix xsd: prefix rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByShortname.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByShortname.scala.txt index 5c29b9ada9..b597dd2412 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByShortname.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByShortname.scala.txt @@ -8,11 +8,9 @@ @** * Gets all information about a single project, given the project's knora-admin:projectShortname. * - * @param triplestore the name of the triplestore being used. * @param shortname the project's `knora-admin:projectShortname`. *@ -@(triplestore: String, - shortname: String) +@(shortname: String) prefix xsd: prefix rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectMembersByIri.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectMembersByIri.scala.txt index 17d4a50dea..d66fa22d9d 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectMembersByIri.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectMembersByIri.scala.txt @@ -8,11 +8,9 @@ @** * Gets all members of a project, given the project's IRI. * - * @param triplestore the name of the triplestore being used. * @param projectIri the project's IRI. *@ -@(triplestore: String, - projectIri: IRI) +@(projectIri: IRI) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectMembersByShortname.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectMembersByShortname.scala.txt index 4f58b77f65..7b061943fb 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectMembersByShortname.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectMembersByShortname.scala.txt @@ -8,11 +8,9 @@ @** * Gets all members of a project, given the project's knora-admin:projectShortname. * - * @param triplestore the name of the triplestore being used. * @param shortname the project's `knora-admin:projectShortname`. *@ -@(triplestore: String, - shortname: String) +@(shortname: String) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjects.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjects.scala.txt index 8b39e6b665..f78db85d32 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjects.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjects.scala.txt @@ -7,10 +7,7 @@ @** * Gets information about all projects. - * - * @param triplestore the name of the triplestore being used. *@ -@(triplestore: String) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getRegions.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getRegions.scala.txt index fbef6ffb44..095b66ef46 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getRegions.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getRegions.scala.txt @@ -9,11 +9,9 @@ * Given the IRI of a resource, gets the regions that point to this resource * using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource. *@ - @(triplestore: String, - resourceIri: IRI) + @(resourceIri: IRI) PREFIX knora-base: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceClass.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceClass.scala.txt index 5dd7192668..4536331f9e 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceClass.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceClass.scala.txt @@ -8,11 +8,9 @@ @** * Gets the resource class of the specified resource Iri. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource. *@ - @(triplestore: String, - resourceIri: IRI) + @(resourceIri: IRI) PREFIX rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceInfo.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceInfo.scala.txt index f54c5883c6..a098986f7d 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceInfo.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceInfo.scala.txt @@ -9,11 +9,9 @@ * Gets all the properties of a resource, along with the properties of its file values, but not including subproperties * of knora-base:hasValue, using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource to be queried. *@ -@(triplestore: String, - resourceIri: IRI) +@(resourceIri: IRI) prefix rdf: prefix rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourcePropertiesAndValues.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourcePropertiesAndValues.scala.txt index 0623c4dc4e..9154028a9b 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourcePropertiesAndValues.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourcePropertiesAndValues.scala.txt @@ -8,11 +8,9 @@ @** * Gets the values of all the Knora properties of a resource that have values using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource to be queried. *@ -@(triplestore: String, - resourceIri: IRI) +@(resourceIri: IRI) prefix rdf: prefix rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceSearchResult.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceSearchResult.scala.txt index d4a0f2ff3e..2352d2f5de 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceSearchResult.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceSearchResult.scala.txt @@ -8,10 +8,8 @@ @import org.knora.webapi.util.ApacheLuceneSupport.MatchStringWhileTyping @* - * Performs a search for resources matching the given criteria, using SPARQL w/o inference - * (except for the interface to Lucene, which is triplestore-specific). + * Performs a search for resources matching the given criteria, using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param phrase the search phrase (e.g. "Reise ins"). * @param lastTerm the last search term (e.g. "Heili"). * @param resourceTypeIri if set, restricts search to this resource class and its subclasses. @@ -20,8 +18,7 @@ * @param limitOfResults limits number of resources to be returned. * @param separator the separator to be used when concatenating the value strings. *@ -@(triplestore: String, - searchPhrase: MatchStringWhileTyping, +@(searchPhrase: MatchStringWhileTyping, restypeIriOption: Option[IRI], numberOfProps: Int, limitOfResults: Int, @@ -37,20 +34,10 @@ SELECT DISTINCT ?resourceIri ?resourceClass ?firstProp ?attachedToUser ?attached } WHERE { - @triplestore match { + ?resourceIri '@searchPhrase.generateLiteralForLuceneIndexWithExactSequence' . + ?resourceIri rdfs:label ?firstProp . + @searchPhrase.generateRegexFilterStatementForExactSequenceMatch("firstProp") - case "embedded-jena-tdb" | "fuseki" => { - - ?resourceIri '@searchPhrase.generateLiteralForLuceneIndexWithExactSequence' . - ?resourceIri rdfs:label ?firstProp . - @searchPhrase.generateRegexFilterStatementForExactSequenceMatch("firstProp") - - } - - case other => { - @{throw SparqlGenerationException(s"Triplestore type $other is not supported in this SPARQL template"); ()} - } - } FILTER NOT EXISTS { ?resourceIri knora-base:isDeleted true . diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceTypesForNamedGraph.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceTypesForNamedGraph.scala.txt index 0b8b7b7b54..91e1367b96 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceTypesForNamedGraph.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceTypesForNamedGraph.scala.txt @@ -9,10 +9,8 @@ * Gets all the resource classes for the given named graph. * * @param namedGraph the Iri of the named graph to search in. - * @param triplestore the name of the triplestore being used. *@ -@(namedGraph: IRI, - triplestore: String) +@(namedGraph: IRI) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourcesByProjectAndType.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourcesByProjectAndType.scala.txt index 4d6ad9dded..bb04466174 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourcesByProjectAndType.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourcesByProjectAndType.scala.txt @@ -8,12 +8,10 @@ @** * Gets all resources of a certain type inside a certain project. * - * @param triplestore the name of the triplestore being used. * @param projectIri the IRI of the project to query. * @param resType the IRI of the resource class to query. *@ -@(triplestore: String, - projectIri: IRI, +@(projectIri: IRI, resType: IRI) prefix rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUserByEmail.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUserByEmail.scala.txt index 2db9e2ab4d..8ed27ed4a8 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUserByEmail.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUserByEmail.scala.txt @@ -8,11 +8,9 @@ @** * Gets all information about a user, given the user's knora-admin:userid. * - * @param triplestore the name of the triplestore being used. * @param username the user's `knora-admin:userid`. *@ -@(triplestore: String, - email: String) +@(email: String) prefix xsd: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUserByIri.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUserByIri.scala.txt index b35c574061..acaf80b294 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUserByIri.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUserByIri.scala.txt @@ -8,11 +8,9 @@ @** * Gets all information about a user, given the user's IRI. * - * @param triplestore the name of the triplestore being used. * @param userIri the user's IRI. *@ -@(triplestore: String, - userIri: IRI) +@(userIri: IRI) SELECT ?s ?p ?o diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUsers.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUsers.scala.txt index 5ce66a32e3..6da562d949 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUsers.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUsers.scala.txt @@ -7,10 +7,7 @@ @** * Gets all information about a all user. - * - * @param triplestore the name of the triplestore being used. *@ -@(triplestore: String) prefix rdf: prefix knora-admin: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getValue.scala.txt index 24ea467070..ffa938cdbc 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getValue.scala.txt @@ -8,11 +8,9 @@ @** * Queries a knora-base:Value using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param iri the IRI of the Value. *@ -@(triplestore: String, - valueIri: IRI) +@(valueIri: IRI) prefix rdf: prefix rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getVersionHistory.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getVersionHistory.scala.txt index dfec14e714..241f860b24 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getVersionHistory.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getVersionHistory.scala.txt @@ -8,15 +8,13 @@ @** * Returns all versions of a value using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the resource to search. * @param propertyIri the property to search. * @param currentValueIri the most recent version of the value. * * Returns nothing if currentValueIri is not the most recent version. *@ - @(triplestore: String, - resourceIri: IRI, + @(resourceIri: IRI, propertyIri: IRI, currentValueIri: IRI) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/isPartOf.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/isPartOf.scala.txt index a8e77d0e8c..c56b452cb2 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/isPartOf.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/isPartOf.scala.txt @@ -9,11 +9,9 @@ * Given the IRI of a resource, finds any other resource that contains the specified resource * using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the resource whose containing resource, if any, is to be returned. *@ -@(triplestore: String, - resourceIri: IRI) +@(resourceIri: IRI) prefix rdf: prefix rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchExtended.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchExtended.scala.txt index fc0f9ae217..5f7d699447 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchExtended.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchExtended.scala.txt @@ -9,12 +9,11 @@ @import org.knora.webapi.messages.v1.responder.searchmessages.SearchComparisonOperatorV1 @** - * Performs an extended search using SPARQL w/o inference (except for the interface to Lucene, which is triplestore-specific). + * Performs an extended search using SPARQL w/o inference. * * The number of rows returned per matching resource is the product of the number of values that each search criterion * matched in the resource. * - * @param triplestore the name of the triplestore being used. * @param searchCriteria a list of maps containing search criteria, each of which contains: * @param preferredLanguage the language code of the user's preferred language. * @param fallbackLanguage the language code of the application's default language. @@ -22,8 +21,7 @@ * @param restypeIriOption if given, returns only resources of this class and its subclasses. * @param ownerIriOption if filtering by owner is desired, the IRI of the resource owner to search for. *@ -@(triplestore: String, - searchCriteria: Seq[SearchCriterion], +@(searchCriteria: Seq[SearchCriterion], preferredLanguage: String, fallbackLanguage: String, projectIriOption: Option[IRI], @@ -95,19 +93,9 @@ WHERE { *@ - @triplestore match { - - case "embedded-jena-tdb" | "fuseki" => { - - ?valueObject@index ( '@searchCriterion.searchValue' ) . - ?valueObject@index knora-base:valueHasString ?literal@index . - - } + ?valueObject@index ( '@searchCriterion.searchValue' ) . + ?valueObject@index knora-base:valueHasString ?literal@index . - case other => { - @{throw SparqlGenerationException(s"Triplestore type $other is not supported in this SPARQL template"); ()} - } - } } case SearchComparisonOperatorV1.LIKE => { @@ -523,36 +511,16 @@ WHERE { @for(positiveTerm <- searchCriterion.matchBooleanPositiveTerms) { - @triplestore match { + ?valueObject@index ( '@positiveTerm' ) . - case "embedded-jena-tdb" | "fuseki" => { - - ?valueObject@index ( '@positiveTerm' ) . - - } - - case other => { - @{throw SparqlGenerationException(s"Triplestore type $other is not supported in this SPARQL template"); ()} - } - } } @if(searchCriterion.matchBooleanNegativeTerms.nonEmpty) { FILTER NOT EXISTS { @for(negativeTerm <- searchCriterion.matchBooleanNegativeTerms) { - @triplestore match { - - case "embedded-jena-tdb" | "fuseki" => { - - ?valueObject@index ( '@negativeTerm' ) . - - } + ?valueObject@index ( '@negativeTerm' ) . - case other => { - @{throw SparqlGenerationException(s"Triplestore type $other is not supported in this SPARQL template"); ()} - } - } } } } diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchFulltext.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchFulltext.scala.txt index 2ee01f66cc..9f10dc958e 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchFulltext.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchFulltext.scala.txt @@ -8,21 +8,18 @@ @import org.knora.webapi.util.ApacheLuceneSupport.LuceneQueryString @* - * Performs a simple full-text search using SPARQL w/o inference (except for the interface to Lucene, which is - * triplestore-specific). + * Performs a simple full-text search using SPARQL w/o inference. * * The number of rows returned per matching resource is equal to the number of values that matched in the resource, * plus one if the resource's label matched. * - * @param triplestore the name of the triplestore being used. * @param searchTerms search terms to be combined with AND in Lucene full-text search syntax. * @param preferredLanguage the language code of the user's preferred language. * @param fallbackLanguage the language code of the application's default language. * @param projectIriOption if filtering by project is desired, the IRI of the project to search. * @param restypeIriOption if given, searches only for resources of this class and its subclasses. *@ -@(triplestore: String, - searchTerms: LuceneQueryString, +@(searchTerms: LuceneQueryString, preferredLanguage: String, fallbackLanguage: String, projectIriOption: Option[IRI], @@ -52,17 +49,7 @@ WHERE { BIND(STR("@preferredLanguage") AS ?preferredLanguage) BIND(STR("@fallbackLanguage") AS ?fallbackLanguage) - @triplestore match { - case "embedded-jena-tdb" | "fuseki" => { - - ?matchingSubject '@searchTerms.getQueryString' . - - } - - case other => { - @{throw SparqlGenerationException(s"Triplestore type $other is not supported in this SPARQL template"); ()} - } - } + ?matchingSubject '@searchTerms.getQueryString' . FILTER NOT EXISTS { ?matchingSubject knora-base:isDeleted true . @@ -89,9 +76,7 @@ WHERE { ?valueObject knora-base:attachedToUser ?valueCreator ; knora-base:hasPermissions ?valuePermissions . - @if(triplestore == "embedded-jena-tdb" || triplestore == "fuseki") { - ?valueObject knora-base:valueHasString ?literal . - } + ?valueObject knora-base:valueHasString ?literal . } # If the previous OPTIONAL clause executed, ?matchingSubject is a value, and ?containingResource will be set. Otherwise, ?matchingSubject is a resource. diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/addCardinalitiesToClass.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/addCardinalitiesToClass.scala.txt index 9ba5619cc5..43f64a3e19 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/addCardinalitiesToClass.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/addCardinalitiesToClass.scala.txt @@ -12,7 +12,6 @@ @* * Adds cardinalities to an existing class. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology is stored. * @param ontologyIri the IRI of the ontology containing the class. * @param classIri the IRI of the class to be updated. @@ -20,8 +19,7 @@ * @param lastModificationDate the xsd:dateTimeStamp that was attached to the ontology when it was last modified. * @param currentTime an xsd:dateTimeStamp that will be attached to the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, ontologyIri: SmartIri, classIri: SmartIri, cardinalitiesToAdd: Map[SmartIri, KnoraCardinalityInfo], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/addValueVersion.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/addValueVersion.scala.txt index ab647612d7..62cc47f9b0 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/addValueVersion.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/addValueVersion.scala.txt @@ -14,7 +14,6 @@ * Inserts a new version of an existing value of a resource property. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. * @param resourceIri the resource to update. * @param propertyIri the IRI of the property that points from the resource to the value. * @param currentValueIri the most recent existing version of the value. @@ -35,7 +34,6 @@ * find out whether the operation succeeded, the application must query the property's version history. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, propertyIri: SmartIri, currentValueIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt index 76fe2b078a..35e1c25a60 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt @@ -12,7 +12,6 @@ @* * Changes the labels or comments of a class. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology is stored. * @param ontologyIri the IRI of the ontology to be modified. * @param classIri the IRI of the class to be modified. @@ -21,8 +20,7 @@ * @param lastModificationDate the xsd:dateTimeStamp that was attached to the ontology when it was last modified. * @param currentTime an xsd:dateTimeStamp that will be attached to the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, ontologyIri: SmartIri, classIri: SmartIri, predicateToUpdate: SmartIri, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkMetadata.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkMetadata.scala.txt index cf3d8b61b6..1a3fd4e531 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkMetadata.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkMetadata.scala.txt @@ -13,7 +13,6 @@ * Changes the metadata on a LinkValue. * * @param dataNamedGraph the named graph in which the project stores its data. - * @param triplestore the name of the triplestore being used. * @param linkSourceIri the resource that is the source of the link. * @param linkUpdate a [[SparqlTemplateLinkUpdate]] specifying how to update the link value. * @param currentTime an xsd:dateTimeStamp that will be attached to the resources. @@ -22,7 +21,6 @@ * To find out whether the update succeeded, the application must query the deleted link. *@ @(dataNamedGraph: IRI, - triplestore: String, linkSourceIri: IRI, linkUpdate: SparqlTemplateLinkUpdate, maybeComment: Option[String], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkTarget.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkTarget.scala.txt index be1d1ad640..40732cab86 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkTarget.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkTarget.scala.txt @@ -15,7 +15,6 @@ * Deletes an existing link between two resources and replaces it with a link to a different target resource. * * @param dataNamedGraph the named graph in which the project stores its data. - * @param triplestore the name of the triplestore being used. * @param linkSourceIri the resource that is the source of the links. * @param linkUpdateForCurrentLink a [[SparqlTemplateLinkUpdate]] specifying how to update the current link. * @param linkUpdateForNewLink a [[SparqlTemplateLinkUpdate]] specifying how to update the new link. @@ -27,7 +26,6 @@ * To find out whether the update succeeded, the application must query the changed links. *@ @(dataNamedGraph: IRI, - triplestore: String, linkSourceIri: IRI, linkUpdateForCurrentLink: SparqlTemplateLinkUpdate, linkUpdateForNewLink: SparqlTemplateLinkUpdate, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeOntologyMetadata.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeOntologyMetadata.scala.txt index cb0bdd97ec..3f2ff88b80 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeOntologyMetadata.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeOntologyMetadata.scala.txt @@ -9,7 +9,6 @@ @* * Changes the metadata attached to an ontology. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology should be stored. * @param ontologyIri the IRI of the ontology to be created. * @param newLabel the ontology's new label. @@ -19,8 +18,7 @@ * @param lastModificationDate the xsd:dateTimeStamp that was attached to the ontology when it was last modified. * @param currentTime an xsd:dateTimeStamp that will be attached to the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, ontologyIri: SmartIri, newLabel: Option[String], hasOldComment: Boolean, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyGuiElement.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyGuiElement.scala.txt index f69e42431f..39724dd496 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyGuiElement.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyGuiElement.scala.txt @@ -11,7 +11,6 @@ @* * Changes the salsah-gui:guiElement and salsah-gui:guiAttribute of a property. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology is stored. * @param ontologyIri the IRI of the ontology to be modified. * @param propertyIri the IRI of the property to be modified. @@ -21,8 +20,7 @@ * @param lastModificationDate the xsd:dateTimeStamp that was attached to the ontology when it was last modified. * @param currentTime an xsd:dateTimeStamp that will be attached to the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, ontologyIri: SmartIri, propertyIri: SmartIri, maybeLinkValuePropertyIri: Option[SmartIri], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyLabelsOrComments.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyLabelsOrComments.scala.txt index 5cdd818dea..17e4faa63b 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyLabelsOrComments.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyLabelsOrComments.scala.txt @@ -11,7 +11,6 @@ @* * Changes the labels or comments of a property. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology is stored. * @param ontologyIri the IRI of the ontology to be modified. * @param propertyIri the IRI of the property to be modified. @@ -21,8 +20,7 @@ * @param lastModificationDate the xsd:dateTimeStamp that was attached to the ontology when it was last modified. * @param currentTime an xsd:dateTimeStamp that will be attached to the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, ontologyIri: SmartIri, propertyIri: SmartIri, maybeLinkValuePropertyIri: Option[SmartIri], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeResourceMetadata.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeResourceMetadata.scala.txt index ea653980a8..f54d22fe68 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeResourceMetadata.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeResourceMetadata.scala.txt @@ -10,7 +10,6 @@ @* * Changes the metadata of a resource. * - * @param triplestore the name of the triplestore being used. * @param dataNamedGraph the named graph in which the project stores its data. * @param resourceIri the IRI of the resource. * @param resourceClassIri the IRI of the resource class. @@ -19,8 +18,7 @@ * @param maybeLabel the resource's new label, if any. * @param maybePermissions the resource's new permissions, if any. *@ -@(triplestore: String, - dataNamedGraph: IRI, +@(dataNamedGraph: IRI, resourceIri: IRI, resourceClassIri: SmartIri, maybeLastModificationDate: Option[Instant], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeValuePermissions.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeValuePermissions.scala.txt index eed3a26499..be72002485 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeValuePermissions.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeValuePermissions.scala.txt @@ -11,7 +11,6 @@ * Creates a new version of a value, with identical content except for new permissions. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource containing the value. * @param propertyIri the IRI of the property that points from the resource to the value. * @param currentValueIri the IRI of the current version of the value. @@ -20,7 +19,6 @@ * @param currentTime a timestamp that will be attached to the value. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, propertyIri: SmartIri, currentValueIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/checkResourceDeletion.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/checkResourceDeletion.scala.txt index 540e1fdd0f..15647efc17 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/checkResourceDeletion.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/checkResourceDeletion.scala.txt @@ -8,11 +8,9 @@ @** * Checks whether a knora-base:Resource exists and is deleted. * - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource. *@ -@(triplestore: String, - resourceIri: IRI) +@(resourceIri: IRI) prefix rdf: prefix rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/checkValueDeletion.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/checkValueDeletion.scala.txt index 35f441f796..3384f00345 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/checkValueDeletion.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/checkValueDeletion.scala.txt @@ -8,11 +8,9 @@ @** * Checks whether a knora-base:Value exists and is deleted. * - * @param triplestore the name of the triplestore being used. * @param valueIri the IRI of the value. *@ -@(triplestore: String, - valueIri: IRI) +@(valueIri: IRI) prefix rdf: prefix rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createClass.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createClass.scala.txt index 1a12266443..33dcd562d9 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createClass.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createClass.scala.txt @@ -13,15 +13,13 @@ @* * Creates a new class in an existing ontology. If the class already exists, this update does nothing. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology is stored. * @param ontologyIri the IRI of the ontology in which the class should be created. * @param classDef the definition of the class to be created. * @param lastModificationDate the xsd:dateTimeStamp that was attached to the ontology when it was last modified. * @param currentTime an xsd:dateTimeStamp that will be attached to the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, ontologyIri: SmartIri, classDef: ClassInfoContentV2, lastModificationDate: Instant, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createLink.scala.txt index 5a0f2bff26..7e3bf63de1 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createLink.scala.txt @@ -14,7 +14,6 @@ * Inserts a new link between resources. * * @param dataNamedGraph the named graph in which the project stores its data. - * @param triplestore the name of the triplestore being used. * @param resourceIri the resource that is the source of the link. * @param linkUpdate a [[LinkUpdate]] object describing the link to insert. * @param newValueUUID the UUID to be attached to the value. @@ -25,7 +24,6 @@ * To find out whether the update succeeded, the application must query the link. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, linkUpdate: SparqlTemplateLinkUpdate, newValueUUID: UUID, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createNewMapping.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createNewMapping.scala.txt index 59a53f9da1..fc4f4843a7 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createNewMapping.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createNewMapping.scala.txt @@ -9,13 +9,11 @@ @* * Creates a new mapping. * - * @param triplestore the name of the triplestore being used. * @param dataNamedGraph the named graph in which the mapping is stored. * @param mappingIri the Iri of the new mapping * @param mappingElements a sequence of elements to be added to the mapping, each representing an XML tag. *@ -@(triplestore: String, - dataNamedGraph: IRI, +@(dataNamedGraph: IRI, mappingIri: IRI, label: String, defaultXSLTransformation: Option[IRI], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createNewResources.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createNewResources.scala.txt index 8f7a1ccbaf..899369dcb0 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createNewResources.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createNewResources.scala.txt @@ -12,13 +12,11 @@ * Creates new resources. * * @param dataNamedGraph the named graph in which the project stores its data. - * @param triplestore the name of the triplestore being used. * @param resourcesToCreate a collection of resources to be created. * @param projectIri the IRI of the project in which the resources are to be created. * @param creatorIri the IRI of the creator of the resources. *@ @(dataNamedGraph: IRI, - triplestore: String, resourcesToCreate: Seq[SparqlTemplateResourceToCreate], projectIri: IRI, creatorIri: IRI) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createOntology.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createOntology.scala.txt index 1397535a01..22cc856fe9 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createOntology.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createOntology.scala.txt @@ -9,14 +9,12 @@ @* * Creates a new, empty ontology. If the ontology already exists, this update does nothing. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology should be stored. * @param ontologyIri the IRI of the ontology to be created. * @param projectIri the IRI of the project that the ontology belongs to. * @param currentTime an xsd:dateTimeStamp that will be attached to the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, ontologyIri: SmartIri, projectIri: SmartIri, isShared: Boolean, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createProperty.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createProperty.scala.txt index 8294dfb7c6..961ec3dc78 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createProperty.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createProperty.scala.txt @@ -11,7 +11,6 @@ @* * Creates a new property in an existing ontology. If the property already exists, this update does nothing. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology is stored. * @param ontologyIri the IRI of the ontology in which the property should be created. * @param propertyDef the definition of the property to be created. @@ -20,8 +19,7 @@ * @param lastModificationDate the xsd:dateTimeStamp that was attached to the ontology when it was last modified. * @param currentTime an xsd:dateTimeStamp that will be attached to the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, ontologyIri: SmartIri, propertyDef: PropertyInfoContentV2, maybeLinkValuePropertyDef: Option[PropertyInfoContentV2], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createValue.scala.txt index e977597f7f..5132a42e1d 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createValue.scala.txt @@ -15,7 +15,6 @@ * when creating a single value in an existing resource. * * @param dataNamedGraph the named graph in which the project stores its data. - * @param triplestore the name of the triplestore being used. * @param resourceIri the resource to update. * @param propertyIri the resource property to update. * @param newValueIri the new value IRI. @@ -29,7 +28,6 @@ * @param stringFormatter a [[StringFormatter]]. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, propertyIri: SmartIri, newValueIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteClass.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteClass.scala.txt index dc0b6775ec..4e02484fb8 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteClass.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteClass.scala.txt @@ -11,15 +11,13 @@ @* * Deletes a class. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology is stored. * @param ontologyIri the IRI of the ontology containing the class. * @param classIri the IRI of the class to be deleted. * @param lastModificationDate the xsd:dateTimeStamp that was attached to the ontology when it was last modified. * @param currentTime an xsd:dateTimeStamp that will be attached to the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, ontologyIri: SmartIri, classIri: SmartIri, lastModificationDate: Instant, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteLink.scala.txt index fe869526c4..14d1e3b154 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteLink.scala.txt @@ -13,7 +13,6 @@ * Deletes an existing link between two resources. * * @param dataNamedGraph the named graph in which the project stores its data. - * @param triplestore the name of the triplestore being used. * @param linkSourceIri the resource that is the source of the link. * @param linkUpdate a [[SparqlTemplateLinkUpdate]] specifying how to update the link. * @param maybeComment an optional comment explaining why the link is being deleted. @@ -23,7 +22,6 @@ * To find out whether the update succeeded, the application must query the deleted link. *@ @(dataNamedGraph: IRI, - triplestore: String, linkSourceIri: IRI, linkUpdate: SparqlTemplateLinkUpdate, maybeComment: Option[String], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteOntology.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteOntology.scala.txt index 95e2b1cd68..2e08a943c0 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteOntology.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteOntology.scala.txt @@ -8,11 +8,9 @@ @* * Deletes an ontology. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology is stored. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri) +@(ontologyNamedGraphIri: SmartIri) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteProperty.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteProperty.scala.txt index 74576a9846..d9a191fd62 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteProperty.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteProperty.scala.txt @@ -11,7 +11,6 @@ @* * Deletes a property. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology is stored. * @param ontologyIri the IRI of the ontology containing the property. * @param propertyIri the IRI of the property to be deleted. @@ -20,8 +19,7 @@ * @param lastModificationDate the xsd:dateTimeStamp that was attached to the ontology when it was last modified. * @param currentTime an xsd:dateTimeStamp that will be attached to the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, ontologyIri: SmartIri, propertyIri: SmartIri, maybeLinkValuePropertyIri: Option[SmartIri], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteResource.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteResource.scala.txt index ea7d60b608..b80f8216a1 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteResource.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteResource.scala.txt @@ -9,15 +9,13 @@ @** * Marks a resource as deleted. * - * @param triplestore the name of the triplestore being used. * @param dataNamedGraph the named graph to update. * @param resourceIri the IRI of the resource to be marked as deleted. * @param maybeDeleteComment an optional comment explaining why the value is being deleted. * @param currentTime an xsd:dateTimeStamp that will be attached to the resources. * @param requestingUser the IRI of the user making the request. *@ -@(triplestore: String, - dataNamedGraph: IRI, +@(dataNamedGraph: IRI, resourceIri: IRI, maybeDeleteComment: Option[String], currentTime: Instant, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteValue.scala.txt index a39f4730c1..3a1ce314fd 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteValue.scala.txt @@ -14,7 +14,6 @@ * Marks a value as deleted. This template is used for all value types except links. * * @param dataNamedGraph the named graph to update. - * @param triplestore the name of the triplestore being used. * @param resourceIri the IRI of the resource containing the value. * @param propertyIri the IRI of the property that points from the resource to the value. * @param valueIri the IRI of the value to be marked as deleted. @@ -26,7 +25,6 @@ * @param stringFormatter a [[StringFormatter]]. *@ @(dataNamedGraph: IRI, - triplestore: String, resourceIri: IRI, propertyIri: SmartIri, valueIri: IRI, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/eraseResource.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/eraseResource.scala.txt index 22d433fbb9..b38f9afb7d 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/eraseResource.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/eraseResource.scala.txt @@ -9,12 +9,10 @@ @** * Erases a resource from the triplestore using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param dataNamedGraph the named graph to update. * @param resourceIri the IRI of the resource to be marked as deleted. *@ -@(triplestore: String, - dataNamedGraph: IRI, +@(dataNamedGraph: IRI, resourceIri: IRI) PREFIX rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllOntologyMetadata.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllOntologyMetadata.scala.txt index 378a76c888..383c208b41 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllOntologyMetadata.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllOntologyMetadata.scala.txt @@ -7,10 +7,7 @@ @* * Gets the predicates and objects of an ontology IRI. - * - * @param triplestore the name of the triplestore being used. *@ -@(triplestore: String) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllResourcesInProjectPrequery.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllResourcesInProjectPrequery.scala.txt index cd5423f483..40242ce125 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllResourcesInProjectPrequery.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllResourcesInProjectPrequery.scala.txt @@ -12,8 +12,7 @@ * * @param projectIri the IRI of the project. *@ -@(triplestore: String, - projectIri: IRI) +@(projectIri: IRI) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getClassDefinition.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getClassDefinition.scala.txt index 73b5a3527c..7086693e75 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getClassDefinition.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getClassDefinition.scala.txt @@ -8,11 +8,9 @@ @* * Gets a resource class definition. * - * @param triplestore the name of the triplestore being used. * @param classIri the IRI of the class. *@ -@(triplestore: String, - classIri: SmartIri) +@(classIri: SmartIri) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getDeleteDate.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getDeleteDate.scala.txt index 9cb06a1fdd..830dd946ae 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getDeleteDate.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getDeleteDate.scala.txt @@ -8,11 +8,9 @@ @* * Gets the delete date of a resource or value. * - * @param triplestore the name of the triplestore being used. * @param entityIri the IRI of the resource or value. *@ -@(triplestore: String, - entityIri: IRI) +@(entityIri: IRI) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getGraphData.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getGraphData.scala.txt index eace346e1c..e9f050fc97 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getGraphData.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getGraphData.scala.txt @@ -10,15 +10,13 @@ * Gets the outbound or inbound links from/to a resource using SPARQL w/o inference. This query is used * recursively to get a graph of resources reachable from a given resource. * - * @param triplestore the name of the triplestore being used. * @param startNodeIri the IRI of the resource to use as the starting point of the query. * @param startNodeOnly if true, returns information only about the start node. * @param maybeExcludeLinkProperty if provided, a link property that should be excluded from the results. * @param outbound true to get outbound links, false to get inbound links. * @param limit the maximum number of edges to return. *@ -@(triplestore: String, - startNodeIri: IRI, +@(startNodeIri: IRI, startNodeOnly: Boolean, maybeExcludeLinkProperty: Option[SmartIri], outbound: Boolean, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getMapping.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getMapping.scala.txt index fe40d1494a..c4af746669 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getMapping.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getMapping.scala.txt @@ -8,11 +8,9 @@ @* * Gets a mapping for XML to standoff conversion from the triplestore. * - * @param triplestore the name of the triplestore being used. * @param mappingIri the Iri of the new mapping *@ -@(triplestore: String, - mappingIri: IRI) +@(mappingIri: IRI) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getOntologyGraph.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getOntologyGraph.scala.txt index 3170352872..123ce06dec 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getOntologyGraph.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getOntologyGraph.scala.txt @@ -8,11 +8,9 @@ @* * Gets the contents of an ontology graph. * - * @param triplestore the name of the triplestore being used. * @param ontologyGraph the IRI of the ontology graph. *@ -@(triplestore: String, - ontologyGraph: SmartIri) +@(ontologyGraph: SmartIri) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getOntologyInfo.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getOntologyInfo.scala.txt index d6e680f7e7..7f6da1a96a 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getOntologyInfo.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getOntologyInfo.scala.txt @@ -8,11 +8,9 @@ @* * Gets the predicates and objects of an ontology IRI. * - * @param triplestore the name of the triplestore being used. * @param ontologyIri the IRI of the ontology. *@ -@(triplestore: String, - ontologyIri: SmartIri) +@(ontologyIri: SmartIri) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getPropertyDefinition.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getPropertyDefinition.scala.txt index b431412419..51a050a5a9 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getPropertyDefinition.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getPropertyDefinition.scala.txt @@ -8,11 +8,9 @@ @* * Gets a property definition. * - * @param triplestore the name of the triplestore being used. * @param classIri the IRI of the property. *@ -@(triplestore: String, - propertyIri: SmartIri) +@(propertyIri: SmartIri) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValues.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValues.scala.txt index 1f86b6bca8..6e10230a82 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValues.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValues.scala.txt @@ -12,7 +12,6 @@ @* * Gets the values of all the Knora properties of one or more resources, using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param resourceIris the IRIs of the requested resources. * @param preview indicates if the request should only return preview information. * @param withDeleted indicates if the deleted resources and values should be returned or not. @@ -31,8 +30,7 @@ * not be returned. * @param stringFormatter a StringFormatter. *@ -@(triplestore: String, - resourceIris: Seq[IRI], +@(resourceIris: Seq[IRI], preview: Boolean, withDeleted: Boolean, queryAllNonStandoff: Boolean, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourceValueVersionHistory.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourceValueVersionHistory.scala.txt index 6e79699d58..8a85496918 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourceValueVersionHistory.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourceValueVersionHistory.scala.txt @@ -14,8 +14,7 @@ * @param maybeStartDate the start of the time period to return, inclusive. * @param maybeEndDate the end of the time period to return, exclusive. *@ -@(triplestore: String, - resourceIri: IRI, +@(resourceIri: IRI, withDeletedResource: Boolean = false, maybeStartDate: Option[Instant] = None, maybeEndDate: Option[Instant] = None) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcesByClassInProjectPrequery.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcesByClassInProjectPrequery.scala.txt index bbb4cbfed2..8966218d27 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcesByClassInProjectPrequery.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcesByClassInProjectPrequery.scala.txt @@ -9,7 +9,6 @@ @* * Constructs a prequery that gets resources from the specified project, using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param projectIri the IRI of the project. * @param resourceClassIri the IRI of the resource class. * @param maybeOrderByProperty the IRI of the property to order by. @@ -17,8 +16,7 @@ * @param offset the OFFSET to be used. * @param limit the LIMIT to be used. *@ -@(triplestore: String, - projectIri: IRI, +@(projectIri: IRI, resourceClassIri: SmartIri, maybeOrderByProperty: Option[SmartIri], maybeOrderByValuePredicate: Option[SmartIri], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getStandoffTagByUUID.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getStandoffTagByUUID.scala.txt index ea9d16e5e8..ef503f463b 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getStandoffTagByUUID.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getStandoffTagByUUID.scala.txt @@ -9,12 +9,10 @@ @* * Gets the IRIs of a standoff tag identified by UUID. * - * @param triplestore the name of the triplestore being used. * @param uuid the standoff tag's UUID. * @param stringFormatter a [[StringFormatter]]. *@ -@(triplestore: String, - uuid: UUID, +@(uuid: UUID, stringFormatter: StringFormatter) PREFIX rdf: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isClassUsedInData.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isClassUsedInData.scala.txt index 23c5d634ca..da1328bd89 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isClassUsedInData.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isClassUsedInData.scala.txt @@ -8,11 +8,9 @@ @* * Checks if an instance of a class exists (if yes, that means the class is used in data) * - * @param triplestore the name of the triplestore being used. * @param classIri the IRI of the class. *@ -@(triplestore: String, - classIri: SmartIri) +@(classIri: SmartIri) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isEntityUsed.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isEntityUsed.scala.txt index 88121f89e1..573d0428d0 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isEntityUsed.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isEntityUsed.scala.txt @@ -8,15 +8,13 @@ @* * Checks whether an entity is used (i.e. is the object of any statements). * - * @param triplestore the name of the triplestore being used. * @param entityIri the IRI of the entity. * @param ignoreKnoraConstraints if true, knora-base:subjectClassConstraint and knora-base:objectClassConstraint will be ignored. * This is necessary when modifying the cardinalities of a class. * @param ignoreRdfSubjectAndObject if true, rdf:subject and rdf:object will be ignored. This is necessary when checking * for references to a resource that is to be erased. *@ -@(triplestore: String, - entityIri: SmartIri, +@(entityIri: SmartIri, ignoreKnoraConstraints: Boolean = false, ignoreRdfSubjectAndObject: Boolean = false) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isOntologyUsed.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isOntologyUsed.scala.txt index ab4a85bd90..6eba4a0fac 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isOntologyUsed.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isOntologyUsed.scala.txt @@ -9,13 +9,11 @@ * Checks whether any entity in an ontology is used in data or in other ontologies. Returns at most 50 subjects that * refer to entities in the ontology. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the ontology's named graph. * @param classIris the IRIs of all the classes in the ontology. * @param propertyIris the IRIs of all the properties in the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, classIris: Set[SmartIri], propertyIris: Set[SmartIri]) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/replaceClassCardinalities.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/replaceClassCardinalities.scala.txt index dfd1cc8c6a..c8b2daac7e 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/replaceClassCardinalities.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/replaceClassCardinalities.scala.txt @@ -12,7 +12,6 @@ @* * Replace's a class's cardinalities with new ones. * - * @param triplestore the name of the triplestore being used. * @param ontologyNamedGraphIri the IRI of the named graph where the ontology is stored. * @param ontologyIri the IRI of the ontology containing the class. * @param classIri the IRI of the class to be updated. @@ -20,8 +19,7 @@ * @param lastModificationDate the xsd:dateTimeStamp that was attached to the ontology when it was last modified. * @param currentTime an xsd:dateTimeStamp that will be attached to the ontology. *@ -@(triplestore: String, - ontologyNamedGraphIri: SmartIri, +@(ontologyNamedGraphIri: SmartIri, ontologyIri: SmartIri, classIri: SmartIri, newCardinalities: Map[SmartIri, KnoraCardinalityInfo], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchFulltext.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchFulltext.scala.txt index 09ffeafc93..ac76258a78 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchFulltext.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchFulltext.scala.txt @@ -9,15 +9,13 @@ @* - * Performs a simple full-text search using SPARQL w/o inference, except for the interface to Lucene, which is - * triplestore-specific. + * Performs a simple full-text search using SPARQL w/o inference * * The number of rows returned per matching resource is equal to the number of values that matched in the resource, * plus one if the resource's label matched. * * This template is used only by searchFulltext.scala.txt. * - * @param triplestore the name of the triplestore being used. * @param searchTerms search terms. * @param limitToProject limit search to the given project. * @param limitToResourceClass limit search to given resource class. @@ -28,8 +26,7 @@ * @param offset offset for paging (starts with 0) * @param countQuery indicates whether it is a count query or the actual resources should be returned. *@ -@(triplestore: String, - searchTerms: LuceneQueryString, +@(searchTerms: LuceneQueryString, limitToProject: Option[IRI], limitToResourceClass: Option[IRI], limitToStandoffClass: Option[IRI], diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabel.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabel.scala.txt index 02785e8fa0..0fbaef0923 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabel.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabel.scala.txt @@ -10,7 +10,6 @@ @* * Performs a search for resources by their label using SPARQL w/o inference. * - * @param triplestore the name of the triplestore being used. * @param searchTerm search terms. * @param limitToProject limit search to the given project. * @param limitToResourceClass limit search to given resource class. @@ -18,8 +17,7 @@ * @param offset offset to be used for paging. * @param countQuery indicates whether it is a count query or the actual resources should be returned. *@ -@(triplestore: String, - searchTerm: MatchStringWhileTyping, +@(searchTerm: MatchStringWhileTyping, limitToProject: Option[IRI], limitToResourceClass: Option[IRI], limit: Int, diff --git a/webapi/src/main/twirl/org/knora/webapi/queries/sparql/v2/isPropertyUsed.scala.txt b/webapi/src/main/twirl/org/knora/webapi/queries/sparql/v2/isPropertyUsed.scala.txt index 59498c1747..358420f941 100644 --- a/webapi/src/main/twirl/org/knora/webapi/queries/sparql/v2/isPropertyUsed.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/queries/sparql/v2/isPropertyUsed.scala.txt @@ -8,15 +8,13 @@ @* * Checks whether a property is used (i.e., is the property of any statements). * - * @param triplestore the name of the triplestore being used. * @param propertyIri the IRI of the property. * @param ignoreKnoraConstraints if true, knora-base:subjectClassConstraint and knora-base:objectClassConstraint will be ignored. * This is necessary when modifying the cardinalities of a class. * @param ignoreRdfSubjectAndObject if true, rdf:subject and rdf:object will be ignored. This is necessary when checking * for references to a resource that is to be erased. *@ -@(triplestore: String, - internalPropertyIri: IRI, +@(internalPropertyIri: IRI, internalClassIri: IRI, ignoreKnoraConstraints: Boolean = false, ignoreRdfSubjectAndObject: Boolean = false) diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala index 9f00aea900..3a8e853ad0 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala @@ -5,33 +5,39 @@ package org.knora.webapi.responders.v1 -import java.util.UUID - -import akka.actor.{ActorRef, Props} +import akka.actor.ActorRef +import akka.actor.Props import akka.testkit.ImplicitSender -import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory import org.knora.webapi._ import org.knora.webapi.app.ApplicationActor -import org.knora.webapi.exceptions.{BadRequestException, NotFoundException, OntologyConstraintException} +import org.knora.webapi.exceptions.BadRequestException +import org.knora.webapi.exceptions.NotFoundException +import org.knora.webapi.exceptions.OntologyConstraintException import org.knora.webapi.messages.IriConversions._ -import org.knora.webapi.messages.admin.responder.permissionsmessages.{ - ObjectAccessPermissionADM, - ObjectAccessPermissionsForResourceGetADM, - PermissionADM -} +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.StringFormatter +import org.knora.webapi.messages.admin.responder.permissionsmessages.ObjectAccessPermissionADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.ObjectAccessPermissionsForResourceGetADM +import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionADM import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.util.DateUtilV1 +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.MessageUtil +import org.knora.webapi.messages.util.ValueUtilV1 import org.knora.webapi.messages.util.rdf.SparqlSelectResult -import org.knora.webapi.messages.util.{DateUtilV1, KnoraSystemInstances, MessageUtil, ValueUtilV1} import org.knora.webapi.messages.v1.responder.resourcemessages._ import org.knora.webapi.messages.v1.responder.valuemessages._ import org.knora.webapi.messages.v2.responder.standoffmessages._ -import org.knora.webapi.messages.{OntologyConstants, StringFormatter} -import org.knora.webapi.settings.{KnoraDispatchers, _} +import org.knora.webapi.settings.KnoraDispatchers +import org.knora.webapi.settings._ import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM._ import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.util._ import spray.json.JsValue +import java.util.UUID import scala.concurrent.duration._ /** @@ -784,7 +790,6 @@ class ResourcesResponderV1Spec extends CoreSpec(ResourcesResponderV1Spec.config) private def getLastModificationDate(resourceIri: IRI): Option[String] = { val lastModSparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getLastModificationDate( - triplestore = settings.triplestoreType, resourceIri = resourceIri ) .toString() diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala index 10e1320494..0f51ec4147 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala @@ -5,31 +5,32 @@ package org.knora.webapi.responders.v1 -import java.time.Instant -import java.util.UUID - -import akka.actor.{ActorRef, Props} +import akka.actor.ActorRef +import akka.actor.Props import akka.testkit.ImplicitSender -import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory import org.knora.webapi._ import org.knora.webapi.app.ApplicationActor import org.knora.webapi.exceptions._ import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.util.rdf.SparqlSelectResult -import org.knora.webapi.messages.v1.responder.resourcemessages.{ - LocationV1, - ResourceFullGetRequestV1, - ResourceFullResponseV1 -} +import org.knora.webapi.messages.v1.responder.resourcemessages.LocationV1 +import org.knora.webapi.messages.v1.responder.resourcemessages.ResourceFullGetRequestV1 +import org.knora.webapi.messages.v1.responder.resourcemessages.ResourceFullResponseV1 import org.knora.webapi.messages.v1.responder.valuemessages._ import org.knora.webapi.messages.v2.responder.standoffmessages._ -import org.knora.webapi.messages.{OntologyConstants, StringFormatter} -import org.knora.webapi.settings.{KnoraDispatchers, _} +import org.knora.webapi.settings.KnoraDispatchers +import org.knora.webapi.settings._ import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM._ import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.util.MutableTestIri +import java.time.Instant +import java.util.UUID import scala.concurrent.duration._ /** @@ -256,7 +257,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with private def getLastModificationDate(resourceIri: IRI): Option[String] = { val lastModSparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .getLastModificationDate( - triplestore = settings.triplestoreType, resourceIri = resourceIri ) .toString() @@ -922,7 +922,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = "http://rdfh.ch/0803/21abac2162", predicateIri = OntologyConstants.KnoraBase.HasStandoffLinkTo, objectIri = zeitglöckleinIri @@ -1022,7 +1021,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = "http://rdfh.ch/0803/21abac2162", predicateIri = OntologyConstants.KnoraBase.HasStandoffLinkTo, objectIri = zeitglöckleinIri @@ -1106,7 +1104,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = "http://rdfh.ch/0803/21abac2162", predicateIri = OntologyConstants.KnoraBase.HasStandoffLinkTo, objectIri = zeitglöckleinIri @@ -1167,7 +1164,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = "http://rdfh.ch/0803/21abac2162", predicateIri = OntologyConstants.KnoraBase.HasStandoffLinkTo, objectIri = zeitglöckleinIri @@ -1232,7 +1228,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = "http://rdfh.ch/0803/21abac2162", predicateIri = OntologyConstants.KnoraBase.HasStandoffLinkTo, objectIri = zeitglöckleinIri, @@ -1321,7 +1316,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = "http://rdfh.ch/0803/21abac2162", predicateIri = OntologyConstants.KnoraBase.HasStandoffLinkTo, objectIri = zeitglöckleinIri @@ -1485,7 +1479,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = resourceIri, predicateIri = OntologyConstants.KnoraBase.HasLinkTo, objectIri = zeitglöckleinIri @@ -1569,7 +1562,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val oldLinkValueSparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = linkSourceIri, predicateIri = OntologyConstants.KnoraBase.HasLinkTo, objectIri = zeitglöckleinIri, @@ -1594,7 +1586,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val newLinkValueSparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = linkSourceIri, predicateIri = OntologyConstants.KnoraBase.HasLinkTo, objectIri = linkTargetIri @@ -1637,7 +1628,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val deletedLinkValueSparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = linkSourceIri, predicateIri = OntologyConstants.KnoraBase.HasLinkTo, objectIri = linkTargetIri, @@ -1987,7 +1977,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val initialLinkValueSparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = thingWithTextValues, predicateIri = OntologyConstants.KnoraBase.HasStandoffLinkTo, objectIri = aThingIri @@ -2059,7 +2048,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val decrementedLinkValueSparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = thingWithTextValues, predicateIri = OntologyConstants.KnoraBase.HasStandoffLinkTo, objectIri = aThingIri @@ -2120,7 +2108,6 @@ class ValuesResponderV1Spec extends CoreSpec(ValuesResponderV1Spec.config) with val deletedLinkValueSparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v1.txt .findLinkValueByObject( - triplestore = settings.triplestoreType, subjectIri = thingWithTextValues, predicateIri = OntologyConstants.KnoraBase.HasStandoffLinkTo, objectIri = aThingIri, diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala index 9b318118e1..a331c5dae4 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala @@ -5,37 +5,40 @@ package org.knora.webapi.responders.v2 -import java.time.Instant -import java.time.temporal.ChronoUnit -import java.util.UUID -import akka.actor.{ActorRef, Props} +import akka.actor.ActorRef +import akka.actor.Props import akka.testkit.ImplicitSender import org.knora.webapi._ import org.knora.webapi.app.ApplicationActor import org.knora.webapi.exceptions._ import org.knora.webapi.messages.IriConversions._ +import org.knora.webapi.messages.OntologyConstants +import org.knora.webapi.messages.SmartIri +import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.store.triplestoremessages._ +import org.knora.webapi.messages.util.CalendarNameGregorian +import org.knora.webapi.messages.util.DatePrecisionYear +import org.knora.webapi.messages.util.KnoraSystemInstances +import org.knora.webapi.messages.util.PermissionUtilADM import org.knora.webapi.messages.util.rdf.SparqlSelectResult -import org.knora.webapi.messages.util.{ - CalendarNameGregorian, - DatePrecisionYear, - KnoraSystemInstances, - PermissionUtilADM -} import org.knora.webapi.messages.v2.responder.SuccessResponseV2 import org.knora.webapi.messages.v2.responder.resourcemessages._ import org.knora.webapi.messages.v2.responder.standoffmessages._ import org.knora.webapi.messages.v2.responder.valuemessages._ -import org.knora.webapi.messages.{OntologyConstants, SmartIri, StringFormatter} import org.knora.webapi.models.filemodels._ import org.knora.webapi.responders.v2.ResourcesResponseCheckerV2.compareReadResourcesSequenceV2Response -import org.knora.webapi.settings.{KnoraDispatchers, _} +import org.knora.webapi.settings.KnoraDispatchers +import org.knora.webapi.settings._ import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.util._ -import org.xmlunit.builder.{DiffBuilder, Input} +import org.xmlunit.builder.DiffBuilder +import org.xmlunit.builder.Input import org.xmlunit.diff.Diff +import java.time.Instant +import java.time.temporal.ChronoUnit +import java.util.UUID import scala.concurrent.duration._ object ResourcesResponderV2Spec { @@ -520,7 +523,6 @@ class ResourcesResponderV2Spec extends CoreSpec() with ImplicitSender { private def getStandoffTagByUUID(uuid: UUID): Set[IRI] = { val sparqlQuery = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getStandoffTagByUUID( - triplestore = settings.triplestoreType, uuid = uuid, stringFormatter = stringFormatter ) @@ -538,7 +540,6 @@ class ResourcesResponderV2Spec extends CoreSpec() with ImplicitSender { private def getDeleteDate(resourceIri: IRI): Instant = { val sparqlQuery: String = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getDeleteDate( - triplestore = settings.triplestoreType, entityIri = resourceIri ) .toString() @@ -2412,7 +2413,6 @@ class ResourcesResponderV2Spec extends CoreSpec() with ImplicitSender { val isEntityUsedSparql: String = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .isEntityUsed( - triplestore = settings.triplestoreType, entityIri = resourceIriToErase.get.toSmartIri, ignoreKnoraConstraints = true ) diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala index 1a9e3f4914..56bdd70250 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala @@ -10,13 +10,14 @@ import akka.testkit.ImplicitSender import akka.util.Timeout import org.knora.webapi._ import org.knora.webapi.exceptions._ +import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.v2.responder.standoffmessages._ -import org.knora.webapi.messages.StringFormatter import org.knora.webapi.models.standoffmodels.DefineStandoffMapping import org.knora.webapi.sharedtestdata.SharedTestDataADM -import scala.concurrent.{Await, Future} +import scala.concurrent.Await +import scala.concurrent.Future import scala.concurrent.duration._ /** @@ -32,7 +33,6 @@ class StandoffResponderV2Spec extends CoreSpec() with ImplicitSender { val getMappingSparql = org.knora.webapi.messages.twirl.queries.sparql.v2.txt .getMapping( - triplestore = settings.triplestoreType, mappingIri = iri ) .toString() diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/AllTriplestoreSpec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/AllTriplestoreSpec.scala index f7b3dcc4a0..b29be7f695 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/AllTriplestoreSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/AllTriplestoreSpec.scala @@ -10,7 +10,6 @@ import com.typesafe.config.ConfigFactory import org.knora.webapi.CoreSpec import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.util.rdf.SparqlSelectResult -import org.knora.webapi.settings.TriplestoreTypes import scala.concurrent.duration._ import scala.language.postfixOps @@ -37,7 +36,6 @@ object AllTriplestoreSpec { class AllTriplestoreSpec extends CoreSpec(AllTriplestoreSpec.config) with ImplicitSender { private val timeout = 30.seconds - private val tsType = settings.triplestoreType // println(system.settings.config.getConfig("app").root().render()) // println(system.settings.config.getConfig("app.triplestore").root().render()) @@ -159,7 +157,7 @@ class AllTriplestoreSpec extends CoreSpec(AllTriplestoreSpec.config) with Implic * The Akka documentation describes a bunch of other methods * but this is the one I the most */ - s"The Triplestore ($tsType) Actor " when { + s"The Triplestore ($settings.triplestoreType) Actor " when { "started " should { "only start answering after initialization has finished " in { storeManager ! CheckTriplestoreRequest() @@ -172,8 +170,8 @@ class AllTriplestoreSpec extends CoreSpec(AllTriplestoreSpec.config) with Implic "receiving a Hello " should { "reply " in { within(1.seconds) { - storeManager ! HelloTriplestore(tsType) - expectMsg(HelloTriplestore(tsType)) + storeManager ! HelloTriplestore(settings.triplestoreType) + expectMsg(HelloTriplestore(settings.triplestoreType)) } } } @@ -261,9 +259,7 @@ class AllTriplestoreSpec extends CoreSpec(AllTriplestoreSpec.config) with Implic "receiving a search request " should { "execute the search with the lucene index for 'knora-base:valueHasString' properties" in { within(1000.millis) { - tsType match { - case TriplestoreTypes.HttpFuseki => storeManager ! SparqlSelectRequest(textSearchQueryFusekiValueHasString) - } + storeManager ! SparqlSelectRequest(textSearchQueryFusekiValueHasString) expectMsgPF(timeout) { case msg: SparqlSelectResult => //println(msg) msg.results.bindings.size should ===(3) @@ -273,9 +269,7 @@ class AllTriplestoreSpec extends CoreSpec(AllTriplestoreSpec.config) with Implic "execute the search with the lucene index for 'rdfs:label' properties" in { within(1000.millis) { - tsType match { - case TriplestoreTypes.HttpFuseki => storeManager ! SparqlSelectRequest(textSearchQueryFusekiDRFLabel) - } + storeManager ! SparqlSelectRequest(textSearchQueryFusekiDRFLabel) expectMsgPF(timeout) { case msg: SparqlSelectResult => //println(msg) msg.results.bindings.size should ===(1)