Skip to content

Commit ec45b82

Browse files
AndreaCimminoArriagaAndreaCimminoArriaga
committed
pre-relase fixing
1 parent f928247 commit ec45b82

File tree

76 files changed

+87
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+87
-11
lines changed

‎docs/allclasses-frame.html

100644100755
File mode changed.

‎docs/allclasses-noframe.html

100644100755
File mode changed.

‎docs/astrea/generators/OwlGenerator.html

100644100755
File mode changed.

‎docs/astrea/generators/class-use/OwlGenerator.html

100644100755
File mode changed.

‎docs/astrea/generators/package-frame.html

100644100755
File mode changed.

‎docs/astrea/generators/package-summary.html

100644100755
File mode changed.

‎docs/astrea/generators/package-tree.html

100644100755
File mode changed.

‎docs/astrea/generators/package-use.html

100644100755
File mode changed.

‎docs/astrea/model/ShaclFromOwl.html

100644100755
File mode changed.

‎docs/astrea/model/class-use/ShaclFromOwl.html

100644100755
File mode changed.

‎docs/astrea/model/package-frame.html

100644100755
File mode changed.

‎docs/astrea/model/package-summary.html

100644100755
File mode changed.

‎docs/astrea/model/package-tree.html

100644100755
File mode changed.

‎docs/astrea/model/package-use.html

100644100755
File mode changed.

‎docs/constant-values.html

100644100755
File mode changed.

‎docs/deprecated-list.html

100644100755
File mode changed.

‎docs/help-doc.html

100644100755
File mode changed.

‎docs/index-files/index-1.html

100644100755
File mode changed.

‎docs/index-files/index-2.html

100644100755
File mode changed.

‎docs/index-files/index-3.html

100644100755
File mode changed.

‎docs/index-files/index-4.html

100644100755
File mode changed.

‎docs/index-files/index-5.html

100644100755
File mode changed.

‎docs/index.html

100644100755
File mode changed.

‎docs/overview-frame.html

100644100755
File mode changed.

‎docs/overview-summary.html

100644100755
File mode changed.

‎docs/overview-tree.html

100644100755
File mode changed.

‎docs/package-list

100644100755
File mode changed.

‎docs/script.js

100644100755
File mode changed.

‎docs/stylesheet.css

100644100755
File mode changed.

‎material/Queries.csv

+1-1
Large diffs are not rendered by default.

‎mvn-install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# 1. Install the helio-core dependency in your local repository using this script
22
mvn clean install -DskipTests
3-
mvn install:install-file -Dfile=./target/astrea-1.1.1.jar -DgroupId=oeg.validation -DartifactId=astrea -Dversion=1.1.1 -Dpackaging=jar
3+
mvn install:install-file -Dfile=./target/astrea-1.1.2.jar -DgroupId=oeg.validation -DartifactId=astrea -Dversion=1.1.2 -Dpackaging=jar
44

55
# 2. You are ready to go and use the framework

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>oeg.validation</groupId>
44
<artifactId>astrea</artifactId>
5-
<version>1.1.1</version>
5+
<version>1.1.2</version>
66
<name>Astrea</name>
77
<description>Astrea: SHACL shapes generation from ontologies</description>
88

‎src/main/java/astrea/generators/OwlGenerator.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public void setEndpoint(String endpoint) {
8080
/**
8181
* This constructor fetches the queries from the provided SPARQL endpoint
8282
*/
83-
private void fetchQueries() {
84-
83+
public void fetchQueries() {
84+
queries.clear();
8585
Query query = QueryFactory.create(QUERY_FETCH_SPARQL);
8686
QueryExecution qexec = QueryExecutionFactory.sparqlService(endpoint, query);
8787

@@ -172,7 +172,7 @@ public Model fromOwl(String owlContent, String format) {
172172
}
173173

174174

175-
175+
/*
176176
@Override
177177
public Model fromModel(Model ontology) {
178178
ExecutorService executorService = Executors.newFixedThreadPool(this.queries.size());
@@ -220,11 +220,11 @@ private Model retrievePartialShapes(String query, Model ontology) {
220220
qExec.close();
221221
}
222222
return partialShape;
223-
}
223+
}*/
224224

225225
/*
226226
* Deprecated block of code
227-
227+
*/
228228
@Override
229229
public Model fromModel(Model ontology) {
230230
Model shapes = ModelFactory.createDefaultModel();
@@ -247,6 +247,6 @@ private void parallelPopulation(String query, Model ontology, Model shapes) {
247247
if(qExec!=null)
248248
qExec.close();
249249
}
250-
}*/
250+
}
251251

252252
}

‎src/test/java/test/queries/LogicalConstraintsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,8 @@ public void compliantWithShNotShape() {
9494

9595
@Test
9696
public void compliantWithShNotPropertyShape() {
97-
ShaclFromOwl sharper = new OwlGenerator();
97+
OwlGenerator sharper = new OwlGenerator();
9898
Model shapes = sharper.fromOwl(OWL_FRAGMENT_NOT_PROP, "TURTLE");
99-
10099
Boolean condition = shapes.contains(null,ResourceFactory.createProperty(SH_NOT), (RDFNode) null);
101100
condition &= shapes.contains(null, RDF.type, ResourceFactory.createResource(SH_PROPERTY_SHAPE));
102101
condition &= shapes.contains(null, ResourceFactory.createProperty(SH_PATH), ResourceFactory.createResource("http://www.co-ode.org/ontologies/pizza/pizza.owl#locatedIn"));

‎target/astrea-1.1.2.jar

10.4 KB
Binary file not shown.

‎target/classes/astrea/generators/OptimisedOwlGenerator.class

18.8 KB
Binary file not shown.

‎target/classes/astrea/generators/OwlGenerator.class

6.98 KB
Binary file not shown.

‎target/classes/astrea/model/ShaclFromOwl.class

542 Bytes
Binary file not shown.

‎target/maven-archiver/pom.properties

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#Generated by Maven
2+
#Sun Dec 08 18:24:56 CET 2019
3+
version=1.1.2
4+
groupId=oeg.validation
5+
artifactId=astrea

‎target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
astrea/generators/OptimisedOwlGenerator.class
2+
astrea/model/ShaclFromOwl.class
3+
astrea/generators/OwlGenerator.class

‎target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/Users/cimmino/Desktop/testing/Astrea/src/main/java/astrea/generators/OwlGenerator.java
2+
/Users/cimmino/Desktop/testing/Astrea/src/main/java/astrea/model/ShaclFromOwl.java
3+
/Users/cimmino/Desktop/testing/Astrea/src/main/java/astrea/generators/OptimisedOwlGenerator.java

‎target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
test/optimised/owl/CardinalityTest.class
2+
test/optimised/shapes/ValueTypeConstraintTest.class
3+
test/queries/PropertyRestrictionsTest.class
4+
test/queries/StringBasedConstraintTest.class
5+
test/optimised/owl/PropertyRestrictionsTest.class
6+
test/optimised/shapes/OtherConstraints.class
7+
test/optimised/owl/EquialityTest.class
8+
test/optimised/shapes/NonValidatingPropertyShapeCharacteristicsTest.class
9+
test/optimised/owl/PropertyCharacteristicsTest.class
10+
test/optimised/owl/DatatypeTest.class
11+
test/queries/DatatypeTest.class
12+
test/queries/PropertyCharacteristicsTest.class
13+
test/queries/ValueTypeConstraintTest.class
14+
test/queries/LogicalConstraintsTest.class
15+
test/queries/FillerInformationTest.class
16+
test/optimised/shapes/StringBasedConstraintTest.class
17+
test/queries/datatypes/InjectedDatatypesTest.class
18+
test/optimised/shapes/CardinalityConstraintTest.class
19+
test/queries/EquialityTest.class
20+
test/queries/CardinalityConstraintTest.class
21+
test/optimised/owl/RDFSchemaFeaturesTest.class
22+
test/optimised/shapes/PropertyPairConstraintTest.class
23+
test/queries/ShapeBasedConstraintsTest.class
24+
test/queries/OtherConstraints.class
25+
test/optimised/owl/AnnotationPropertiesTest.class
26+
test/queries/AnnotationPropertiesTest.class
27+
test/queries/PropertyPairConstraintTest.class
28+
test/queries/catalogue/TestCatalogue.class
29+
test/queries/RDFSchemaFeaturesTest.class
30+
test/queries/CardinalityTest.class
31+
test/queries/NonValidatingPropertyShapeCharacteristicsTest.class
32+
test/optimised/owl/FillerInformationTest.class
33+
test/optimised/shapes/LogicalConstraintsTest.class

‎target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/LogicalConstraintsTest.java
2+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/owl/PropertyCharacteristicsTest.java
3+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/DatatypeTest.java
4+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/shapes/StringBasedConstraintTest.java
5+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/shapes/NonValidatingPropertyShapeCharacteristicsTest.java
6+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/PropertyPairConstraintTest.java
7+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/shapes/PropertyPairConstraintTest.java
8+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/owl/FillerInformationTest.java
9+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/shapes/ValueTypeConstraintTest.java
10+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/owl/CardinalityTest.java
11+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/shapes/CardinalityConstraintTest.java
12+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/AnnotationPropertiesTest.java
13+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/owl/PropertyRestrictionsTest.java
14+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/EquialityTest.java
15+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/RDFSchemaFeaturesTest.java
16+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/owl/DatatypeTest.java
17+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/shapes/LogicalConstraintsTest.java
18+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/owl/EquialityTest.java
19+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/datatypes/InjectedDatatypesTest.java
20+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/owl/RDFSchemaFeaturesTest.java
21+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/NonValidatingPropertyShapeCharacteristicsTest.java
22+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/OtherConstraints.java
23+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/StringBasedConstraintTest.java
24+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/shapes/OtherConstraints.java
25+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/ShapeBasedConstraintsTest.java
26+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/FillerInformationTest.java
27+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/ValueTypeConstraintTest.java
28+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/PropertyCharacteristicsTest.java
29+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/optimised/owl/AnnotationPropertiesTest.java
30+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/CardinalityTest.java
31+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/CardinalityConstraintTest.java
32+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/PropertyRestrictionsTest.java
33+
/Users/cimmino/Desktop/testing/Astrea/src/test/java/test/queries/catalogue/TestCatalogue.java

‎target/test-classes/test/optimised/owl/AnnotationPropertiesTest.class

7.33 KB
Binary file not shown.

‎target/test-classes/test/optimised/owl/CardinalityTest.class

3.32 KB
Binary file not shown.

‎target/test-classes/test/optimised/owl/DatatypeTest.class

4.52 KB
Binary file not shown.

‎target/test-classes/test/optimised/owl/EquialityTest.class

2.71 KB
Binary file not shown.

‎target/test-classes/test/optimised/owl/FillerInformationTest.class

4 KB
Binary file not shown.

‎target/test-classes/test/optimised/owl/PropertyCharacteristicsTest.class

6.35 KB
Binary file not shown.

‎target/test-classes/test/optimised/owl/PropertyRestrictionsTest.class

3.36 KB
Binary file not shown.

‎target/test-classes/test/optimised/owl/RDFSchemaFeaturesTest.class

10.5 KB
Binary file not shown.

‎target/test-classes/test/optimised/shapes/CardinalityConstraintTest.class

3.82 KB
Binary file not shown.

‎target/test-classes/test/optimised/shapes/LogicalConstraintsTest.class

4.97 KB
Binary file not shown.

‎target/test-classes/test/optimised/shapes/NonValidatingPropertyShapeCharacteristicsTest.class

2.95 KB
Binary file not shown.

‎target/test-classes/test/optimised/shapes/OtherConstraints.class

3.58 KB
Binary file not shown.

‎target/test-classes/test/optimised/shapes/PropertyPairConstraintTest.class

3.68 KB
Binary file not shown.

‎target/test-classes/test/optimised/shapes/StringBasedConstraintTest.class

12.9 KB
Binary file not shown.

‎target/test-classes/test/optimised/shapes/ValueTypeConstraintTest.class

6.55 KB
Binary file not shown.

‎target/test-classes/test/queries/AnnotationPropertiesTest.class

7.2 KB
Binary file not shown.

‎target/test-classes/test/queries/CardinalityConstraintTest.class

3.83 KB
Binary file not shown.

‎target/test-classes/test/queries/CardinalityTest.class

3.29 KB
Binary file not shown.

‎target/test-classes/test/queries/DatatypeTest.class

3.44 KB
Binary file not shown.

‎target/test-classes/test/queries/EquialityTest.class

2.69 KB
Binary file not shown.

‎target/test-classes/test/queries/FillerInformationTest.class

3.98 KB
Binary file not shown.

‎target/test-classes/test/queries/LogicalConstraintsTest.class

4.83 KB
Binary file not shown.

‎target/test-classes/test/queries/NonValidatingPropertyShapeCharacteristicsTest.class

2.93 KB
Binary file not shown.

‎target/test-classes/test/queries/OtherConstraints.class

3.52 KB
Binary file not shown.

‎target/test-classes/test/queries/PropertyCharacteristicsTest.class

6.33 KB
Binary file not shown.

‎target/test-classes/test/queries/PropertyPairConstraintTest.class

3.6 KB
Binary file not shown.

‎target/test-classes/test/queries/PropertyRestrictionsTest.class

3.34 KB
Binary file not shown.

‎target/test-classes/test/queries/RDFSchemaFeaturesTest.class

10 KB
Binary file not shown.

‎target/test-classes/test/queries/ShapeBasedConstraintsTest.class

8.75 KB
Binary file not shown.

‎target/test-classes/test/queries/StringBasedConstraintTest.class

12.8 KB
Binary file not shown.

‎target/test-classes/test/queries/ValueTypeConstraintTest.class

6.5 KB
Binary file not shown.

‎target/test-classes/test/queries/catalogue/TestCatalogue.class

2.11 KB
Binary file not shown.

‎target/test-classes/test/queries/datatypes/InjectedDatatypesTest.class

31.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)