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 2018/11/17 17:20:39 UTC
[13/34] jena git commit: Maintainence.
Maintainence.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1b5463f7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1b5463f7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1b5463f7
Branch: refs/heads/master
Commit: 1b5463f7eafe250eb777912f9a866b19728ff38e
Parents: 7251589
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 2 14:46:34 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 13 15:39:14 2018 +0000
----------------------------------------------------------------------
.../apache/jena/sparql/engine/http/QueryEngineHTTP.java | 5 ++---
.../main/java/org/apache/jena/sparql/util/Context.java | 2 +-
.../java/org/apache/jena/fuseki/servlets/ActionBase.java | 2 +-
.../java/org/apache/jena/fuseki/main/FusekiServer.java | 11 +++++++++--
.../java/org/apache/jena/fuseki/mgt/ActionDatasets.java | 2 +-
5 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1b5463f7/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
index 564c997..282caf4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
@@ -345,8 +345,7 @@ public class QueryEngineHTTP implements QueryExecution {
return new ResultSetCheckCondition(rs, this) ;
}
- private ResultSet execResultSetInner() {
-
+ private ResultSet execResultSetInner() {
HttpQuery httpQuery = makeHttpQuery();
httpQuery.setAccept(chooseAcceptHeader(acceptHeader, selectContentType));
InputStream in = httpQuery.exec();
@@ -383,7 +382,7 @@ public class QueryEngineHTTP implements QueryExecution {
return result;
}
- // XXX Move
+ // XXX Move
private static String chooseAcceptHeader(String acceptHeader, String contentType) {
if ( acceptHeader != null )
return acceptHeader;
http://git-wip-us.apache.org/repos/asf/jena/blob/1b5463f7/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
index 44c7812..60ff3a0 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
@@ -43,7 +43,7 @@ public class Context {
/** Create an empty context */
public Context() {}
- /* Create an empty context, mark it's readonly state */
+ /* Create an empty context, mark its read-only state */
private Context(boolean readonly) {
this.readonly = readonly ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/1b5463f7/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
index 5bd52c1..4ba0ede 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
@@ -70,7 +70,7 @@ public abstract class ActionBase extends ServletBase
response = action.response ;
initResponse(request, response) ;
try {
- action.startRequest();
+ startRequest(action);
execCommonWorker(action) ;
} catch (QueryCancelledException ex) {
// To put in the action timeout, need (1) global, (2) dataset and (3) protocol settings.
http://git-wip-us.apache.org/repos/asf/jena/blob/1b5463f7/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java
index 6bacd45..b248e2c 100644
--- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java
+++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java
@@ -389,6 +389,14 @@ public class FusekiServer {
if ( dataAccessPoints.isRegistered(name) )
throw new FusekiConfigException("Data service name already registered: "+name);
DataAccessPoint dap = new DataAccessPoint(name, dataService);
+ addDataAccessPoint(dap);
+ return this;
+ }
+
+ /** Add a {@link DataAccessPoint}. */
+ private Builder addDataAccessPoint(DataAccessPoint dap) {
+ if ( dataAccessPoints.isRegistered(dap.getName()) )
+ throw new FusekiConfigException("Data service name already registered: "+dap.getName());
dataAccessPoints.register(dap);
return this;
}
@@ -411,8 +419,7 @@ public class FusekiServer {
// Process services, whether via server ja:services or, if absent, by finding by type.
List<DataAccessPoint> x = FusekiConfig.servicesAndDatasets(model);
- // Unbundle so that they accumulate.
- x.forEach(dap->add(dap.getName(), dap.getDataService()));
+ x.forEach(dap->addDataAccessPoint(dap));
return this;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/1b5463f7/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
index 57179ec..dcc7435 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
@@ -89,7 +89,7 @@ public class ActionDatasets extends ActionContainerItem {
private static DatasetGraphTransaction systemDSG = SystemState.getDatasetGraph() ;
static private Property pServiceName = FusekiVocab.pServiceName ;
- static private Property pStatus = FusekiVocab.pStatus ;
+ //static private Property pStatus = FusekiVocab.pStatus ;
private static final String paramDatasetName = "dbName" ;
private static final String paramDatasetType = "dbType" ;