[jena] branch main updated: Don't write StoreParams label (for previous versions)

[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 2a1096cf76 Don't write StoreParams label (for previous versions)
     new c0535526e5 Merge pull request #1590 from afs/store-params-fix
2a1096cf76 is described below

commit 2a1096cf762ad54caf5d07e816735e37d6861781
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Thu Oct 27 15:45:20 2022 +0100

    Don't write StoreParams label (for previous versions)
---
 .../main/java/org/apache/jena/tdb2/params/StoreParamsCodec.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsCodec.java 
b/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsCodec.java
index 3052d445a5..7e792d7831 100644
--- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsCodec.java
+++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsCodec.java
@@ -86,8 +86,9 @@ public class StoreParamsCodec {
         JsonBuilder builder = new JsonBuilder();
         builder.startObject("StoreParams");    // "StoreParams" is an internal 
alignment marker - not in the JSON.
 
-        if ( params.label != null )
-            encode(builder, key(fLabel),                params.getLabel());
+        //Don't include label - otherwise previous versions can't read the 
database.
+//        if ( params.label != null )
+//            encode(builder, key(fLabel),                params.getLabel());
 
         encode(builder, key(fFileMode),                 
params.getFileMode().name());
         encode(builder, key(fBlockSize),                params.getBlockSize());
@@ -129,7 +130,9 @@ public class StoreParamsCodec {
         for ( String key : json.keys() ) {
             String short_key = unkey(key);
             switch(short_key) {
+                // Optional (4.7.0 onwards)
                 case fLabel :                  builder.label(getString(json, 
key));                        break ;
+                // Expected.
                 case fFileMode :               
builder.fileMode(FileMode.valueOf(getString(json, key)));   break ;
                 case fBlockSize:               builder.blockSize(getInt(json, 
key));                       break ;
                 case fBlockReadCacheSize:      
builder.blockReadCacheSize(getInt(json, key));              break ;