This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 3d339cd51e GH-1592 change ShexMap to ShapeMap
new 68614c0f20 Merge pull request #1589 from
fhircat/rename_ShExMap_to_ShapeMap_2
3d339cd51e is described below
commit 3d339cd51e2b9e07486089d69cab7408c962e104
Author: Eric Prud'hommeaux <[email protected]>
AuthorDate: Sat Oct 15 14:46:14 2022 +0200
GH-1592 change ShexMap to ShapeMap
per http://shex.io/shape-map/#shapemap-structure
(ShExMap is a different concept.)
---
jena-cmds/src/main/java/shex/shex_validate.java | 2 +-
.../java/shex/examples/Shex01_validateGraph.java | 6 +--
.../java/shex/examples/Shex02_validateNode.java | 4 +-
.../main/java/shex/examples/Shex03_validate.java | 4 +-
.../examples/{shape-map.shexmap => shape-map.smap} | 0
.../jena/shex/{ShexMap.java => ShapeMap.java} | 20 +++----
.../src/main/java/org/apache/jena/shex/Shex.java | 14 ++---
.../java/org/apache/jena/shex/ShexMapBuilder.java | 61 ----------------------
.../main/java/org/apache/jena/shex/ShexRecord.java | 2 +-
.../java/org/apache/jena/shex/ShexValidator.java | 4 +-
.../org/apache/jena/shex/parser/ParserShExC.java | 6 +--
.../java/org/apache/jena/shex/parser/ShExC.java | 14 ++---
.../java/org/apache/jena/shex/parser/ShExJ.java | 6 +--
.../apache/jena/shex/sys/ShexValidatorImpl.java | 4 +-
.../apache/jena/shex/TestShexShapeMapSyntax.java | 8 +--
.../jena/shex/runner/ShexValidationTest.java | 2 +-
16 files changed, 48 insertions(+), 109 deletions(-)
diff --git a/jena-cmds/src/main/java/shex/shex_validate.java
b/jena-cmds/src/main/java/shex/shex_validate.java
index 3478413991..300751b81b 100644
--- a/jena-cmds/src/main/java/shex/shex_validate.java
+++ b/jena-cmds/src/main/java/shex/shex_validate.java
@@ -137,7 +137,7 @@ public class shex_validate extends CmdGeneral {
// }
if ( mapfile != null ) {
- ShexMap map;
+ ShapeMap map;
try {
map = Shex.readShapeMap(mapfile);
} catch (ShexException ex) {
diff --git
a/jena-examples/src/main/java/shex/examples/Shex01_validateGraph.java
b/jena-examples/src/main/java/shex/examples/Shex01_validateGraph.java
index 7ece36faee..857e72819b 100644
--- a/jena-examples/src/main/java/shex/examples/Shex01_validateGraph.java
+++ b/jena-examples/src/main/java/shex/examples/Shex01_validateGraph.java
@@ -24,13 +24,13 @@ import org.apache.jena.riot.RDFDataMgr;
import org.apache.jena.shex.*;
import org.apache.jena.shex.sys.ShexLib;
-/** Read data, ShEx schema and ShEx map, then validate */
+/** Read data, ShEx schema and shape map, then validate */
public class Shex01_validateGraph {
static { LogCtl.setLogging(); }
public static void main(String ...args) {
String SHAPES = "examples/schema.shex";
- String SHAPES_MAP = "examples/shape-map.shexmap";
+ String SHAPES_MAP = "examples/shape-map.smap";
String DATA = "examples/data.ttl";
System.out.println("Read data");
@@ -41,7 +41,7 @@ public class Shex01_validateGraph {
// Shapes map.
System.out.println("Read shapes map");
- ShexMap shapeMap = Shex.readShapeMap(SHAPES_MAP);
+ ShapeMap shapeMap = Shex.readShapeMap(SHAPES_MAP);
// ShexReport
System.out.println("Validate");
diff --git a/jena-examples/src/main/java/shex/examples/Shex02_validateNode.java
b/jena-examples/src/main/java/shex/examples/Shex02_validateNode.java
index 814266ac7f..4e0576aa2a 100644
--- a/jena-examples/src/main/java/shex/examples/Shex02_validateNode.java
+++ b/jena-examples/src/main/java/shex/examples/Shex02_validateNode.java
@@ -32,7 +32,7 @@ public class Shex02_validateNode {
public static void main(String ...args) {
String SHAPES = "examples/schema.shex";
- String SHAPES_MAP = "examples/shape-map.shexmap";
+ String SHAPES_MAP = "examples/shape-map.smap";
String DATA = "examples/data.ttl";
System.out.println("Read data");
@@ -43,7 +43,7 @@ public class Shex02_validateNode {
// Shapes map.
System.out.println("Read shapes map");
- ShexMap shapeMap = Shex.readShapeMap(SHAPES_MAP);
+ ShapeMap shapeMap = Shex.readShapeMap(SHAPES_MAP);
Node data1 = NodeFactory.createURI("http://example/x";);
Node data2 = NodeFactory.createURI("http://example/s";);
diff --git a/jena-examples/src/main/java/shex/examples/Shex03_validate.java
b/jena-examples/src/main/java/shex/examples/Shex03_validate.java
index 543d545944..9a0780c29d 100644
--- a/jena-examples/src/main/java/shex/examples/Shex03_validate.java
+++ b/jena-examples/src/main/java/shex/examples/Shex03_validate.java
@@ -47,12 +47,12 @@ public class Shex03_validate {
Triple instancesOfFoo = Triple.create(Shex.FOCUS, RDF.type.asNode(),
myClass);
Node shape1 = NodeFactory.createURI("http://example/shapes#shape1";);
- ShexMap shapeMap = ShexMap.newBuilder()
+ ShapeMap shapeMap = ShapeMap.newBuilder()
.add(instancesOfFoo, shape1)
.build();
// Equivalent helper for map with one ShapeMap entry
- ShexMap shapeMapAlt = ShexMap.record(instancesOfFoo, shape1);
+ ShapeMap shapeMapAlt = ShapeMap.record(instancesOfFoo, shape1);
// Validate
System.out.println();
diff --git a/jena-shex/examples/shape-map.shexmap
b/jena-shex/examples/shape-map.smap
similarity index 100%
rename from jena-shex/examples/shape-map.shexmap
rename to jena-shex/examples/shape-map.smap
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/ShexMap.java
b/jena-shex/src/main/java/org/apache/jena/shex/ShapeMap.java
similarity index 81%
rename from jena-shex/src/main/java/org/apache/jena/shex/ShexMap.java
rename to jena-shex/src/main/java/org/apache/jena/shex/ShapeMap.java
index 62ea84c6d7..e56e116132 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/ShexMap.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/ShapeMap.java
@@ -29,16 +29,16 @@ import org.apache.jena.graph.Triple;
* <a href="https://shexspec.github.io/shape-map/";>ShEx shape map</a> used for
both
* targeting validation and reporting violations.
*/
-public class ShexMap {
+public class ShapeMap {
protected final List<ShexRecord> associations;
- public static ShexMap create(List<ShexRecord> associations) {
+ public static ShapeMap create(List<ShexRecord> associations) {
associations = new ArrayList<>(associations);
- return new ShexMap(associations);
+ return new ShapeMap(associations);
}
- private ShexMap(List<ShexRecord> associations) {
+ private ShapeMap(List<ShexRecord> associations) {
this.associations = associations;
}
@@ -46,15 +46,15 @@ public class ShexMap {
return Collections.unmodifiableList(associations);
}
- public static ShexMap.Builder newBuilder() {
+ public static Builder newBuilder() {
return new Builder();
}
- public static ShexMap record(Node focus, Node shapeRef) {
+ public static ShapeMap record(Node focus, Node shapeRef) {
return new Builder().add(focus, shapeRef).build();
}
- public static ShexMap record(Triple pattern, Node shapeRef) {
+ public static ShapeMap record(Triple pattern, Node shapeRef) {
return new Builder().add(pattern, shapeRef).build();
}
@@ -64,7 +64,7 @@ public class ShexMap {
Builder() {}
- Builder(ShexMap base) {
+ Builder(ShapeMap base) {
base.entries().forEach(records::add);
}
@@ -78,9 +78,9 @@ public class ShexMap {
return this;
}
- public ShexMap build() {
+ public ShapeMap build() {
// Copies argument.
- ShexMap map = ShexMap.create(records);
+ ShapeMap map = ShapeMap.create(records);
records.clear();
return map;
}
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/Shex.java
b/jena-shex/src/main/java/org/apache/jena/shex/Shex.java
index 5d67c03dd8..f7c8a8d25b 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/Shex.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/Shex.java
@@ -183,7 +183,7 @@ public class Shex {
* @param filename
* @return ShexShapeMap
*/
- public static ShexMap readShapeMap(String filename) {
+ public static ShapeMap readShapeMap(String filename) {
return readShapeMap(filename, IRILib.filenameToIRI(filename));
}
@@ -193,7 +193,7 @@ public class Shex {
* @param baseURI
* @return ShexShapeMap
*/
- public static ShexMap readShapeMap(String filename, String baseURI) {
+ public static ShapeMap readShapeMap(String filename, String baseURI) {
InputStream input = IO.openFile(filename);
return readShapeMap(input, baseURI);
}
@@ -204,7 +204,7 @@ public class Shex {
* @param baseURI
* @return ShexShapeMap
*/
- public static ShexMap readShapeMap(InputStream input, String baseURI) {
+ public static ShapeMap readShapeMap(InputStream input, String baseURI) {
return ShExC.parseShapeMap(input, baseURI);
}
@@ -214,12 +214,12 @@ public class Shex {
* @param baseURI
* @return ShexShapeMap
*/
- public static ShexMap shapeMapFromString(String inputStr, String baseURI) {
+ public static ShapeMap shapeMapFromString(String inputStr, String baseURI)
{
return ShExC.parseShapeMap(new StringReader(inputStr), baseURI);
}
- /** Read a {@link ShexMap} from a file or URL. */
- public static ShexMap readShapeMapJson(String filenameOrURL) {
+ /** Read a {@link ShapeMap} from a file or URL. */
+ public static ShapeMap readShapeMapJson(String filenameOrURL) {
TypedInputStream in = RDFDataMgr.open(filenameOrURL);
return readShapeMapJson(in.getInputStream());
}
@@ -229,7 +229,7 @@ public class Shex {
* @param input
* @return ShexShapeMap
*/
- public static ShexMap readShapeMapJson(InputStream input) {
+ public static ShapeMap readShapeMapJson(InputStream input) {
return ShExJ.readShapeMapJson(input);
}
}
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/ShexMapBuilder.java
b/jena-shex/src/main/java/org/apache/jena/shex/ShexMapBuilder.java
deleted file mode 100644
index 83476c53ca..0000000000
--- a/jena-shex/src/main/java/org/apache/jena/shex/ShexMapBuilder.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.shex;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.Triple;
-
-public class ShexMapBuilder {
-
- private List<ShexRecord> records = new ArrayList<>();
-
- public static ShexMap record(Node focus, Node shapeRef) {
- return new ShexMapBuilder().add(focus, shapeRef).build();
- }
-
- public static ShexMap record(Triple pattern, Node shapeRef) {
- return new ShexMapBuilder().add(pattern, shapeRef).build();
- }
-
- public ShexMapBuilder() {}
-
- public ShexMapBuilder(ShexMap base) {
- base.entries().forEach(records::add);
- }
-
- public ShexMapBuilder add(Node focus, Node shapeRef) {
- records.add(new ShexRecord(focus, shapeRef));
- return this;
- }
-
- public ShexMapBuilder add(Triple pattern, Node shapeRef) {
- records.add(new ShexRecord(pattern, shapeRef));
- return this;
- }
-
- public ShexMap build() {
- // Copies argument.
- ShexMap map = ShexMap.create(records);
- records.clear();
- return map;
- }
-}
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/ShexRecord.java
b/jena-shex/src/main/java/org/apache/jena/shex/ShexRecord.java
index 2ab60fd666..defd0f3bc7 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/ShexRecord.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/ShexRecord.java
@@ -24,7 +24,7 @@ import org.apache.jena.shex.sys.ShexLib;
import org.apache.jena.shex.sys.SysShex;
/**
- * {@code ShexShapeRecord} is an entry in a {@linkplain ShexMap} used for both
targeting shapes and reporting violations.
+ * {@code ShexShapeRecord} is an entry in a {@linkplain ShapeMap} used for
both targeting shapes and reporting violations.
*/
public class ShexRecord {
// node: an RDF node, or a triple pattern which is used to select RDF nodes.
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/ShexValidator.java
b/jena-shex/src/main/java/org/apache/jena/shex/ShexValidator.java
index b136061aec..8dee14a1e1 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/ShexValidator.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/ShexValidator.java
@@ -28,7 +28,7 @@ public interface ShexValidator {
public static ShexValidator get() { return SysShex.get();}
/** Validate data using a collection of shapes and a shape map */
- public ShexReport validate(Graph graph, ShexSchema shapes, ShexMap
shapeMap);
+ public ShexReport validate(Graph graph, ShexSchema shapes, ShapeMap
shapeMap);
/** Validate a specific node (the focus), with a specific shape in a set
of shapes. */
public ShexReport validate(Graph graphData, ShexSchema shapes, Node
shapeRef, Node focus);
@@ -37,5 +37,5 @@ public interface ShexValidator {
public ShexReport validate(Graph graphData, ShexSchema shapes, ShexShape
shape, Node focus);
/** Validate a specific node using the shape map to determine which shapes
to use. */
- public ShexReport validate(Graph dataGraph, ShexSchema shapes, ShexMap
shapeMap, Node dataNode);
+ public ShexReport validate(Graph dataGraph, ShexSchema shapes, ShapeMap
shapeMap, Node dataNode);
}
diff --git
a/jena-shex/src/main/java/org/apache/jena/shex/parser/ParserShExC.java
b/jena-shex/src/main/java/org/apache/jena/shex/parser/ParserShExC.java
index 420b722096..0c91e367d8 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/parser/ParserShExC.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/parser/ParserShExC.java
@@ -36,7 +36,7 @@ import org.apache.jena.irix.IRIs;
import org.apache.jena.riot.RiotException;
import org.apache.jena.riot.lang.extra.LangParserBase;
import org.apache.jena.riot.lang.extra.LangParserLib;
-import org.apache.jena.shex.ShexMap;
+import org.apache.jena.shex.ShapeMap;
import org.apache.jena.shex.ShexRecord;
import org.apache.jena.shex.ShexSchema;
import org.apache.jena.shex.ShexShape;
@@ -837,8 +837,8 @@ public class ParserShExC extends LangParserBase {
public void parseShapeMapStart() {}
- public ShexMap parseShapeMapFinish() {
- return ShexMap.create(associations);
+ public ShapeMap parseShapeMapFinish() {
+ return ShapeMap.create(associations);
}
protected Triple createTriple(Node s, Node p, Node o, int line, int
column) {
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/parser/ShExC.java
b/jena-shex/src/main/java/org/apache/jena/shex/parser/ShExC.java
index 2d2270878f..16c0f985ab 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/parser/ShExC.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/parser/ShExC.java
@@ -31,7 +31,7 @@ import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.irix.IRIxResolver;
import org.apache.jena.riot.system.*;
import org.apache.jena.shex.ShexShape;
-import org.apache.jena.shex.ShexMap;
+import org.apache.jena.shex.ShapeMap;
import org.apache.jena.shex.ShexSchema;
import org.apache.jena.shex.expressions.*;
import org.apache.jena.shex.parser.javacc.ParseException;
@@ -115,7 +115,7 @@ public class ShExC {
* @param filename
* @return ShexShapeMap
*/
- public static ShexMap parseShapeMap(String filename) {
+ public static ShapeMap parseShapeMap(String filename) {
return parseShapeMap(filename, IRILib.filenameToIRI(filename));
}
@@ -125,7 +125,7 @@ public class ShExC {
* @param baseURI
* @return ShexShapeMap
*/
- public static ShexMap parseShapeMap(String filename, String baseURI) {
+ public static ShapeMap parseShapeMap(String filename, String baseURI) {
InputStream input = IO.openFile(filename);
return parseShapeMap(input, baseURI);
}
@@ -136,7 +136,7 @@ public class ShExC {
* @param baseURI
* @return ShexShapeMap
*/
- public static ShexMap parseShapeMap(InputStream input, String baseURI) {
+ public static ShapeMap parseShapeMap(InputStream input, String baseURI) {
try ( Reader r = setReader(input) ) {
ShExJavacc parser = new ShExJavacc(r);
return parseShapeMap$(parser, baseURI, null);
@@ -152,7 +152,7 @@ public class ShExC {
* @param baseURI
* @return ShexShapeMap
*/
- public static ShexMap parseShapeMap(StringReader input, String baseURI) {
+ public static ShapeMap parseShapeMap(StringReader input, String baseURI) {
ShExJavacc parser = new ShExJavacc(input);
return parseShapeMap$(parser, baseURI, null);
}
@@ -255,7 +255,7 @@ public class ShExC {
}
}
- private static ShexMap parseShapeMap$(ShExJavacc parser, String baseURI,
Context context) {
+ private static ShapeMap parseShapeMap$(ShExJavacc parser, String baseURI,
Context context) {
ParserProfile profile = new ParserProfileStd(RiotLib.factoryRDF(),
ErrorHandlerFactory.errorHandlerStd,
IRIxResolver.create(baseURI).build(),
@@ -268,7 +268,7 @@ public class ShExC {
try {
parser.parseShapeMapStart();
parser.UnitShapeMap();
- ShexMap map = parser.parseShapeMapFinish();
+ ShapeMap map = parser.parseShapeMapFinish();
return map;
} catch (ParseException ex) {
throw new ShexParseException(ex.getMessage(),
ex.currentToken.beginLine, ex.currentToken.beginColumn);
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/parser/ShExJ.java
b/jena-shex/src/main/java/org/apache/jena/shex/parser/ShExJ.java
index 6fa36ebda7..251faade48 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/parser/ShExJ.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/parser/ShExJ.java
@@ -31,7 +31,7 @@ import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.shex.ShexException;
import org.apache.jena.shex.ShexRecord;
-import org.apache.jena.shex.ShexMap;
+import org.apache.jena.shex.ShapeMap;
/** Shape Expressions : JSON syntax */
public class ShExJ {
@@ -40,7 +40,7 @@ public class ShExJ {
* @param input
* @return ShexShapeMap
*/
- public static ShexMap readShapeMapJson(InputStream input) {
+ public static ShapeMap readShapeMapJson(InputStream input) {
if ( input instanceof BufferedInputStream )
input = new BufferedInputStream(input, 128*1024);
JsonValue x = JSON.parseAny(input);
@@ -52,7 +52,7 @@ public class ShExJ {
ShexRecord a = parseShapeMapEntry(j.getAsObject());
associations.add(a);
});
- return ShexMap.create(associations);
+ return ShapeMap.create(associations);
}
private static ShexRecord parseShapeMapEntry(JsonObject obj) {
diff --git
a/jena-shex/src/main/java/org/apache/jena/shex/sys/ShexValidatorImpl.java
b/jena-shex/src/main/java/org/apache/jena/shex/sys/ShexValidatorImpl.java
index 2b69fab228..278aaadc3f 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/sys/ShexValidatorImpl.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/sys/ShexValidatorImpl.java
@@ -37,7 +37,7 @@ class ShexValidatorImpl implements ShexValidator{
/** Validate data using a collection of shapes and a shape map */
@Override
- public ShexReport validate(Graph dataGraph, ShexSchema shapes, ShexMap
shapeMap) {
+ public ShexReport validate(Graph dataGraph, ShexSchema shapes, ShapeMap
shapeMap) {
Objects.requireNonNull(dataGraph);
Objects.requireNonNull(shapes);
Objects.requireNonNull(shapeMap);
@@ -87,7 +87,7 @@ class ShexValidatorImpl implements ShexValidator{
}
@Override
- public ShexReport validate(Graph dataGraph, ShexSchema shapes, ShexMap
shapeMap, Node focus) {
+ public ShexReport validate(Graph dataGraph, ShexSchema shapes, ShapeMap
shapeMap, Node focus) {
Objects.requireNonNull(shapes);
Objects.requireNonNull(dataGraph);
Objects.requireNonNull(shapeMap);
diff --git
a/jena-shex/src/test/java/org/apache/jena/shex/TestShexShapeMapSyntax.java
b/jena-shex/src/test/java/org/apache/jena/shex/TestShexShapeMapSyntax.java
index 635d02d5d3..c817236f55 100644
--- a/jena-shex/src/test/java/org/apache/jena/shex/TestShexShapeMapSyntax.java
+++ b/jena-shex/src/test/java/org/apache/jena/shex/TestShexShapeMapSyntax.java
@@ -39,7 +39,7 @@ public class TestShexShapeMapSyntax {
,"{FOCUS a <http://schema.example/Some/Type>}@START ,"
,"{_ <http://data.example/p3> FOCUS}@START"
);
- ShexMap map = parseShapeMap(s);
+ ShapeMap map = parseShapeMap(s);
assertNotNull(map);
assertNotNull(map.entries());
assertEquals(4, map.entries().size());
@@ -58,7 +58,7 @@ public class TestShexShapeMapSyntax {
,"{FOCUS a <Some/Type>} @ :Shape"
,"{_ :p3 FOCUS } @START . "
);
- ShexMap map = parseShapeMap(s);
+ ShapeMap map = parseShapeMap(s);
assertNotNull(map);
assertNotNull(map.entries());
assertEquals(4, map.entries().size());
@@ -77,9 +77,9 @@ public class TestShexShapeMapSyntax {
parseShapeMap(s);
}
- private ShexMap parseShapeMap(String s) {
+ private ShapeMap parseShapeMap(String s) {
InputStream input = new
ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8));
- ShexMap shapeMap = ShExC.parseShapeMap(input, null);
+ ShapeMap shapeMap = ShExC.parseShapeMap(input, null);
return shapeMap;
}
}
diff --git
a/jena-shex/src/test/java/org/apache/jena/shex/runner/ShexValidationTest.java
b/jena-shex/src/test/java/org/apache/jena/shex/runner/ShexValidationTest.java
index 1b0057a624..067d342628 100644
---
a/jena-shex/src/test/java/org/apache/jena/shex/runner/ShexValidationTest.java
+++
b/jena-shex/src/test/java/org/apache/jena/shex/runner/ShexValidationTest.java
@@ -43,7 +43,7 @@ public class ShexValidationTest implements Runnable {
private final Node focus;
private final ShexSchema shapes;
private final String shapeMapURI;
- private final ShexMap shapeMap;
+ private final ShapeMap shapeMap;
private final boolean positiveTest;
private final boolean verbose = false;
