From 147aeb933bb00f3fb7b5c127d08832f1de4a4844 Mon Sep 17 00:00:00 2001
From: Dragos0000 <dragos.paun0000@gmail.com>
Date: Tue, 16 May 2023 15:55:33 +0100
Subject: [PATCH 1/2] Union of multiple domains and ranges for properties +
 Some URIs are generated as short URIs

---
 .../connectors-reasoning-layer.xsl            | 43 +++++++++++++------
 .../connectors-shacl-shape.xsl                |  2 +-
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/reasoning-layer-lib/connectors-reasoning-layer.xsl b/src/reasoning-layer-lib/connectors-reasoning-layer.xsl
index 68dce88d..2ebb1d23 100644
--- a/src/reasoning-layer-lib/connectors-reasoning-layer.xsl
+++ b/src/reasoning-layer-lib/connectors-reasoning-layer.xsl
@@ -146,12 +146,21 @@
             <rdf:Description rdf:about="{$targetRoleURI}">
                 <rdfs:domain>
                     <owl:Class>
-                        <owl:unionOf rdf:parseType="Collection">
-                            <xsl:for-each select="$domains">
-                                <rdf:Description
-                                    rdf:about="{f:buildURIfromLexicalQName(.)}"/>
-                            </xsl:for-each>
-                        </owl:unionOf>
+                        <xsl:choose>
+                            <xsl:when test="fn:count($domains) > 1">
+                                <owl:unionOf rdf:parseType="Collection">
+                                    <xsl:for-each select="$domains">
+                                        <rdf:Description
+                                            rdf:about="{f:buildURIfromLexicalQName(.)}"/>
+                                    </xsl:for-each>
+                                </owl:unionOf>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:for-each select="$domains">
+                                    <rdf:domain rdf:resource="{f:buildURIfromLexicalQName(.)}"/>
+                                </xsl:for-each>
+                            </xsl:otherwise>
+                        </xsl:choose>
                     </owl:Class>
                 </rdfs:domain>
             </rdf:Description>
@@ -197,14 +206,22 @@
                     select="functx:value-union($targetRanges, $sourceRanges)"/>
                 <rdf:Description rdf:about="{$targetRoleURI}">
                     <rdfs:range>
-                        <owl:Class>
-                            <owl:unionOf rdf:parseType="Collection">
+                    <owl:Class>
+                        <xsl:choose>
+                            <xsl:when test="fn:count($ranges) > 1">
+                                <owl:unionOf rdf:parseType="Collection">
+                                    <xsl:for-each select="$ranges">
+                                        <rdf:Description rdf:about="{f:buildURIfromLexicalQName(.)}"/>
+                                    </xsl:for-each>
+                                </owl:unionOf>
+                            </xsl:when>
+                            <xsl:otherwise>
                                 <xsl:for-each select="$ranges">
-                                    <rdf:Description
-                                        rdf:about="{f:buildURIfromLexicalQName(.)}"/>
+                                    <rdfs:range rdf:about="{f:buildURIfromLexicalQName(.)}"/>
                                 </xsl:for-each>
-                            </owl:unionOf>
-                        </owl:Class>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </owl:Class>
                     </rdfs:range>
                 </rdf:Description>
             </xsl:if>
@@ -231,7 +248,7 @@
 
             <rdf:Description rdf:about="{$targetRoleURI}">
                 <rdfs:range
-                    rdf:resource="skos:Concept"
+                    rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"
                 />
             </rdf:Description>
        
diff --git a/src/shacl-shape-lib/connectors-shacl-shape.xsl b/src/shacl-shape-lib/connectors-shacl-shape.xsl
index c629af24..ce316cf2 100644
--- a/src/shacl-shape-lib/connectors-shacl-shape.xsl
+++ b/src/shacl-shape-lib/connectors-shacl-shape.xsl
@@ -180,7 +180,7 @@
             <sh:NodeShape rdf:about="{$targetRoleURI}">
                 <sh:property>
                     <sh:PropertyShape>
-                        <sh:path rdf:resource="skos:inScheme"/>
+                        <sh:path rdf:resource="http://www.w3.org/2004/02/skos/core#inScheme"/>
                         <sh:hasValue rdf:resource="{$targetClassURI}"/>
                     </sh:PropertyShape>
                 </sh:property>

From b27c7fbda69a3f6ea122feab48ebf3e1c1ae19c2 Mon Sep 17 00:00:00 2001
From: Dragos0000 <dragos.paun0000@gmail.com>
Date: Tue, 16 May 2023 16:02:45 +0100
Subject: [PATCH 2/2] fix tests

---
 .../test-connectors-reasoning-layer.xspec                       | 2 +-
 .../test-shacl-shape-lib/test-connectors-shacl-shape.xspec      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/unitTests/test-reasoning-layer-lib/test-connectors-reasoning-layer.xspec b/test/unitTests/test-reasoning-layer-lib/test-connectors-reasoning-layer.xspec
index 145fb254..f4ebbc68 100644
--- a/test/unitTests/test-reasoning-layer-lib/test-connectors-reasoning-layer.xspec
+++ b/test/unitTests/test-reasoning-layer-lib/test-connectors-reasoning-layer.xspec
@@ -207,7 +207,7 @@
         </x:call>   
         <x:expect label="there is a rdf:Description" test="boolean(rdf:Description) "/>
         <x:expect label="there is a rdfs:range" test="boolean(rdf:Description/rdfs:range)"/>
-        <x:expect label="range is skos:Concept" test="rdf:Description/rdfs:range/@rdf:resource = 'skos:Concept'"/>
+        <x:expect label="range is skos:Concept" test="rdf:Description/rdfs:range/@rdf:resource = 'http://www.w3.org/2004/02/skos/core#Concept'"/>
     </x:scenario>
 
     
diff --git a/test/unitTests/test-shacl-shape-lib/test-connectors-shacl-shape.xspec b/test/unitTests/test-shacl-shape-lib/test-connectors-shacl-shape.xspec
index a6e31a81..de66ab59 100644
--- a/test/unitTests/test-shacl-shape-lib/test-connectors-shacl-shape.xspec
+++ b/test/unitTests/test-shacl-shape-lib/test-connectors-shacl-shape.xspec
@@ -173,7 +173,7 @@
         <x:expect label="there is 1 sh:property" test="count(sh:NodeShape/sh:property) = 1"/>
         <x:expect label="there is 1 sh:PropertyShape" test="count(sh:NodeShape/sh:property/sh:PropertyShape) = 1"/>
         <x:expect label="there is 1 sh:path" test="count(sh:NodeShape/sh:property/sh:PropertyShape/sh:path) = 1"/>
-        <x:expect label="there is sh:path = skos:inScheme" test="sh:NodeShape/sh:property/sh:PropertyShape/sh:path/@rdf:resource = 'skos:inScheme'"/>
+        <x:expect label="there is sh:path = skos:inScheme" test="sh:NodeShape/sh:property/sh:PropertyShape/sh:path/@rdf:resource = 'http://www.w3.org/2004/02/skos/core#inScheme'"/>
         <x:expect label="there is 1 sh:hasValue" test="count(sh:NodeShape/sh:property/sh:PropertyShape/sh:hasValue) = 1"/>
     </x:scenario>
 </x:description>