[GitHub] [jena] kinow commented on a change in pull request #1186: JENA-2269: Fuseki modules

[GitBox <gi...@apache.org>]

kinow commented on a change in pull request #1186:
URL: https://github.com/apache/jena/pull/1186#discussion_r798932606



##########
File path: jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java
##########
@@ -610,34 +649,62 @@ public Builder add(String name, Dataset dataset, boolean allowUpdate) {
          * update if allowUpdate=true.
          */
         public Builder add(String name, DatasetGraph dataset, boolean allowUpdate) {
-            name = DataAccessPoint.canonical(name);
             requireNonNull(name, "name");
             requireNonNull(dataset, "dataset");
+            name = DataAccessPoint.canonical(name);
             if ( isRegistered(name) )
                 throw new FusekiConfigException("Data service name already registered: "+name);
             DataService.Builder dataServiceBuilder = DataService.newBuilder(dataset).withStdServices(allowUpdate);
             addNamedDataService$(name, dataServiceBuilder);
             return this;
         }
 
+        /**
+         * Add a dataset, do not configure it in this call. Subsequent calls of
+         * {@code addEndpoint} and {@:code addOperation} will be needed to give this
+         * dataset some functionality.
+         * <p>
+         * Thsi operation replaces any previous dataset and configuration with the same canonical name.

Review comment:
       s/Thsi/This

##########
File path: jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/examples/ExFuseki_99_CustomOperation_GlobalDefault.java
##########
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.fuseki.main.examples;
+
+import java.io.IOException;
+import java.util.ServiceLoader;
+
+import org.apache.jena.atlas.lib.DateTimeUtils;
+import org.apache.jena.fuseki.Fuseki;
+import org.apache.jena.fuseki.FusekiException;
+import org.apache.jena.fuseki.build.FusekiExt;
+import org.apache.jena.fuseki.main.FusekiServer;
+import org.apache.jena.fuseki.main.sys.FusekiModule;
+import org.apache.jena.fuseki.server.Operation;
+import org.apache.jena.fuseki.servlets.ActionService;
+import org.apache.jena.fuseki.servlets.HttpAction;
+import org.apache.jena.fuseki.system.FusekiLogging;
+import org.apache.jena.http.HttpOp;
+import org.apache.jena.riot.WebContent;
+import org.apache.jena.sparql.core.DatasetGraphFactory;
+import org.apache.jena.sys.JenaSubsystemLifecycle;
+import org.apache.jena.sys.JenaSystem;
+import org.apache.jena.web.HttpSC;
+
+/**
+ * Example of adding a new operation to a Fuseki server by registering it with the
+ * global Fuseki registries and adding it to the global default services.
+ * <p>
+ * The custom operation is loaded using {@link ServiceLoader} as shown in
+ * {@link InitFusekiCustomOperation}.
+ * <p>
+ * {@link ExFuseki_04_CustomOperation_Module}
+ * <p>
+ * Doing this, adding the jar to the classpath, including the {@link ServiceLoader}
+ * setup, will automatically add it to the server.
+ * <p>
+ * See <a href="https://jena.apache.org/documentation/notes/jena-repack.html">Repacking Jena jars</a>.
+ * <p>
+ * See <a href="https://jena.apache.org/documentation/notes/system-initialization.html">System Initialization</a>
+ *
+ * This example code predates {@link FusekiModule}.
+ */
+public class ExFuseki_99_CustomOperation_GlobalDefault {
+
+    static {
+        JenaSystem.init();
+        FusekiLogging.setLogging();
+    }
+
+    // Example usage.
+    public static void main(String...args) {
+
+        // Imitate Service loader behaviour for Jena initialization.
+        new InitFusekiCustomOperation().start();
+
+        FusekiServer.create().port(3230).add("/ds", DatasetGraphFactory.createTxnMem()).build().start();
+
+        callOperation("extra");
+        System.exit(0);
+    }
+
+    private static void callOperation(String name) {
+        String x = HttpOp.httpGetString("http://localhost:3230/ds/"+name);
+        if ( x == null ) {
+            System.out.println("Not found : <null>");
+        } else {
+            System.out.print(x);
+            if ( ! x.endsWith("\n") )
+                System.out.println();
+        }
+    }
+
+    public static class InitFusekiCustomOperation implements JenaSubsystemLifecycle {
+
+        public InitFusekiCustomOperation() {}
+
+        @SuppressWarnings("deprecation")
+        @Override
+        public void start() {
+            // Can use Fuseki server logging.
+            Fuseki.configLog.info("Add custom operation");
+            System.err.println("**** Fuseki extension (global) ****");
+            Operation op = Operation.alloc("http://example/extra-service", "extra-service", "Test");
+            FusekiExt.registerOperation(op, new MyCustomService());
+            FusekiExt.addDefaultEndpoint(op, "extra");

Review comment:
       :+1: 




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org
For additional commands, e-mail: pr-help@jena.apache.org