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 2017/11/08 17:22:17 UTC
[2/3] jena git commit: JENA-1420: OperationName fix. The "name" must
be a simple name.
JENA-1420: OperationName fix. The "name" must be a simple name.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/76f0408f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/76f0408f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/76f0408f
Branch: refs/heads/master
Commit: 76f0408f37e774317bb2dc7955c435f837bba05e
Parents: b250eee
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 7 18:28:16 2017 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 7 18:28:16 2017 +0000
----------------------------------------------------------------------
.../org/apache/jena/fuseki/mgt/ActionStats.java | 2 +-
.../apache/jena/fuseki/mgt/JsonDescription.java | 3 +-
.../jena/fuseki/server/OperationName.java | 31 +++++++++++++-------
3 files changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/76f0408f/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java
index cd68a4e..d6d2deb 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java
@@ -109,7 +109,7 @@ public class ActionStats extends ActionContainerItem
operationCounters(builder, endpoint);
builder.key(JsonConst.operation).value(operName.getName()) ;
- builder.key(JsonConst.description).value(operName.getName()) ;
+ builder.key(JsonConst.description).value(operName.getDescription());
builder.finishObject() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/76f0408f/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/JsonDescription.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/JsonDescription.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/JsonDescription.java
index 6113a10..6c4c11d 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/JsonDescription.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/JsonDescription.java
@@ -59,8 +59,7 @@ public class JsonDescription {
builder.startObject() ;
builder.key(JsonConst.srvType).value(opName.getName()) ;
- builder.key(JsonConst.srvDescription).value(opName.getName()) ;
-
+ builder.key(JsonConst.srvDescription).value(opName.getDescription()) ;
builder.key(JsonConst.srvEndpoints) ;
builder.startArray() ;
for ( Endpoint endpoint : endpoints )
http://git-wip-us.apache.org/repos/asf/jena/blob/76f0408f/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/OperationName.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/OperationName.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/OperationName.java
index 39427b1..e152645 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/OperationName.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/OperationName.java
@@ -27,20 +27,31 @@ public class OperationName {
// Create intern'ed symbols.
static private NameMgr<OperationName> mgr = new NameMgr<>();
- static public OperationName register(String name) { return mgr.register(name, (x)->new OperationName(x)); }
+ static public OperationName register(String name, String description) { return mgr.register(name, (x)->new OperationName(x, description)); }
- public static final OperationName Query = register("SPARQL Query");
- public static final OperationName Update = register("SPARQL Update");
- public static final OperationName Upload = register("File Upload");
- public static final OperationName GSP_RW = register("Graph Store Protocol");
- public static final OperationName GSP_R = register("Graph Store Protocol (Read)");
- public static final OperationName Quads_RW = register("HTTP Quads");
- public static final OperationName Quads_R = register("HTTP Quads (Read)");
+ public static final OperationName Query = register("Query", "SPARQL Query");
+ public static final OperationName Update = register("Update", "SPARQL Update");
+ public static final OperationName Upload = register("Upload", "File Upload");
+ public static final OperationName GSP_RW = register("GSP_RW", "Graph Store Protocol");
+ public static final OperationName GSP_R = register("GSP_R", "Graph Store Protocol (Read)");
+ public static final OperationName Quads_RW = register("Quads_RW", "HTTP Quads");
+ public static final OperationName Quads_R = register("Quads_R", "HTTP Quads (Read)");
+ private final String description ;
private final String name ;
- private OperationName(String name) { this.name = name ; }
+
+ private OperationName(String name, String description) {
+ this.name = name;
+ this.description = description;
+ }
- public String getName() { return name ; }
+ public String getName() {
+ return name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
@Override
public int hashCode() {