0.9.0

sparna-git · Jan 25, 2025 · 2d9159f · 2d9159f
1 parent 1c25759
commit 2d9159f
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 42 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>      
   <groupId>fr.sparna.rdf.shacl</groupId>      
   <artifactId>shacl-play-root-pom</artifactId>      
-  <version>0.8.1</version>      
+  <version>0.9.0</version>      
   <packaging>pom</packaging>
 
   <!-- https://maven.apache.org/pom.html#distribution-management-->

diff --git a/shacl-commons/pom.xml b/shacl-commons/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>fr.sparna.rdf.shacl</groupId>
 		<artifactId>shacl-play-root-pom</artifactId>
-		<version>0.8.1</version>
+		<version>0.9.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/shacl-diagram/pom.xml b/shacl-diagram/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>fr.sparna.rdf.shacl</groupId>
     <artifactId>shacl-play-root-pom</artifactId>
-    <version>0.8.1</version>
+    <version>0.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -66,7 +66,7 @@
 	<dependency>
       <groupId>fr.sparna.rdf.shacl</groupId>
       <artifactId>shacl-commons</artifactId>
-      <version>0.8.1</version>
+      <version>0.9.0</version>
     </dependency>
 
 	</dependencies>

diff --git a/shacl-doc/pom.xml b/shacl-doc/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>fr.sparna.rdf.shacl</groupId>
 		<artifactId>shacl-play-root-pom</artifactId>
-		<version>0.8.1</version>
+		<version>0.9.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -108,14 +108,14 @@
 		<dependency>
 			<groupId>fr.sparna.rdf.shacl</groupId>
 			<artifactId>shacl-diagram</artifactId>
-			<version>0.8.1</version>
+			<version>0.9.0</version>
 		</dependency>
 
 		<!-- SHACL generation -->
 		<dependency>
 			<groupId>fr.sparna.rdf.shacl</groupId>
 			<artifactId>shacl-generate</artifactId>
-			<version>0.8.1</version>
+			<version>0.9.0</version>
 		</dependency>
 
 		<!-- PDF -->

diff --git a/shacl-doc/src/main/java/fr/sparna/rdf/shacl/doc/read/PropertyShapeDocumentationBuilder.java b/shacl-doc/src/main/java/fr/sparna/rdf/shacl/doc/read/PropertyShapeDocumentationBuilder.java
@@ -142,6 +142,19 @@ public Link selectExpectedValueAsLink(
 
 		if (shHasValue != null) {
 			l = buildLink(shHasValue);
+		// sh:node has precedence over sh:class
+		} else if (shNode != null) {
+			for(NodeShape aBox : allNodeShapes) {
+				// using toString instead of getURI so that it works with anonymous nodeshapes
+				if(aBox.getNodeShape().toString().equals(shNode.toString())) {
+					l = new Link(aBox.getShortFormOrId(), aBox.getDisplayLabel(owlGraph, lang));
+					break;
+				}
+			}
+			// default link if shape not found
+			if(l == null) {
+				l = buildLink(shNode);
+			}
 		} else if (shClass != null) {
 			for(NodeShape aNodeShape : allNodeShapes) {
 				if(aNodeShape.getShTargetClass() != null && findShClassInShTargetClass(aNodeShape.getShTargetClass(),shClass.getURI())) {
@@ -159,18 +172,6 @@ public Link selectExpectedValueAsLink(
 			if(l == null) {
 				l = buildLink(shClass);
 			}
-		} else if (shNode != null) {
-			for(NodeShape aBox : allNodeShapes) {
-				// using toString instead of getURI so that it works with anonymous nodeshapes
-				if(aBox.getNodeShape().toString().equals(shNode.toString())) {
-					l = new Link(aBox.getShortFormOrId(), aBox.getDisplayLabel(owlGraph, lang));
-					break;
-				}
-			}
-			// default link if shape not found
-			if(l == null) {
-				l = buildLink(shNode);
-			}
 		} else if (shDatatype != null) {
 			if(
 				!shDatatype.asResource().getURI().startsWith(XSD.NS)

diff --git a/shacl-doc/src/main/resources/doc2html.xsl b/shacl-doc/src/main/resources/doc2html.xsl
@@ -1217,7 +1217,7 @@
 		<xsl:choose>
 			<xsl:when test="expectedValue[href/text()]">
 				<code>
-					<a href="{expectedValue/href}"><xsl:value-of select="expectedValue/label" /></a>
+					<a href="#{expectedValue/href}"><xsl:value-of select="expectedValue/label" /></a>
 				</code>
 			</xsl:when>
 			<xsl:when test="./or/or">

diff --git a/shacl-generate/pom.xml b/shacl-generate/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>fr.sparna.rdf.shacl</groupId>
 		<artifactId>shacl-play-root-pom</artifactId>
-		<version>0.8.1</version>
+		<version>0.9.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -75,7 +75,7 @@
 	    <dependency>
           <groupId>fr.sparna.rdf.shacl</groupId>
           <artifactId>shacl-commons</artifactId>
-          <version>0.8.1</version>
+          <version>0.9.0</version>
         </dependency>
 
 	</dependencies>

diff --git a/shacl-play-app/pom.xml b/shacl-play-app/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>fr.sparna.rdf.shacl</groupId>
     <artifactId>shacl-play-root-pom</artifactId>
-    <version>0.8.1</version>
+    <version>0.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -102,37 +102,37 @@
     <dependency>
       <groupId>fr.sparna.rdf.shacl</groupId>
       <artifactId>shacl-validator</artifactId>
-      <version>0.8.1</version>
+      <version>0.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>fr.sparna.rdf.shacl</groupId>
       <artifactId>shacl-printer</artifactId>
-      <version>0.8.1</version>
+      <version>0.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>fr.sparna.rdf.shacl</groupId>
       <artifactId>shacl-diagram</artifactId>
-      <version>0.8.1</version>
+      <version>0.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>fr.sparna.rdf.shacl</groupId>
       <artifactId>shacl-sparql-query-gen</artifactId>
-      <version>0.8.1</version>
+      <version>0.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>fr.sparna.rdf.shacl</groupId>
       <artifactId>shacl-doc</artifactId>
-      <version>0.8.1</version>
+      <version>0.9.0</version>
     </dependency>
 
     <dependency>
     	<groupId>fr.sparna.rdf.shacl</groupId>
     	<artifactId>shacl-generate</artifactId>
-    	<version>0.8.1</version>
+    	<version>0.9.0</version>
     </dependency>
 
 	</dependencies>

diff --git a/shacl-play/pom.xml b/shacl-play/pom.xml
@@ -3,14 +3,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fr.sparna.rdf.shacl</groupId>
 	<artifactId>shacl-play</artifactId>
-	<version>0.8.1</version>
+	<version>0.9.0</version>
 	<packaging>war</packaging>
     <name>SHACL Play</name>
 
     <parent>
         <groupId>fr.sparna.rdf.shacl</groupId>
         <artifactId>shacl-play-root-pom</artifactId>
-        <version>0.8.1</version>
+        <version>0.9.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -129,37 +129,37 @@
 		<dependency>
           <groupId>fr.sparna.rdf.shacl</groupId>
           <artifactId>shacl-validator</artifactId>
-          <version>0.8.1</version>
+          <version>0.9.0</version>
         </dependency>
 
         <dependency>
           <groupId>fr.sparna.rdf.shacl</groupId>
           <artifactId>shacl-printer</artifactId>
-          <version>0.8.1</version>
+          <version>0.9.0</version>
         </dependency>
 
         <dependency>
           <groupId>fr.sparna.rdf.shacl</groupId>
           <artifactId>shacl-diagram</artifactId>
-          <version>0.8.1</version>
+          <version>0.9.0</version>
         </dependency>
 
         <dependency>
           <groupId>fr.sparna.rdf.shacl</groupId>
           <artifactId>shacl-doc</artifactId>
-          <version>0.8.1</version>
+          <version>0.9.0</version>
         </dependency>
 
         <dependency>
           <groupId>fr.sparna.rdf.shacl</groupId>
           <artifactId>shacl-sparql-query-gen</artifactId>
-          <version>0.8.1</version>
+          <version>0.9.0</version>
         </dependency>
 
 		<dependency>
 			<groupId>fr.sparna.rdf.shacl</groupId>
 			<artifactId>shacl-generate</artifactId>
-			<version>0.8.1</version>
+			<version>0.9.0</version>
 		</dependency>
 
         <!-- Jackson -->

diff --git a/shacl-play/src/main/java/fr/sparna/rdf/shacl/shaclplay/doc/DocController.java b/shacl-play/src/main/java/fr/sparna/rdf/shacl/shaclplay/doc/DocController.java
@@ -75,7 +75,7 @@ public ModelAndView docUrl(
 			// includeDiagram option
 			@RequestParam(value="includeDiagram", required=false) boolean includeDiagram,
 			// includeDiagram option
-			@RequestParam(value="includeSectionDiagram", required=false) boolean includeSectionDiagram,
+			@RequestParam(value="includeSectionDiagram", required=false, defaultValue = "true") boolean includeSectionDiagram,
 			// hide Properties
 			@RequestParam(value="hideProperties", required=false) boolean hideProperties,
 			// List Option

diff --git a/shacl-printer/pom.xml b/shacl-printer/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>fr.sparna.rdf.shacl</groupId>
     <artifactId>shacl-play-root-pom</artifactId>
-    <version>0.8.1</version>
+    <version>0.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -67,7 +67,7 @@
 	<dependency>
       <groupId>fr.sparna.rdf.shacl</groupId>
       <artifactId>shacl-commons</artifactId>
-      <version>0.8.1</version>
+      <version>0.9.0</version>
     </dependency>
 
 

diff --git a/shacl-sparql-query-gen/pom.xml b/shacl-sparql-query-gen/pom.xml
@@ -8,7 +8,7 @@
 	  <parent>
 	    <groupId>fr.sparna.rdf.shacl</groupId>
 	    <artifactId>shacl-play-root-pom</artifactId>
-	    <version>0.8.1</version>
+	    <version>0.9.0</version>
 	    <relativePath>../pom.xml</relativePath>
 	  </parent>
 

diff --git a/shacl-validator/pom.xml b/shacl-validator/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>fr.sparna.rdf.shacl</groupId>
 		<artifactId>shacl-play-root-pom</artifactId>
-	  <version>0.8.1</version>
+	  <version>0.9.0</version>
     <relativePath>../pom.xml</relativePath>
 	</parent>