Skip to content

Commit afcfc0f

Browse files
committed
GH-0000 Fix SHACL template defaults
1 parent e8b500f commit afcfc0f

3 files changed

Lines changed: 30 additions & 12 deletions

File tree

core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/memory-shacl.ttl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
config:sail.impl [
1313
config:sail.type "rdf4j:ShaclSail" ;
1414
config:shacl.parallelValidation {%Parallel validation|true|false%} ;
15-
config:shacl.logValidationPlans {%Log validation plans|true|false%} ;
16-
config:shacl.logValidationViolations {%Log validation violations|true|false%} ;
15+
config:shacl.logValidationPlans {%Log validation plans|false|true%} ;
16+
config:shacl.logValidationViolations {%Log validation violations|false|true%} ;
1717
config:shacl.validationEnabled {%Validation enabled|true|false%} ;
1818
config:shacl.cacheSelectNodes {%Cache select nodes|true|false%} ;
19-
config:shacl.globalLogValidationExecution {%Global log validation execution|true|false%} ;
19+
config:shacl.globalLogValidationExecution {%Global log validation execution|false|true%} ;
2020
config:shacl.rdfsSubClassReasoning {%RDFS subclass reasoning|true|false%} ;
21-
config:shacl.performanceLogging {%Performance logging|true|false%} ;
21+
config:shacl.performanceLogging {%Performance logging|false|true%} ;
2222
config:shacl.serializableValidation {%Serializable validation|true|false%} ;
23-
config:shacl.eclipseRdf4jShaclExtensions {%Eclipse RDF4J SHACL extensions|true|false%} ;
24-
config:shacl.dashDataShapes {%DASH data shapes|true|false%} ;
23+
config:shacl.eclipseRdf4jShaclExtensions {%Eclipse RDF4J SHACL extensions|false|true%} ;
24+
config:shacl.dashDataShapes {%DASH data shapes|false|true%} ;
2525
config:shacl.validationResultsLimitTotal {%Validation results limit total|1000000%} ;
2626
config:shacl.validationResultsLimitPerConstraint {%Validation results limit per constraint|1000%} ;
2727
config:shacl.transactionalValidationLimit {%Transactional validation limit|500000%} ;

core/repository/api/src/main/resources/org/eclipse/rdf4j/repository/config/native-shacl.ttl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
config:sail.impl [
1414
config:sail.type "rdf4j:ShaclSail" ;
1515
config:shacl.parallelValidation {%Parallel validation|true|false%} ;
16-
config:shacl.logValidationPlans {%Log validation plans|true|false%} ;
17-
config:shacl.logValidationViolations {%Log validation violations|true|false%} ;
16+
config:shacl.logValidationPlans {%Log validation plans|false|true%} ;
17+
config:shacl.logValidationViolations {%Log validation violations|false|true%} ;
1818
config:shacl.validationEnabled {%Validation enabled|true|false%} ;
1919
config:shacl.cacheSelectNodes {%Cache select nodes|true|false%} ;
20-
config:shacl.globalLogValidationExecution {%Global log validation execution|true|false%} ;
20+
config:shacl.globalLogValidationExecution {%Global log validation execution|false|true%} ;
2121
config:shacl.rdfsSubClassReasoning {%RDFS subclass reasoning|true|false%} ;
22-
config:shacl.performanceLogging {%Performance logging|true|false%} ;
22+
config:shacl.performanceLogging {%Performance logging|false|true%} ;
2323
config:shacl.serializableValidation {%Serializable validation|true|false%} ;
24-
config:shacl.eclipseRdf4jShaclExtensions {%Eclipse RDF4J SHACL extensions|true|false%} ;
25-
config:shacl.dashDataShapes {%DASH data shapes|true|false%} ;
24+
config:shacl.eclipseRdf4jShaclExtensions {%Eclipse RDF4J SHACL extensions|false|true%} ;
25+
config:shacl.dashDataShapes {%DASH data shapes|false|true%} ;
2626
config:shacl.validationResultsLimitTotal {%Validation results limit total|1000000%} ;
2727
config:shacl.validationResultsLimitPerConstraint {%Validation results limit per constraint|1000%} ;
2828
config:shacl.transactionalValidationLimit {%Transactional validation limit|500000%} ;

tools/workbench/src/test/java/org/eclipse/rdf4j/workbench/commands/CreateServletTest.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ public void testShaclTemplatesExposeAllOptions() throws IOException {
130130
assertThat(nativeTemplate).contains("{%" + option + "|");
131131
}
132132

133+
assertShaclDefaultsMatchConfig(memoryTemplate);
134+
assertShaclDefaultsMatchConfig(nativeTemplate);
135+
133136
assertShaclInputsPresent(Paths.get("src/main/webapp/transformations/create-memory-shacl.xsl"));
134137
assertShaclInputsPresent(Paths.get("src/main/webapp/transformations/create-native-shacl.xsl"));
135138
}
@@ -152,6 +155,15 @@ public void testShaclTemplatesExposeAllOptions() throws IOException {
152155
"Shapes graphs"
153156
};
154157

158+
private static final String[] SHACL_FALSE_DEFAULTS = {
159+
"Log validation plans",
160+
"Log validation violations",
161+
"Global log validation execution",
162+
"Performance logging",
163+
"Eclipse RDF4J SHACL extensions",
164+
"DASH data shapes"
165+
};
166+
155167
private static String readConfigTemplate(String resource) throws IOException {
156168
try (InputStream input = RepositoryConfig.class.getResourceAsStream(resource)) {
157169
assertThat(input).as(resource).isNotNull();
@@ -165,4 +177,10 @@ private static void assertShaclInputsPresent(Path path) throws IOException {
165177
assertThat(xsl).contains("name=\"" + option + "\"");
166178
}
167179
}
180+
181+
private static void assertShaclDefaultsMatchConfig(String template) {
182+
for (String option : SHACL_FALSE_DEFAULTS) {
183+
assertThat(template).contains("{%" + option + "|false|true%}");
184+
}
185+
}
168186
}

0 commit comments

Comments
 (0)