feat(v2-ontologies): add remove cardinalities from class if property not used in resources (DSP-1700)

.gitignore

@@ -56,3 +56,4 @@ dump.rdb
 dependencies.txt
 /client-test-data.zip
 /db_staging_dump.trig
+cleandeps.sh

.scalafmt.conf

@@ -1 +1,21 @@
+version = "2.7.5"
 maxColumn = 120
+align.preset = most
+align.multiline = false
+continuationIndent.defnSite = 2
+assumeStandardLibraryStripMargin = true
+docstrings = JavaDoc
+lineEndings = preserve
+includeCurlyBraceInSelectChains = false
+danglingParentheses.preset = true
+optIn.annotationNewlines = true
+newlines.alwaysBeforeMultilineDef = false
+
+rewrite.rules = [RedundantBraces]
+
+rewrite.redundantBraces.generalExpressions = false
+rewriteTokens = {
+  "⇒": "=>"
+  "→": "->"
+  "←": "<-"
+}

test_data/all_data/freetest-data.ttl

@@ -0,0 +1,81 @@
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix knora-base: <http://www.knora.org/ontology/knora-base#> .
+@prefix knora-admin: <http://www.knora.org/ontology/knora-admin#> .
+@prefix salsah-gui: <http://www.knora.org/ontology/salsah-gui#> .
+@prefix freetest: <http://www.knora.org/ontology/0001/freetest#> .
+
+<http://rdfh.ch/0001/free-test-instance-01> a freetest:FreeTest ;
+  knora-base:attachedToUser <http://rdfh.ch/users/9XBCrDV3SRa7kS1WwynB4Q>;
+  knora-base:attachedToProject <http://rdfh.ch/projects/0001>;
+  knora-base:hasPermissions "V knora-admin:UnknownUser|M knora-admin:ProjectMember";
+  knora-base:creationDate "2019-11-29T10:00:00.673298Z"^^xsd:dateTime;
+
+  freetest:hasText <http://rdfh.ch/0001/free-test-instance-01/values/has-text-value-01> ;
+  freetest:hasBoolean <http://rdfh.ch/0001/free-test-instance-01/values/has-boolean-value-01>;
+  rdfs:label "a free test instance";
+  knora-base:isDeleted false .
+
+<http://rdfh.ch/0001/free-test-instance-01/values/has-text-value-01> a knora-base:TextValue;
+  knora-base:valueHasUUID "SZyeLLmOTcCCuS3B0VksHQ"^^xsd:string;
+  knora-base:isDeleted false;
+  knora-base:valueCreationDate "2018-05-28T15:52:03.897Z"^^xsd:dateTime;
+  knora-base:valueHasOrder 0;
+  knora-base:valueHasString "test";
+  knora-base:hasPermissions "CR knora-admin:Creator|M knora-admin:ProjectMember|V knora-admin:KnownUser|RV knora-admin:UnknownUser";
+  knora-base:attachedToUser <http://rdfh.ch/users/BhkfBc3hTeS_IDo-JgXRbQ> .
+
+<http://rdfh.ch/0001/free-test-instance-01/values/has-boolean-value-01> a knora-base:BooleanValue;
+  knora-base:valueHasUUID "IN4R19yYR0ygi3K2VEHpUQ"^^xsd:string;
+  knora-base:isDeleted false;
+  knora-base:valueCreationDate "2018-05-28T15:52:03.897Z"^^xsd:dateTime;
+  knora-base:valueHasBoolean true;
+  knora-base:valueHasOrder 0;
+  knora-base:valueHasString "true";
+  knora-base:hasPermissions "CR knora-admin:Creator|M knora-admin:ProjectMember|V knora-admin:KnownUser|RV knora-admin:UnknownUser";
+  knora-base:attachedToUser <http://rdfh.ch/users/BhkfBc3hTeS_IDo-JgXRbQ> .
+
+<http://rdfh.ch/0001/short-free-test-instance-01> a freetest:FreeTest ;
+ knora-base:attachedToUser <http://rdfh.ch/users/9XBCrDV3SRa7kS1WwynB4Q>;
+ knora-base:attachedToProject <http://rdfh.ch/projects/0001>;
+ knora-base:hasPermissions "V knora-admin:UnknownUser|M knora-admin:ProjectMember";
+ knora-base:creationDate "2019-11-29T10:00:00.673298Z"^^xsd:dateTime;
+
+ freetest:hasText <http://rdfh.ch/0001/short-free-test-instance-01/values/has-text-value-01> ;
+ freetest:hasBoolean <http://rdfh.ch/0001/short-free-test-instance-01/values/has-boolean-value-01>;
+ freetest:hasDecimal <http://rdfh.ch/0001/short-free-test-instance-01/values/has-decimal-value-01>;
+ rdfs:label "a short free test instance";
+ knora-base:isDeleted false .
+
+<http://rdfh.ch/0001/short-free-test-instance-01/values/has-text-value-01> a knora-base:TextValue;
+ knora-base:valueHasUUID "SZyeLLmOTcCCuS3B0VksHQ"^^xsd:string;
+ knora-base:isDeleted false;
+ knora-base:valueCreationDate "2018-05-28T15:52:03.897Z"^^xsd:dateTime;
+ knora-base:valueHasOrder 0;
+ knora-base:valueHasString "test";
+ knora-base:hasPermissions "CR knora-admin:Creator|M knora-admin:ProjectMember|V knora-admin:KnownUser|RV knora-admin:UnknownUser";
+ knora-base:attachedToUser <http://rdfh.ch/users/BhkfBc3hTeS_IDo-JgXRbQ> .
+
+<http://rdfh.ch/0001/short-free-test-instance-01/values/has-boolean-value-01> a knora-base:BooleanValue;
+ knora-base:valueHasUUID "IN4R19yYR0ygi3K2VEHpUQ"^^xsd:string;
+ knora-base:isDeleted false;
+ knora-base:valueCreationDate "2018-05-28T15:52:03.897Z"^^xsd:dateTime;
+ knora-base:valueHasBoolean true;
+ knora-base:valueHasOrder 0;
+ knora-base:valueHasString "true";
+ knora-base:hasPermissions "CR knora-admin:Creator|M knora-admin:ProjectMember|V knora-admin:KnownUser|RV knora-admin:UnknownUser";
+ knora-base:attachedToUser <http://rdfh.ch/users/BhkfBc3hTeS_IDo-JgXRbQ> .
+
+<http://rdfh.ch/0001/short-free-test-instance-01/values/has-decimal-value-01> a knora-base:DecimalValue;
+ knora-base:valueHasUUID "bXMwnrHvQH2DMjOFrGmNzg"^^xsd:string;
+ knora-base:isDeleted false;
+ knora-base:valueCreationDate "2018-05-28T15:52:03.897Z"^^xsd:dateTime;
+ knora-base:valueHasDecimal "1.5"^^xsd:decimal;
+ knora-base:valueHasOrder 0;
+ knora-base:valueHasString "1.5";
+ knora-base:hasPermissions "CR knora-admin:Creator|M knora-admin:ProjectMember|V knora-admin:KnownUser|RV knora-admin:UnknownUser";
+ knora-base:attachedToUser <http://rdfh.ch/users/BhkfBc3hTeS_IDo-JgXRbQ> .

test_data/ontologies/freetest-onto.ttl

@@ -0,0 +1,143 @@
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix knora-base: <http://www.knora.org/ontology/knora-base#> .
+@prefix salsah-gui: <http://www.knora.org/ontology/salsah-gui#> .
+@base <http://www.knora.org/ontology/0001/freetest#> .
+
+# A trivial ontology, used only for testing Knora.
+
+@prefix : <http://www.knora.org/ontology/0001/freetest#> .
+<http://www.knora.org/ontology/0001/freetest> rdf:type owl:Ontology ;
+    rdfs:label "The free test ontology" ;
+    knora-base:attachedToProject <http://rdfh.ch/projects/0001> ;
+    knora-base:lastModificationDate "2012-12-12T12:12:12.12Z"^^xsd:dateTime .
+
+
+
+
+
+:hasText rdf:type owl:ObjectProperty ;
+
+       rdfs:subPropertyOf knora-base:hasValue ;
+
+       rdfs:label "Text"@de ,
+                  "Texte"@fr ,
+                  "Testo"@it ,
+                  "Text"@en ;
+
+       knora-base:subjectClassConstraint :FreeTest ;
+
+       knora-base:objectClassConstraint knora-base:TextValue ;
+
+       salsah-gui:guiElement salsah-gui:SimpleText ;
+
+       salsah-gui:guiAttribute "size=80" ,
+                               "maxlength=255" .
+
+
+:hasInteger rdf:type owl:ObjectProperty ;
+
+       rdfs:subPropertyOf knora-base:hasValue ;
+
+       rdfs:label "Ganzzahl"@de ,
+                  "Nombre entier"@fr ,
+                  "Intero"@it ,
+                  "Integer"@en ;
+
+       knora-base:subjectClassConstraint :FreeTest ;
+
+       knora-base:objectClassConstraint knora-base:IntValue ;
+
+       salsah-gui:guiElement salsah-gui:Spinbox ;
+
+       salsah-gui:guiAttribute "min=0" ,
+                                "max=-1" .
+
+
+
+:hasDecimal rdf:type owl:ObjectProperty ;
+
+       rdfs:subPropertyOf knora-base:hasValue ;
+
+       rdfs:label "Dezimalzahl"@de ,
+                  "Nombre décimal"@fr ,
+                  "Numero decimale"@it ,
+                  "Decimal number"@en ;
+
+       knora-base:subjectClassConstraint :FreeTest ;
+
+       knora-base:objectClassConstraint knora-base:DecimalValue ;
+
+       salsah-gui:guiElement salsah-gui:SimpleText ;
+
+       salsah-gui:guiAttribute "size=80" ,
+                               "maxlength=255" .
+
+
+
+:hasBoolean rdf:type owl:ObjectProperty ;
+
+       rdfs:subPropertyOf knora-base:hasValue ;
+
+       rdfs:label "Boolescher Wert"@de ,
+                  "Valeur booléenne"@fr ,
+                  "Valore booleano"@it ,
+                  "Boolean value"@en ;
+
+       knora-base:subjectClassConstraint :FreeTest ;
+
+       knora-base:objectClassConstraint knora-base:BooleanValue ;
+
+       salsah-gui:guiElement salsah-gui:Checkbox .
+
+
+:FreeTest rdf:type owl:Class ;
+
+      rdfs:subClassOf knora-base:Resource ,
+                      [
+                         rdf:type owl:Restriction ;
+                         owl:onProperty :hasText ;
+                         owl:minCardinality "1"^^xsd:nonNegativeInteger ;
+                         salsah-gui:guiOrder "1"^^xsd:nonNegativeInteger
+                      ] ,
+                      [
+                         rdf:type owl:Restriction ;
+                         owl:onProperty :hasBoolean ;
+                         owl:maxCardinality "1"^^xsd:nonNegativeInteger ;
+                         salsah-gui:guiOrder "2"^^xsd:nonNegativeInteger
+                      ] ,
+                      [
+                          rdf:type owl:Restriction ;
+                          owl:onProperty :hasDecimal ;
+                          owl:minCardinality "0"^^xsd:nonNegativeInteger ;
+                          salsah-gui:guiOrder "3"^^xsd:nonNegativeInteger
+                      ] ,
+                      [
+                          rdf:type owl:Restriction ;
+                          owl:onProperty :hasInteger ;
+                          owl:minCardinality "0"^^xsd:nonNegativeInteger ;
+                          salsah-gui:guiOrder "4"^^xsd:nonNegativeInteger
+                      ] ;
+
+      knora-base:resourceIcon "thing.png" ;
+
+      rdfs:label "FT de"@de ,
+                 "FT fr"@fr ,
+                 "FT it"@it ,
+                 "FT en"@en ;
+
+      rdfs:comment """A comment for FT."""@de .
+
+
+:ShortFreeTest rdf:type owl:Class ;
+    rdfs:subClassOf :FreeTest ;
+    rdfs:label "SFT de"@de ,
+               "SFT fr"@fr ,
+               "SFT it"@it ,
+               "SFT en"@en ;
+
+    rdfs:comment """A comment for SFT."""@de .

third_party/dependencies.bzl

@@ -27,6 +27,12 @@ def dependencies():
             "com.typesafe.akka:akka-http-jackson_2.13:%s" % (AKKA_HTTP_VERSION),
             "com.typesafe:config:1.3.3",
 
+            # ZIO
+            "dev.zio:zio_2.13:1.0.9",
+            "dev.zio:zio-json_2.13:0.1.5",
+            "dev.zio:zio-test_2.13:1.0.9",
+            "dev.zio:zio-test-junit_2.13:1.0.9",
+
             # CORS support
             "ch.megard:akka-http-cors_2.13:1.0.0",
 
@@ -125,7 +131,7 @@ def dependencies():
             "org.scalatest:scalatest-shouldmatchers_2.13:3.2.2",
             "org.scalatest:scalatest-compatible:3.2.2",
             "org.testcontainers:testcontainers:1.15.3",
-            "junit:junit:4.13",
+            "junit:junit:4.13.2",
             "io.gatling.highcharts:gatling-charts-highcharts:3.2.1",
             "io.gatling:gatling-test-framework:3.2.1",
 

webapi/BUILD.bazel

@@ -179,6 +179,7 @@ scala_library(
         "@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
         "@maven//:com_typesafe_akka_akka_stream_2_13",
         "@maven//:com_typesafe_config",
+        "@maven//:dev_zio_zio_2_13",
         "@maven//:io_spray_spray_json_2_13",
         "@maven//:org_scalactic_scalactic_2_13",
         "@maven//:org_scalatest_scalatest_core_2_13",

webapi/src/main/scala/org/knora/webapi/app/ApplicationActor.scala

@@ -321,26 +321,26 @@ class ApplicationActor extends Actor with Stash with LazyLogging with AroundDire
 
     case GetAppState() =>
       logger.debug("ApplicationStateActor - GetAppState - value: {}", appState)
-      sender ! appState
+      sender() ! appState
 
     case ActorReady() =>
-      sender ! ActorReadyAck()
+      sender() ! ActorReadyAck()
 
     case SetAllowReloadOverHTTPState(value) =>
       logger.debug("ApplicationStateActor - SetAllowReloadOverHTTPState - value: {}", value)
       allowReloadOverHTTPState = value
 
     case GetAllowReloadOverHTTPState() =>
       logger.debug("ApplicationStateActor - GetAllowReloadOverHTTPState - value: {}", allowReloadOverHTTPState)
-      sender ! (allowReloadOverHTTPState | knoraSettings.allowReloadOverHTTP)
+      sender() ! (allowReloadOverHTTPState | knoraSettings.allowReloadOverHTTP)
 
     case SetPrintConfigExtendedState(value) =>
       logger.debug("ApplicationStateActor - SetPrintConfigExtendedState - value: {}", value)
       printConfigState = value
 
     case GetPrintConfigExtendedState() =>
       logger.debug("ApplicationStateActor - GetPrintConfigExtendedState - value: {}", printConfigState)
-      sender ! (printConfigState | knoraSettings.printExtendedConfig)
+      sender() ! (printConfigState | knoraSettings.printExtendedConfig)
 
     /* check repository request */
     case CheckTriplestore() =>
@@ -481,11 +481,8 @@ class ApplicationActor extends Actor with Stash with LazyLogging with AroundDire
   def appStart(ignoreRepository: Boolean, requiresIIIFService: Boolean, retryCnt: Int): Unit = {
 
     val bindingFuture: Future[Http.ServerBinding] = Http()
-      .bindAndHandle(
-        Route.handlerFlow(apiRoutes),
-        knoraSettings.internalKnoraApiHost,
-        knoraSettings.internalKnoraApiPort
-      )
+      .newServerAt(knoraSettings.internalKnoraApiHost, knoraSettings.internalKnoraApiPort)
+      .bindFlow(Route.toFlow(apiRoutes))
 
     bindingFuture onComplete {
       case Success(_) =>

webapi/src/main/scala/org/knora/webapi/app/BUILD.bazel

@@ -30,7 +30,6 @@ scala_library(
         "@maven//:com_typesafe_akka_akka_http_2_13",
         "@maven//:com_typesafe_akka_akka_http_core_2_13",
         "@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
-        "@maven//:com_typesafe_akka_akka_parsing_2_13",
         "@maven//:com_typesafe_akka_akka_stream_2_13",
         "@maven//:com_typesafe_config",
         "@maven//:com_typesafe_scala_logging_scala_logging_2_13",