This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch jena5
in repository https://gitbox.apache.org/repos/asf/jena.git
commit f1e2341804a809baf91a2338df6fd221938d0b70
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Thu Oct 19 18:05:07 2023 +0100
GH-2033: Move StoreConnection to oaj.tdb1.sys
---
.../src/main/java/org/apache/jena/fuseki/webapp/SystemState.java | 2 +-
jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Backup.java | 1 +
jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Factory.java | 1 +
.../main/java/org/apache/jena/tdb1/{ => sys}/StoreConnection.java | 8 +++-----
jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBInternal.java | 1 -
jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBMaker.java | 1 -
.../org/apache/jena/tdb1/transaction/DatasetGraphTransaction.java | 2 +-
.../java/org/apache/jena/tdb1/setup/TestStoreParamsCreate.java | 2 +-
.../java/org/apache/jena/tdb1/store/AbstractStoreConnections.java | 2 +-
.../apache/jena/tdb1/store/TestLocationLockStoreConnection.java | 2 +-
.../org/apache/jena/tdb1/transaction/AbstractTestTransSeq.java | 2 +-
.../jena/tdb1/transaction/AbstractTestTransSequentialDisk.java | 2 +-
.../java/org/apache/jena/tdb1/transaction/TestTDBInternal.java | 2 +-
.../test/java/org/apache/jena/tdb1/transaction/TestTransMem.java | 2 +-
.../java/org/apache/jena/tdb1/transaction/TestTransRestart.java | 2 +-
15 files changed, 15 insertions(+), 17 deletions(-)
diff --git
a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/SystemState.java
b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/SystemState.java
index 1b16a36852..bf7becccb2 100644
---
a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/SystemState.java
+++
b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/SystemState.java
@@ -21,12 +21,12 @@ package org.apache.jena.fuseki.webapp;
import org.apache.jena.atlas.lib.FileOps;
import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.query.Dataset;
-import org.apache.jena.tdb1.StoreConnection;
import org.apache.jena.tdb1.TDB1;
import org.apache.jena.tdb1.TDB1Factory;
import org.apache.jena.tdb1.base.block.FileMode;
import org.apache.jena.tdb1.base.file.Location;
import org.apache.jena.tdb1.setup.StoreParams;
+import org.apache.jena.tdb1.sys.StoreConnection;
import org.apache.jena.tdb1.transaction.DatasetGraphTransaction;
/**
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Backup.java
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Backup.java
index 149e646f95..c5db66071f 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Backup.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Backup.java
@@ -27,6 +27,7 @@ import org.apache.jena.query.TxnType;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.tdb1.base.file.Location;
+import org.apache.jena.tdb1.sys.StoreConnection;
import org.apache.jena.tdb1.transaction.DatasetGraphTxn;
/**
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Factory.java
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Factory.java
index 1b8d84240c..d0fd416510 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Factory.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Factory.java
@@ -30,6 +30,7 @@ import org.apache.jena.tdb1.assembler.VocabTDB;
import org.apache.jena.tdb1.base.file.Location;
import org.apache.jena.tdb1.setup.StoreParams;
import org.apache.jena.tdb1.store.DatasetGraphTDB;
+import org.apache.jena.tdb1.sys.StoreConnection;
import org.apache.jena.tdb1.sys.TDBInternal;
import org.apache.jena.tdb1.sys.TDBMaker;
import org.apache.jena.tdb1.transaction.DatasetGraphTransaction;
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/StoreConnection.java
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java
similarity index 98%
rename from jena-tdb1/src/main/java/org/apache/jena/tdb1/StoreConnection.java
rename to jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java
index 66f460a16b..fd9ca1987c 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/StoreConnection.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java
@@ -16,23 +16,21 @@
* limitations under the License.
*/
-package org.apache.jena.tdb1 ;
+package org.apache.jena.tdb1.sys ;
import java.util.HashMap ;
import java.util.Map ;
import java.util.Set ;
import org.apache.jena.query.TxnType;
+import org.apache.jena.tdb1.TDB1Exception;
+import org.apache.jena.tdb1.TDB1Factory;
import org.apache.jena.tdb1.base.file.ChannelManager;
import org.apache.jena.tdb1.base.file.Location;
import org.apache.jena.tdb1.base.file.LocationLock;
import org.apache.jena.tdb1.setup.DatasetBuilderStd;
import org.apache.jena.tdb1.setup.StoreParams;
import org.apache.jena.tdb1.store.DatasetGraphTDB;
-import org.apache.jena.tdb1.sys.ProcessUtils;
-import org.apache.jena.tdb1.sys.SystemTDB;
-import org.apache.jena.tdb1.sys.TDBInternal;
-import org.apache.jena.tdb1.sys.TDBMaker;
import org.apache.jena.tdb1.transaction.*;
/** A StoreConnection is the reference to the underlying storage.
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBInternal.java
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBInternal.java
index f0b6c71952..9d04abe0c9 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBInternal.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBInternal.java
@@ -25,7 +25,6 @@ import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.graph.Node ;
import org.apache.jena.query.Dataset ;
import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.tdb1.StoreConnection;
import org.apache.jena.tdb1.TDB1Exception;
import org.apache.jena.tdb1.base.file.Location;
import org.apache.jena.tdb1.setup.StoreParamsConst;
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBMaker.java
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBMaker.java
index 1cebcb9d3a..4625697907 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBMaker.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBMaker.java
@@ -21,7 +21,6 @@ package org.apache.jena.tdb1.sys;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.jena.tdb1.StoreConnection;
import org.apache.jena.tdb1.TDB1Factory;
import org.apache.jena.tdb1.base.file.Location;
import org.apache.jena.tdb1.transaction.DatasetGraphTransaction;
diff --git
a/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/DatasetGraphTransaction.java
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/DatasetGraphTransaction.java
index da88dfc788..660b1cc4bf 100644
---
a/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/DatasetGraphTransaction.java
+++
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/DatasetGraphTransaction.java
@@ -31,13 +31,13 @@ import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.DatasetGraphWrapper;
import org.apache.jena.sparql.core.Quad;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.tdb1.StoreConnection;
import org.apache.jena.tdb1.TDB1;
import org.apache.jena.tdb1.TDB1Exception;
import org.apache.jena.tdb1.base.file.Location;
import org.apache.jena.tdb1.store.DatasetGraphTDB;
import org.apache.jena.tdb1.store.GraphTxnTDB;
import org.apache.jena.tdb1.store.PrefixMapTDB1;
+import org.apache.jena.tdb1.sys.StoreConnection;
/**
* A transactional {@code DatasetGraph} that allows one active transaction per
thread.
diff --git
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/setup/TestStoreParamsCreate.java
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/setup/TestStoreParamsCreate.java
index 6d45395fcd..4822343799 100644
---
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/setup/TestStoreParamsCreate.java
+++
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/setup/TestStoreParamsCreate.java
@@ -27,8 +27,8 @@ import org.apache.jena.atlas.json.JSON ;
import org.apache.jena.atlas.json.JsonObject ;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.tdb1.ConfigTest;
-import org.apache.jena.tdb1.StoreConnection;
import org.apache.jena.tdb1.base.file.Location;
+import org.apache.jena.tdb1.sys.StoreConnection;
import org.junit.After ;
import org.junit.Before ;
import org.junit.Test ;
diff --git
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/AbstractStoreConnections.java
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/AbstractStoreConnections.java
index 18b508b67b..b3138e6827 100644
---
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/AbstractStoreConnections.java
+++
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/AbstractStoreConnections.java
@@ -30,10 +30,10 @@ import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.tdb1.ConfigTest;
-import org.apache.jena.tdb1.StoreConnection;
import org.apache.jena.tdb1.TDB1;
import org.apache.jena.tdb1.TDB1Factory;
import org.apache.jena.tdb1.base.file.Location;
+import org.apache.jena.tdb1.sys.StoreConnection;
import org.apache.jena.tdb1.sys.TDBInternal;
import org.apache.jena.tdb1.transaction.DatasetGraphTxn;
import org.apache.jena.tdb1.transaction.TDBTransactionException;
diff --git
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestLocationLockStoreConnection.java
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestLocationLockStoreConnection.java
index c88e8adab1..cc0ecd6b87 100644
---
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestLocationLockStoreConnection.java
+++
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestLocationLockStoreConnection.java
@@ -22,11 +22,11 @@ import java.io.BufferedWriter;
import java.io.FileWriter;
import java.io.IOException;
-import org.apache.jena.tdb1.StoreConnection;
import org.apache.jena.tdb1.TDB1Exception;
import org.apache.jena.tdb1.base.file.Location;
import org.apache.jena.tdb1.base.file.LocationLock;
import org.apache.jena.tdb1.sys.ProcessUtils;
+import org.apache.jena.tdb1.sys.StoreConnection;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.BeforeClass;
diff --git
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSeq.java
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSeq.java
index a1612a8e62..a8f55d420f 100644
---
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSeq.java
+++
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSeq.java
@@ -28,9 +28,9 @@ import org.apache.jena.sparql.JenaTransactionException;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.sse.SSE ;
-import org.apache.jena.tdb1.StoreConnection;
import org.apache.jena.tdb1.TDB1Exception;
import org.apache.jena.tdb1.store.DatasetGraphTDB;
+import org.apache.jena.tdb1.sys.StoreConnection;
import org.apache.jena.tdb1.sys.SystemTDB;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
diff --git
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSequentialDisk.java
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSequentialDisk.java
index 5b717c70a4..8ccb448a43 100644
---
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSequentialDisk.java
+++
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSequentialDisk.java
@@ -21,7 +21,7 @@ package org.apache.jena.tdb1.transaction;
import java.io.File ;
import org.apache.jena.tdb1.ConfigTest;
-import org.apache.jena.tdb1.StoreConnection;
+import org.apache.jena.tdb1.sys.StoreConnection;
import org.apache.jena.tdb1.sys.TDBInternal;
import org.junit.After ;
import org.junit.Before ;
diff --git
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDBInternal.java
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDBInternal.java
index 1930b1c8a8..f06dcc4050 100644
---
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDBInternal.java
+++
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDBInternal.java
@@ -22,8 +22,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock ;
import org.apache.jena.query.ReadWrite ;
import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.tdb1.StoreConnection;
import org.apache.jena.tdb1.TDB1Factory;
+import org.apache.jena.tdb1.sys.StoreConnection;
import org.apache.jena.tdb1.sys.TDBInternal;
import org.junit.Assert ;
import org.junit.Test ;
diff --git
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransMem.java
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransMem.java
index 2f84223ee7..77a8d80a9a 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransMem.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransMem.java
@@ -18,8 +18,8 @@
package org.apache.jena.tdb1.transaction;
-import org.apache.jena.tdb1.StoreConnection;
import org.apache.jena.tdb1.base.file.Location;
+import org.apache.jena.tdb1.sys.StoreConnection;
import org.apache.jena.tdb1.sys.TDBInternal;
import org.junit.After ;
import org.junit.Before ;
diff --git
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransRestart.java
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransRestart.java
index 4d9875d8fa..fe24580522 100644
---
a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransRestart.java
+++
b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransRestart.java
@@ -30,7 +30,6 @@ import org.apache.jena.query.TxnType;
import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.tdb1.ConfigTest;
-import org.apache.jena.tdb1.StoreConnection;
import org.apache.jena.tdb1.base.block.FileMode;
import org.apache.jena.tdb1.base.file.FileFactory;
import org.apache.jena.tdb1.base.file.Location;
@@ -38,6 +37,7 @@ import org.apache.jena.tdb1.base.objectfile.ObjectFile;
import org.apache.jena.tdb1.setup.DatasetBuilderStd;
import org.apache.jena.tdb1.store.DatasetGraphTDB;
import org.apache.jena.tdb1.sys.Names;
+import org.apache.jena.tdb1.sys.StoreConnection;
import org.apache.jena.tdb1.sys.SystemTDB;
import org.apache.jena.tdb1.sys.TDBInternal;
import org.junit.After ;
