This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/master by this push:
new bed6fe5 JENA-1960: Fix for Fuseki full templates
new 8c292c8 Merge pull request #796 from afs/fuseki-fix
bed6fe5 is described below
commit bed6fe5b7d749286e71391879e511badaa3bafe2
Author: Andy Seaborne <[email protected]>
AuthorDate: Tue Sep 15 17:50:04 2020 +0100
JENA-1960: Fix for Fuseki full templates
---
.../src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java | 8 ++++++++
.../src/main/java/org/apache/jena/fuseki/server/Endpoint.java | 6 ++++++
.../src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java | 5 +++--
.../resources/org/apache/jena/fuseki/webapp/templates/config-mem | 2 --
.../resources/org/apache/jena/fuseki/webapp/templates/config-tdb | 2 --
.../org/apache/jena/fuseki/webapp/templates/config-tdb-dir | 2 --
.../org/apache/jena/fuseki/webapp/templates/config-tdb-mem | 2 --
.../resources/org/apache/jena/fuseki/webapp/templates/config-tdb2 | 2 --
.../org/apache/jena/fuseki/webapp/templates/config-tdb2-dir | 2 --
.../org/apache/jena/fuseki/webapp/templates/config-tdb2-mem | 2 --
10 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
index e74ba0f..3988818 100644
---
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
+++
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
@@ -464,6 +464,8 @@ public class FusekiConfig {
Collection<Endpoint> endpointsCompat = oldStyleCompat(dataService,
endpoints1);
endpointsCompat.forEach(dataService::addEndpoint);
}
+ // Explicit definition overrides implied by legacy compatibility.
+ // Should not happen.
endpoints1.forEach(dataService::addEndpoint);
// New (2019) style
@@ -501,6 +503,12 @@ public class FusekiConfig {
}
}
});
+ // Now, after making all legacy endpoints, remove any that are
explicit defined in endpoints1.
+ // Given the small numbers involved, it is easier to do it this way
than
+ // additional logic in the first pass over endpoints1.
+ endpoints1.stream()
+ .filter(ep->StringUtils.isEmpty(ep.getName()))
+ .forEach(ep->endpoints3.remove(ep.getOperation()));
return endpoints3.values();
}
diff --git
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/Endpoint.java
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/Endpoint.java
index 74671b5..f4e0580 100644
---
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/Endpoint.java
+++
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/Endpoint.java
@@ -114,6 +114,12 @@ public class Endpoint implements Counters {
return counters.value(CounterName.RequestsBad);
}
+ public static boolean sameNameAndOperation(Endpoint ep1, Endpoint ep2) {
+ return
+ Objects.equals(ep1.getName(), ep2.getName()) &&
+ Objects.equals(ep1.getOperation(), ep2.getOperation()) ;
+ }
+
@Override
public String toString() {
return getName()+"["+operation+"]";
diff --git
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
index e2547cf..7ab6ff7 100644
---
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
+++
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
@@ -65,8 +65,9 @@ public class FusekiVocab
public static final Property pServiceShaclEP =
property("serviceShacl");
public static final Property pServiceReadWriteGraphStoreEP =
property("serviceReadWriteGraphStore");
public static final Property pServiceReadGraphStoreEP =
property("serviceReadGraphStore");
- public static final Property pServiceReadWriteQuadsEP =
property("serviceReadWriteQuads");
- public static final Property pServiceReadQuadsEP =
property("serviceReadQuads");
+ // No longer used.
+// public static final Property pServiceReadWriteQuadsEP =
property("serviceReadWriteQuads");
+// public static final Property pServiceReadQuadsEP =
property("serviceReadQuads");
// Operation names : the standard operations.
// "alt" names are the same but using "_" not "_".
diff --git
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-mem
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-mem
index 6ce86d0..6f42e59 100644
---
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-mem
+++
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-mem
@@ -22,8 +22,6 @@
fuseki:serviceUpload "upload" ;
fuseki:serviceReadWriteGraphStore "data" ;
fuseki:serviceReadGraphStore "get" ;
- fuseki:serviceReadQuads "" ;
- fuseki:serviceReadWriteQuads "" ;
fuseki:dataset <#dataset> ;
.
diff --git
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb
index a24655d..9b18588 100644
---
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb
+++
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb
@@ -22,8 +22,6 @@
fuseki:serviceReadWriteGraphStore "data" ;
# A separate read-only graph store endpoint:
fuseki:serviceReadGraphStore "get" ;
- fuseki:serviceReadQuads "";
- fuseki:serviceReadWriteQuads "";
fuseki:dataset <#tdb_dataset_readwrite> ;
.
diff --git
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb-dir
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb-dir
index 338d7de..f22de07 100644
---
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb-dir
+++
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb-dir
@@ -21,8 +21,6 @@
fuseki:serviceUpload "upload" ;
fuseki:serviceReadWriteGraphStore "data" ;
fuseki:serviceReadGraphStore "get" ;
- fuseki:serviceReadQuads "" ;
- fuseki:serviceReadWriteQuads "" ;
fuseki:dataset <#tdb_dataset_readwrite> ;
.
diff --git
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb-mem
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb-mem
index f751a69..6b9c656 100644
---
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb-mem
+++
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb-mem
@@ -21,8 +21,6 @@
fuseki:serviceUpload "upload" ;
fuseki:serviceReadWriteGraphStore "data" ;
fuseki:serviceReadGraphStore "get" ;
- fuseki:serviceReadQuads "" ;
- fuseki:serviceReadWriteQuads "" ;
fuseki:dataset <#tdb_dataset_readwrite> ;
.
diff --git
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2
index c3412fc..3fa7c16 100644
---
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2
+++
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2
@@ -21,8 +21,6 @@ PREFIX ja: <http://jena.hpl.hp.com/2005/11/Assembler#>
fuseki:serviceUpload "upload" ;
fuseki:serviceReadWriteGraphStore "data" ;
fuseki:serviceReadGraphStore "get" ;
- fuseki:serviceReadQuads "" ;
- fuseki:serviceReadWriteQuads "" ;
fuseki:dataset <#tdb_dataset_readwrite> ;
.
diff --git
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2-dir
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2-dir
index 680d0a8..3312b93 100644
---
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2-dir
+++
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2-dir
@@ -21,8 +21,6 @@ PREFIX ja: <http://jena.hpl.hp.com/2005/11/Assembler#>
fuseki:serviceUpload "upload" ;
fuseki:serviceReadWriteGraphStore "data" ;
fuseki:serviceReadGraphStore "get" ;
- fuseki:serviceReadQuads "" ;
- fuseki:serviceReadWriteQuads "" ;
fuseki:dataset <#tdb_dataset_readwrite> ;
.
diff --git
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2-mem
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2-mem
index d9b21a8..de362d0 100644
---
a/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2-mem
+++
b/jena-fuseki2/jena-fuseki-webapp/src/main/resources/org/apache/jena/fuseki/webapp/templates/config-tdb2-mem
@@ -21,8 +21,6 @@ PREFIX ja: <http://jena.hpl.hp.com/2005/11/Assembler#>
fuseki:serviceUpload "upload" ;
fuseki:serviceReadWriteGraphStore "data" ;
fuseki:serviceReadGraphStore "get" ;
- fuseki:serviceReadQuads "" ;
- fuseki:serviceReadWriteQuads "" ;
fuseki:dataset <#tdb_dataset_readwrite> ;
.
