[jena] branch main updated: GH-1228: Process update flag for file datasets

[andy]

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new 1e32719  GH-1228: Process update flag for file datasets
     new 1ccac6b  Merge pull request #1229 from afs/gh-1228
1e32719 is described below

commit 1e3271949f5664cc6fd326aee116ca711defcc7f
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Mon Mar 21 17:30:25 2022 +0000

    GH-1228: Process update flag for file datasets
---
 .../src/main/java/org/apache/jena/fuseki/server/FusekiInfo.java  | 9 ++++-----
 .../main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java   | 8 ++------
 .../src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java      | 2 ++
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git 
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiInfo.java
 
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiInfo.java
index 2ed2669..4d5f513 100644
--- 
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiInfo.java
+++ 
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiInfo.java
@@ -56,16 +56,15 @@ public class FusekiInfo {
     public static void logServerSetup(Logger log, boolean verbose,
                                       DataAccessPointRegistry dapRegistry,
                                       String datasetPath, String 
datasetDescription, String serverConfigFile, String staticFiles) {
-        if ( datasetPath != null ) {
-            FmtLog.info(log,  "Database: %s", datasetDescription);
-        }
+        if ( datasetPath != null )
+            FmtLog.info(log, "Database: %s", datasetDescription);
         if ( serverConfigFile != null )
-            FmtLog.info(log,  "Configuration file: %s", serverConfigFile);
+            FmtLog.info(log, "Configuration file: %s", serverConfigFile);
 
         FusekiInfo.logDataAccessPointRegistry(log, dapRegistry, verbose);
 
         if ( staticFiles != null )
-            FmtLog.info(log,  "Static files: %s", staticFiles);
+            FmtLog.info(log, "Static files: %s", staticFiles);
 
         FmtLog.info(log,"System");
         if ( verbose )
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java
 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java
index 0a2ee21..8051e1a 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java
@@ -318,6 +318,8 @@ public class FusekiMain extends CmdARQ {
         if ( contains(argFile) ) {
             List<String> filenames = getValues(argFile);
             serverConfig.datasetDescription = "in-memory, with files loaded";
+            // Update is not enabled by default for --file
+            serverConfig.allowUpdate = contains(argUpdate);
             serverConfig.dsg = DatasetGraphFactory.createTxnMem();
 
             for(String filename : filenames ) {
@@ -450,12 +452,6 @@ public class FusekiMain extends CmdARQ {
         serverConfig.withStats = contains(argWithStats);
         serverConfig.withMetrics = contains(argWithMetrics);
         serverConfig.withCompact = contains(argWithCompact);
-
-//            if ( contains(argGZip) ) {
-//                if ( !hasValueOfTrue(argGZip) && !hasValueOfFalse(argGZip) )
-//                    throw new CmdException(argGZip.getNames().get(0) + ": 
Not understood: " + getValue(argGZip));
-//                jettyServerConfig.enableCompression = 
super.hasValueOfTrue(argGZip);
-//            }
     }
 
     private int portNumber(ArgDecl arg) {
diff --git 
a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
 
b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
index e66abe0..af3687e 100644
--- 
a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
+++ 
b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
@@ -266,6 +266,8 @@ public class FusekiCmd {
                 // Directly populate the dataset.
                 cmdLine.reset();
                 cmdLine.dsg = DatasetGraphFactory.createTxnMem();
+                // Update is not enabled by default for --file
+                cmdLine.allowUpdate = contains(argUpdate);
                 cmdLine.datasetDescription = "in-memory, with files loaded";
                 for ( String filename : filenames ) {
                     String pathname = filename;