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 2015/05/21 13:03:47 UTC
[2/3] jena git commit: Use keySet for getOperations.
Use keySet for getOperations.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9b3aa364
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9b3aa364
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9b3aa364
Branch: refs/heads/master
Commit: 9b3aa364b45184932f79b585555b248c08619678
Parents: d54b70d
Author: Andy Seaborne <an...@apache.org>
Authored: Thu May 21 12:00:32 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu May 21 12:01:11 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/server/DataService.java | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9b3aa364/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java
index e4b8793..bf341a2 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java
@@ -29,7 +29,6 @@ import org.apache.jena.ext.com.google.common.collect.ArrayListMultimap;
import org.apache.jena.ext.com.google.common.collect.ListMultimap;
import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.Fuseki ;
-import org.apache.jena.fuseki.build.DataServiceDesc ;
import org.apache.jena.query.ReadWrite ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.DatasetGraphFactory ;
@@ -38,24 +37,21 @@ import org.apache.jena.tdb.StoreConnection ;
import org.apache.jena.tdb.transaction.DatasetGraphTransaction ;
public class DataService { //implements DatasetMXBean {
- // XXX Add a "null model assembler".
-
public static DataService serviceOnlyDataService() {
return dummy ;
}
- public static DataService dummy = new DataService(null, null) ;
+ public static DataService dummy = new DataService(null) ;
static {
dummy.dataset = new DatasetGraphReadOnly(DatasetGraphFactory.createMemFixed()) ;
dummy.addEndpoint(OperationName.Query, DEF.ServiceQuery) ;
dummy.addEndpoint(OperationName.Query, DEF.ServiceQueryAlt) ;
}
- private final DataServiceDesc svcDesc ;
private DatasetGraph dataset = null ; // Only valid if active.
- private ListMultimap<OperationName, Endpoint> operations = ArrayListMultimap.create() ;
- private Map<String, Endpoint> endpoints = new HashMap<>() ;
+ private ListMultimap<OperationName, Endpoint> operations = ArrayListMultimap.create() ;
+ private Map<String, Endpoint> endpoints = new HashMap<>() ;
private volatile DatasetStatus state = UNINITIALIZED ;
@@ -65,8 +61,7 @@ public class DataService { //implements DatasetMXBean {
private final AtomicBoolean offlineInProgress = new AtomicBoolean(false) ;
private final AtomicBoolean acceptingRequests = new AtomicBoolean(true) ;
- public DataService(DataServiceDesc desc, DatasetGraph dataset) {
- this.svcDesc = desc ;
+ public DataService(DatasetGraph dataset) {
this.dataset = dataset ;
counters.add(CounterName.Requests) ;
counters.add(CounterName.RequestsGood) ;
@@ -98,7 +93,7 @@ public class DataService { //implements DatasetMXBean {
* @see #getOperation(OperationName) to ge the endpoint list
*/
public Collection<OperationName> getOperations() {
- return operations.keys() ;
+ return operations.keySet() ;
}
//@Override