You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/07/01 16:00:22 UTC
svn commit: r1607082 - in /jena/Experimental/jena-fuseki2/src:
main/java/org/apache/jena/fuseki/build/ main/java/org/apache/jena/fuseki/mgt/
main/java/org/apache/jena/fuseki/server/ test/java/org/apache/jena/fuseki/
Author: andy
Date: Tue Jul 1 14:00:22 2014
New Revision: 1607082
URL: http://svn.apache.org/r1607082
Log:
Stats admin details : delivery as dataset-endpoints
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/Builder.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/JsonConst.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/JsonDescription.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/OperationName.java
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/Builder.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/Builder.java?rev=1607082&r1=1607081&r2=1607082&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/Builder.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/Builder.java Tue Jul 1 14:00:22 2014
@@ -103,7 +103,7 @@ public class Builder
addServiceEP(dataService, OperationName.Query, "query") ;
addServiceEP(dataService, OperationName.Query, "sparql") ;
if ( ! allowUpdate ) {
- addServiceEP(dataService, OperationName.Quads, "") ;
+ addServiceEP(dataService, OperationName.Quads, "quads") ;
addServiceEP(dataService, OperationName.GSP_R, "data") ;
return dataService ;
}
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java?rev=1607082&r1=1607081&r2=1607082&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java Tue Jul 1 14:00:22 2014
@@ -91,25 +91,39 @@ public class ActionStats extends ActionC
builder.key(CounterName.RequestsGood.name()).value(dSrv.getCounters().value(CounterName.RequestsGood)) ;
builder.key(CounterName.RequestsBad.name()).value(dSrv.getCounters().value(CounterName.RequestsBad)) ;
- builder.key(JsonConst.services).startObject("services") ;
+
+ // Build the operation -> endpoint list map.
+
+// MultiMap<OperationName, Endpoint> map = MultiMap.createMapList() ;
+// for ( OperationName operName : dSrv.getOperations() ) {
+// List<Endpoint> endpoints = access.getDataService().getOperation(operName) ;
+// for ( Endpoint endpoint : endpoints )
+// map.put(operName, endpoint) ;
+// }
+
+
+ builder.key(JsonConst.endpoints).startObject("endpoints") ;
for ( OperationName operName : dSrv.getOperations() ) {
List<Endpoint> endpoints = access.getDataService().getOperation(operName) ;
+// System.err.println(operName+" : "+endpoints.size()) ;
+// for ( Endpoint endpoint : endpoints )
+// System.err.println(" "+endpoint.getEndpoint()) ;
for ( Endpoint endpoint : endpoints ) {
+
+ // Endpoint names are unique but not services.
+
builder.key(endpoint.getEndpoint()) ;
builder.startObject() ;
operationCounters(builder, endpoint);
- builder.key(JsonConst.endpoints) ;
- builder.startArray() ;
- builder.value(endpoint.getEndpoint()) ;
- builder.finishArray() ;
+ builder.key(JsonConst.operation).value(operName.name()) ;
builder.finishObject() ;
}
}
- builder.finishObject("services") ;
+ builder.finishObject("endpoints") ;
builder.finishObject("counters") ;
}
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/JsonConst.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/JsonConst.java?rev=1607082&r1=1607081&r2=1607082&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/JsonConst.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/JsonConst.java Tue Jul 1 14:00:22 2014
@@ -37,6 +37,7 @@ public class JsonConst
public static final String built = "built" ;
public static final String services = "services" ;
+ public static final String operation = "operation" ;
public static final String endpoints = "endpoints" ;
public static final String dsName = "ds.name" ;
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/JsonDescription.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/JsonDescription.java?rev=1607082&r1=1607081&r2=1607082&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/JsonDescription.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/JsonDescription.java Tue Jul 1 14:00:22 2014
@@ -59,7 +59,7 @@ public class JsonDescription {
private static void describe(JsonBuilder builder, OperationName opName, List<Endpoint> endpoints) {
builder.startObject() ;
- builder.key(JsonConst.srvType).value(opName.name) ;
+ builder.key(JsonConst.srvType).value(opName.name()) ;
builder.key(JsonConst.srvEndpoints) ;
builder.startArray() ;
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/OperationName.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/OperationName.java?rev=1607082&r1=1607081&r2=1607082&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/OperationName.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/OperationName.java Tue Jul 1 14:00:22 2014
@@ -29,8 +29,9 @@ public enum OperationName {
Quads("Quads")
;
- public final String name ;
- private OperationName(String name) { this.name = name ; }
+ private final String description ;
+ private OperationName(String description) { this.description = description ; }
+ public String getDescription() { return description ; }
}
Modified: jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java?rev=1607082&r1=1607081&r2=1607082&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java (original)
+++ jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java Tue Jul 1 14:00:22 2014
@@ -499,8 +499,8 @@ public class TestAdmin extends BaseTest
assertTrue(obj.hasKey("Requests")) ;
assertTrue(obj.hasKey("RequestsGood")) ;
assertTrue(obj.hasKey("RequestsBad")) ;
- assertTrue(obj.hasKey("services")) ;
- JsonObject obj2 = obj.get("services").getAsObject() ;
+ assertTrue(obj.hasKey("endpoints")) ;
+ JsonObject obj2 = obj.get("endpoints").getAsObject() ;
// More
}