commit f42f4dcade86a15d53c7a11efe3a12f2079ca164
author Andy Seaborne <andy@apache.org> Thu Oct 12 15:02:55 2023 +0100
committer Andy Seaborne <andy@apache.org> Thu Nov 02 09:42:22 2023 +0000
tree 216d8eb0cc7188992722f3596c66e141239babb2
parent ec83436844f50c321c81a5807c121729c1b5441a

Use pattern matching instanceof

jena-shacl/src/main/java/org/apache/jena/shacl/engine/ShaclPaths.java

diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/ShaclPaths.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/ShaclPaths.java
index 72ad395..80ae726 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/ShaclPaths.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/ShaclPaths.java
@@ -77,9 +77,9 @@
     }
 
     private static Iterator<Node> pathReachIter(Graph graph, Node node, Path path) {
-        if ( path instanceof P_Link ) {
+        if ( path instanceof P_Link pLink ) {
             // Fast path common case.
-            Node p = ((P_Link)path).getNode();
+            Node p = pLink.getNode();
             // Not an extended iterator.
             return G.iterSP(graph, node, p);
         }
@@ -209,8 +209,8 @@
 
 
     public static Node pathNode(Path path) {
-        if ( path instanceof P_Link ) {
-            return ((P_Link)path).getNode();
+        if ( path instanceof P_Link pLink ) {
+            return pLink.getNode();
         }
         return null;
     }

jena-shacl/src/main/java/org/apache/jena/shacl/lib/ShLib.java

diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/lib/ShLib.java b/jena-shacl/src/main/java/org/apache/jena/shacl/lib/ShLib.java
index 96bc6f2..2b7a7fc 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/lib/ShLib.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/lib/ShLib.java
@@ -124,7 +124,9 @@
     }
 
     public static void printReport(OutputStream output , ValidationReport report) {
-        PrintStream out = output instanceof PrintStream pStream ? pStream : new PrintStream(output);
+        PrintStream out = (output instanceof PrintStream pStream)
+                ? pStream
+                : new PrintStream(output);
         if ( report.conforms() ) {
             out.println("Conforms");
             out.flush();