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/08/20 07:39:09 UTC
[10/19] jena git commit: Switch naming of setters to non-"set" style.
Switch naming of setters to non-"set" style.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f6bac07b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f6bac07b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f6bac07b
Branch: refs/heads/master
Commit: f6bac07b64c500472091efb7a83ca486b89e321e
Parents: 21050fc
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 16 12:03:59 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 16 12:04:14 2018 +0100
----------------------------------------------------------------------
.../apache/jena/fuseki/cmds/FusekiBasicCmd.java | 6 +-
.../jena/fuseki/embedded/FusekiServer.java | 95 ++++++++++++++++----
.../jena/fuseki/embedded/FusekiTestAuth.java | 4 +-
.../jena/fuseki/embedded/FusekiTestServer.java | 2 +-
.../fuseki/embedded/TestEmbeddedFuseki.java | 24 ++---
.../embedded/TestFusekiCustomOperation.java | 12 +--
.../fuseki/embedded/TestMultipleEmbedded.java | 16 ++--
.../examples/ExtendFuseki_AddService_1.java | 4 +-
.../examples/ExtendFuseki_AddService_2.java | 4 +-
.../examples/ExtendFuseki_AddService_3.java | 4 +-
.../TestRDFConnectionFusekiBinary.java | 2 +-
.../rdfconnection/TestRDFConnectionRemote.java | 2 +-
12 files changed, 117 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java b/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
index 60ccf69..baa3b28 100644
--- a/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
+++ b/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
@@ -448,8 +448,8 @@ public class FusekiBasicCmd {
private static FusekiServer buildServer(ServerConfig serverConfig) {
FusekiServer.Builder builder = FusekiServer.create();
// Loopback.
- builder.setPort(serverConfig.port);
- builder.setLoopback(serverConfig.loopback);
+ builder.port(serverConfig.port);
+ builder.loopback(serverConfig.loopback);
if ( serverConfig.validators ) {
if ( serverConfig.sparqler )
@@ -470,7 +470,7 @@ public class FusekiBasicCmd {
}
if ( serverConfig.contentDirectory != null )
- builder.setStaticFileBase(serverConfig.contentDirectory) ;
+ builder.staticFileBase(serverConfig.contentDirectory) ;
return builder.build();
}
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-fuseki2/jena-fuseki-embedded/src/main/java/org/apache/jena/fuseki/embedded/FusekiServer.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/main/java/org/apache/jena/fuseki/embedded/FusekiServer.java b/jena-fuseki2/jena-fuseki-embedded/src/main/java/org/apache/jena/fuseki/embedded/FusekiServer.java
index 2df22e7..94f4c20 100644
--- a/jena-fuseki2/jena-fuseki-embedded/src/main/java/org/apache/jena/fuseki/embedded/FusekiServer.java
+++ b/jena-fuseki2/jena-fuseki-embedded/src/main/java/org/apache/jena/fuseki/embedded/FusekiServer.java
@@ -20,9 +20,7 @@ package org.apache.jena.fuseki.embedded;
import static java.util.Objects.requireNonNull;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServlet;
@@ -33,8 +31,8 @@ import org.apache.jena.fuseki.FusekiConfigException;
import org.apache.jena.fuseki.FusekiException;
import org.apache.jena.fuseki.build.FusekiBuilder;
import org.apache.jena.fuseki.build.FusekiConfig;
-import org.apache.jena.fuseki.ctl.ActionStats;
import org.apache.jena.fuseki.ctl.ActionPing;
+import org.apache.jena.fuseki.ctl.ActionStats;
import org.apache.jena.fuseki.jetty.FusekiErrorHandler1;
import org.apache.jena.fuseki.server.*;
import org.apache.jena.fuseki.servlets.ActionService;
@@ -83,18 +81,13 @@ import org.eclipse.jetty.servlet.ServletHolder;
*
*/
public class FusekiServer {
- static {
- //FusekiEnv.mode = FusekiEnv.INIT.EMBEDDED;
- // Stop anything accidently resetting Fuseki server logging.
- //FusekiLogging.allowLoggingReset(false);
- }
-
/** Construct a Fuseki server for one dataset.
* It only responds to localhost.
- * The returned server has not been started */
+ * The returned server has not been started.
+ */
static public FusekiServer make(int port, String name, DatasetGraph dsg) {
return create()
- .setPort(port)
+ .port(port)
.setLoopback(true)
.add(name, dsg)
.build();
@@ -189,9 +182,18 @@ public class FusekiServer {
private String contextPath = "/";
private String staticContentDir = null;
private SecurityHandler securityHandler = null;
+ private Map<String, Object> servletAttr = new HashMap<>();
- /** Set the port to run on. */
+ /** Set the port to run on.
+ * @deprecated Use {@link #port}.
+ */
+ @Deprecated
public Builder setPort(int port) {
+ return port(port);
+ }
+
+ /** Set the port to run on. */
+ public Builder port(int port) {
if ( port < 0 )
throw new IllegalArgumentException("Illegal port="+port+" : Port must be greater than or equal to zero.");
this.port = port;
@@ -200,25 +202,60 @@ public class FusekiServer {
/** Context path to Fuseki. If it's "/" then Fuseki URL look like
* "http://host:port/dataset/query" else "http://host:port/path/dataset/query"
+ * @deprecated Use {@link #contextPath}.
*/
+ @Deprecated
public Builder setContextPath(String path) {
+ return contextPath(path);
+ }
+
+ /** Context path to Fuseki. If it's "/" then Fuseki URL look like
+ * "http://host:port/dataset/query" else "http://host:port/path/dataset/query"
+ */
+ public Builder contextPath(String path) {
requireNonNull(path, "path");
this.contextPath = path;
return this;
}
- /** Restrict the server to only responding to the localhost interface. */
+ /** Restrict the server to only responding to the localhost interface.
+ * @deprecated Use {@link #loopback}.
+ */
+ @Deprecated
public Builder setLoopback(boolean loopback) {
+ return loopback(loopback);
+ }
+
+ /** Restrict the server to only responding to the localhost interface. */
+ public Builder loopback(boolean loopback) {
this.loopback = loopback;
return this;
}
- /** Set the location (filing system directory) to serve static file from. */
+ /** Set the location (filing system directory) to serve static file from.
+ * @deprecated Use {@link #staticFileBase}.
+ */
+ @Deprecated
public Builder setStaticFileBase(String directory) {
+ return staticFileBase(directory);
+ }
+
+ /** Set the location (filing system directory) to serve static file from. */
+ public Builder staticFileBase(String directory) {
requireNonNull(directory, "directory");
this.staticContentDir = directory;
return this;
}
+
+ /** Set a Jetty SecurityHandler.
+ * <p>
+ * By default, the server runs with no security.
+ * @deprecated Use {@link #staticFileBase}.
+ */
+ @Deprecated
+ public Builder setSecurityHandler(SecurityHandler securityHandler) {
+ return securityHandler(securityHandler);
+ }
/** Set a Jetty SecurityHandler.
* <p>
@@ -226,16 +263,24 @@ public class FusekiServer {
* This is more for using the basic server for testing.
* The full Fuseki server provides security with Apache Shiro
* and a defensive reverse proxy (e.g. Apache httpd) in front of the Jetty server
- * can also be used, which provides a wide varity of proven security options.
+ * can also be used, which provides a wide variety of proven security options.
*/
- public Builder setSecurityHandler(SecurityHandler securityHandler) {
+ public Builder securityHandler(SecurityHandler securityHandler) {
requireNonNull(securityHandler, "securityHandler");
this.securityHandler = securityHandler;
return this;
}
- /** Set verbose logging */
+
+ /** Set verbose logging
+ * @deprecated Use {@link #verbose(boolean)}.
+ */
public Builder setVerbose(boolean verbose) {
+ return verbose(verbose);
+ }
+
+ /** Set verbose logging */
+ public Builder verbose(boolean verbose) {
this.verbose = verbose;
return this;
}
@@ -337,6 +382,19 @@ public class FusekiServer {
}
/**
+ * Add a servlet attribute. Pass a value of null to remove any existing binding.
+ */
+
+ public Builder addServletAttribute(String attrName, Object value) {
+ requireNonNull(attrName, "attrName");
+ if ( value != null )
+ servletAttr.put(attrName, value);
+ else
+ servletAttr.remove(attrName);
+ return this;
+ }
+
+ /**
* Add an operation and handler to the server. This does not enable it for any dataset.
* <p>
* To associate an operation with a dataset, call {@link #addOperation} after adding the dataset.
@@ -393,6 +451,7 @@ public class FusekiServer {
ServletContext cxt = handler.getServletContext();
Fuseki.setVerbose(cxt, verbose);
+ servletAttr.forEach((n,v)->cxt.setAttribute(n, v));
// Clone to isolate from any future changes.
ServiceDispatchRegistry.set(cxt, new ServiceDispatchRegistry(serviceDispatch));
DataAccessPointRegistry.set(cxt, new DataAccessPointRegistry(dataAccessPoints));
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/FusekiTestAuth.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/FusekiTestAuth.java b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/FusekiTestAuth.java
index 48eec5d..20152b8 100644
--- a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/FusekiTestAuth.java
+++ b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/FusekiTestAuth.java
@@ -113,8 +113,8 @@ public class FusekiTestAuth {
dsgTesting = dsg;
server = FusekiServer.create()
.add(datasetPath(), dsgTesting)
- .setPort(port())
- .setSecurityHandler(sh)
+ .port(port())
+ .securityHandler(sh)
.build()
.start();
}
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/FusekiTestServer.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/FusekiTestServer.java b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/FusekiTestServer.java
index b661e5d..c8de9db 100644
--- a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/FusekiTestServer.java
+++ b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/FusekiTestServer.java
@@ -231,7 +231,7 @@ public class FusekiTestServer {
dsgTesting = DatasetGraphFactory.createTxnMem();
server = FusekiServer.create()
.add(datasetPath(), dsgTesting)
- .setPort(port())
+ .port(port())
.build()
.start();
}
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestEmbeddedFuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestEmbeddedFuseki.java b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestEmbeddedFuseki.java
index 9841a9c..0d82a6e 100644
--- a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestEmbeddedFuseki.java
+++ b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestEmbeddedFuseki.java
@@ -96,7 +96,7 @@ public class TestEmbeddedFuseki {
DatasetGraph dsg = dataset() ;
int port = FusekiLib.choosePort() ;
FusekiServer server = FusekiServer.create()
- .setPort(port)
+ .port(port)
.add("/ds1", dsg)
.build() ;
server.start() ;
@@ -131,7 +131,7 @@ public class TestEmbeddedFuseki {
int port = FusekiLib.choosePort() ;
FusekiServer server = FusekiServer.create()
- .setPort(port)
+ .port(port)
.add("/data", dataService)
.build() ;
server.start() ;
@@ -170,7 +170,7 @@ public class TestEmbeddedFuseki {
DatasetGraph dsg = dataset() ;
int port = FusekiLib.choosePort() ;
FusekiServer server = FusekiServer.create()
- .setPort(port)
+ .port(port)
.add("/ds0", dsg)
.build() ;
server.start() ;
@@ -185,7 +185,7 @@ public class TestEmbeddedFuseki {
DatasetGraph dsg = dataset() ;
int port = FusekiLib.choosePort() ;
FusekiServer server = FusekiServer.create()
- .setPort(port)
+ .port(port)
.add("/ds0", dsg)
.enableStats(true)
.build() ;
@@ -202,8 +202,8 @@ public class TestEmbeddedFuseki {
int port = FusekiLib.choosePort() ;
FusekiServer server = FusekiServer.create()
- .setPort(port)
- .setContextPath("/ABC")
+ .port(port)
+ .contextPath("/ABC")
.add("/ds", dsg)
.build() ;
server.start() ;
@@ -220,7 +220,7 @@ public class TestEmbeddedFuseki {
int port = FusekiLib.choosePort() ;
FusekiServer server = FusekiServer.create()
- .setPort(port)
+ .port(port)
.parseConfigFile(DIR+"config.ttl")
.build() ;
server.start() ;
@@ -234,8 +234,8 @@ public class TestEmbeddedFuseki {
int port = FusekiLib.choosePort() ;
FusekiServer server = FusekiServer.create()
- .setPort(port)
- .setContextPath("/ABC")
+ .port(port)
+ .contextPath("/ABC")
.parseConfigFile(DIR+"config.ttl")
.build() ;
server.start() ;
@@ -259,7 +259,7 @@ public class TestEmbeddedFuseki {
dSrv.addEndpoint(Operation.GSP_R, "gsp") ;
FusekiServer server = FusekiServer.create()
.add("/dsrv1", dSrv)
- .setPort(port)
+ .port(port)
.build() ;
server.start() ;
try {
@@ -278,8 +278,8 @@ public class TestEmbeddedFuseki {
dSrv.addEndpoint(Operation.GSP_R, "gsp") ;
FusekiServer server = FusekiServer.create()
.add("/dsrv1", dSrv)
- .setStaticFileBase(DIR)
- .setPort(port)
+ .staticFileBase(DIR)
+ .port(port)
.build() ;
server.start() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestFusekiCustomOperation.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestFusekiCustomOperation.java b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestFusekiCustomOperation.java
index 064e1b2..17eaff6 100644
--- a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestFusekiCustomOperation.java
+++ b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestFusekiCustomOperation.java
@@ -64,7 +64,7 @@ public class TestFusekiCustomOperation {
FusekiServer server =
FusekiServer.create()
- .setPort(port)
+ .port(port)
.registerOperation(newOp, contentType, customHandler)
.add("/ds", dataService)
.build();
@@ -75,7 +75,7 @@ public class TestFusekiCustomOperation {
public void cfg_builder_CT() {
FusekiServer server =
FusekiServer.create()
- .setPort(port)
+ .port(port)
.registerOperation(newOp, contentType, customHandler)
.add("/ds", DatasetGraphFactory.createTxnMem(), true)
.addOperation("/ds", endpointName, newOp)
@@ -87,7 +87,7 @@ public class TestFusekiCustomOperation {
public void cfg_builder_noCT() {
FusekiServer server =
FusekiServer.create()
- .setPort(port)
+ .port(port)
.registerOperation(newOp, null, customHandler)
.add("/ds", DatasetGraphFactory.createTxnMem(), true)
.addOperation("/ds", endpointName, newOp)
@@ -98,7 +98,7 @@ public class TestFusekiCustomOperation {
@Test(expected=FusekiConfigException.class)
public void cfg_bad_01() {
FusekiServer.create()
- .setPort(port)
+ .port(port)
.registerOperation(newOp, null, customHandler)
.addOperation("/UNKNOWN", endpointName, newOp);
//.build();
@@ -107,7 +107,7 @@ public class TestFusekiCustomOperation {
@Test(expected=FusekiConfigException.class)
public void cfg_bad_02() {
FusekiServer.create()
- .setPort(port)
+ .port(port)
//.registerOperation(newOp, null, customHandler)
.add("/ds", DatasetGraphFactory.createTxnMem(), true)
// Unregistered.
@@ -117,7 +117,7 @@ public class TestFusekiCustomOperation {
public void cfg_bad_ct_not_enabkled_here() {
FusekiServer server = FusekiServer.create()
- .setPort(port)
+ .port(port)
.registerOperation(newOp, "app/special", customHandler)
.add("/ds", DatasetGraphFactory.createTxnMem(), true)
// Unregistered.
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestMultipleEmbedded.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestMultipleEmbedded.java b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestMultipleEmbedded.java
index 7a154c2..57d6c93 100644
--- a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestMultipleEmbedded.java
+++ b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/TestMultipleEmbedded.java
@@ -53,9 +53,9 @@ public class TestMultipleEmbedded {
DatasetGraph dsg = dataset() ;
int port = FusekiLib.choosePort() ;
- FusekiServer server1 = FusekiServer.create().setPort(port).add("/ds1", dsg).build() ;
+ FusekiServer server1 = FusekiServer.create().port(port).add("/ds1", dsg).build() ;
// Same port - Bbad.
- FusekiServer server2 = FusekiServer.create().setPort(port).add("/ds2", dsg).build() ;
+ FusekiServer server2 = FusekiServer.create().port(port).add("/ds2", dsg).build() ;
server1.start();
@@ -75,11 +75,11 @@ public class TestMultipleEmbedded {
public void multiple_02() {
DatasetGraph dsg = dataset() ;
int port1 = FusekiLib.choosePort() ;
- FusekiServer server1 = FusekiServer.create().setPort(port1).add("/ds1", dsg).build() ;
+ FusekiServer server1 = FusekiServer.create().port(port1).add("/ds1", dsg).build() ;
// Different port - good
int port2 = FusekiLib.choosePort() ;
- FusekiServer server2 = FusekiServer.create().setPort(port2).add("/ds2", dsg).build() ;
+ FusekiServer server2 = FusekiServer.create().port(port2).add("/ds2", dsg).build() ;
try {
server1.start();
@@ -97,11 +97,11 @@ public class TestMultipleEmbedded {
DatasetGraph dsg2 = dataset() ;
// Same name.
int port1 = FusekiLib.choosePort() ;
- FusekiServer server1 = FusekiServer.create().setPort(port1).add("/ds", dsg1).build().start() ;
+ FusekiServer server1 = FusekiServer.create().port(port1).add("/ds", dsg1).build().start() ;
Txn.executeWrite(dsg1, ()->dsg1.add(q1));
int port2 = FusekiLib.choosePort() ;
- FusekiServer server2 = FusekiServer.create().setPort(port2).add("/ds", dsg2).build().start() ;
+ FusekiServer server2 = FusekiServer.create().port(port2).add("/ds", dsg2).build().start() ;
Txn.executeWrite(dsg2, ()->dsg2.add(q2));
query("http://localhost:"+port1+"/ds/", "SELECT * {?s ?p 1}", qExec->{
@@ -130,11 +130,11 @@ public class TestMultipleEmbedded {
DatasetGraph dsg = dataset() ;
int port1 = FusekiLib.choosePort() ;
- FusekiServer server1 = FusekiServer.create().setPort(port1).add("/ds1", dsg).build().start() ;
+ FusekiServer server1 = FusekiServer.create().port(port1).add("/ds1", dsg).build().start() ;
Txn.executeWrite(dsg, ()->dsg.add(q1));
int port2 = FusekiLib.choosePort() ;
- FusekiServer server2 = FusekiServer.create().setPort(port2).add("/ds2", dsg).build().start() ;
+ FusekiServer server2 = FusekiServer.create().port(port2).add("/ds2", dsg).build().start() ;
Txn.executeWrite(dsg, ()->dsg.add(q2));
query("http://localhost:"+port1+"/ds1", "SELECT * {?s ?p ?o}", qExec->{
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_1.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_1.java b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_1.java
index cdeb7c4..e4f8e3d 100644
--- a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_1.java
+++ b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_1.java
@@ -103,8 +103,8 @@ public class ExtendFuseki_AddService_1 {
ActionService customHandler = new SpecialService();
FusekiServer server =
- FusekiServer.create().setPort(PORT)
- .setVerbose(true)
+ FusekiServer.create().port(PORT)
+ .verbose(true)
// Register the new operation, and it's handler, but no Content-Type
.registerOperation(myOperation, customHandler)
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_2.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_2.java b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_2.java
index a05026a..7c97132 100644
--- a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_2.java
+++ b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_2.java
@@ -74,8 +74,8 @@ public class ExtendFuseki_AddService_2 {
ActionService customHandler = new SpecialService();
FusekiServer server =
- FusekiServer.create().setPort(PORT)
- .setVerbose(true)
+ FusekiServer.create().port(PORT)
+ .verbose(true)
// Register the new operation, and it's handler
.registerOperation(myOperation, customHandler)
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_3.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_3.java b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_3.java
index eb23df3..ce663a8 100644
--- a/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_3.java
+++ b/jena-fuseki2/jena-fuseki-embedded/src/test/java/org/apache/jena/fuseki/embedded/examples/ExtendFuseki_AddService_3.java
@@ -67,8 +67,8 @@ public class ExtendFuseki_AddService_3 {
ActionService customHandler = new SpecialService();
FusekiServer server =
- FusekiServer.create().setPort(PORT)
- .setVerbose(true)
+ FusekiServer.create().port(PORT)
+ .verbose(true)
// Register the new operation, with content type and handler
.registerOperation(myOperation, contentType, customHandler)
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionFusekiBinary.java
----------------------------------------------------------------------
diff --git a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionFusekiBinary.java b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionFusekiBinary.java
index 9619798..881b87e 100644
--- a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionFusekiBinary.java
+++ b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionFusekiBinary.java
@@ -114,7 +114,7 @@ public class TestRDFConnectionFusekiBinary {
DatasetGraph dsg = DatasetGraphFactory.createTxnMem();
return
FusekiServer.create()
- .setPort(PORT)
+ .port(PORT)
//.setStaticFileBase("/home/afs/ASF/jena-fuseki-cmds/sparqler")
.add("/ds", dsg)
//.setVerbose(true)
http://git-wip-us.apache.org/repos/asf/jena/blob/f6bac07b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionRemote.java
----------------------------------------------------------------------
diff --git a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionRemote.java b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionRemote.java
index d064b6d..5dc87f1 100644
--- a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionRemote.java
+++ b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionRemote.java
@@ -41,7 +41,7 @@ public class TestRDFConnectionRemote extends AbstractTestRDFConnection {
public static void beforeClass() {
PORT = FusekiLib.choosePort();
server = FusekiServer.create()
- .setPort(PORT)
+ .port(PORT)
.add("/ds", serverdsg)
.build() ;
LogCtl.setLevel(Fuseki.serverLogName, "WARN");