From 293d07d04cfc859981ebb897dfc044f526aa16ad Mon Sep 17 00:00:00 2001 From: anquetil Date: Thu, 16 Jul 2026 15:36:27 +0200 Subject: [PATCH 1/2] Moved core.next.storagemanager.Dataset to core.next.query --- .../java/fr/inria/corese/core/next/query/api/Operation.java | 2 +- .../core/next/query/api/repository/RepositoryConnection.java | 2 +- .../next/{storagemanager/api => query}/dataset/Dataset.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/main/java/fr/inria/corese/core/next/{storagemanager/api => query}/dataset/Dataset.java (97%) diff --git a/src/main/java/fr/inria/corese/core/next/query/api/Operation.java b/src/main/java/fr/inria/corese/core/next/query/api/Operation.java index 11712c841..6264061b5 100644 --- a/src/main/java/fr/inria/corese/core/next/query/api/Operation.java +++ b/src/main/java/fr/inria/corese/core/next/query/api/Operation.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.next.query.api; import fr.inria.corese.core.next.data.api.Value; -import fr.inria.corese.core.next.storagemanager.api.dataset.Dataset; import fr.inria.corese.core.next.query.api.result.BindingSet; +import fr.inria.corese.core.next.query.dataset.Dataset; /** * A generic SPARQL operation (query or update) on a Corese repository. diff --git a/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java b/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java index 09b5d36c4..a77cd796e 100644 --- a/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java +++ b/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.next.query.api.repository; import fr.inria.corese.core.next.data.api.ValueFactory; -import fr.inria.corese.core.next.storagemanager.api.dataset.Dataset; import fr.inria.corese.core.next.query.api.exception.QuerySyntaxException; import fr.inria.corese.core.next.query.api.exception.RepositoryException; +import fr.inria.corese.core.next.query.dataset.Dataset; import fr.inria.corese.core.next.query.api.*; /** diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/api/dataset/Dataset.java b/src/main/java/fr/inria/corese/core/next/query/dataset/Dataset.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/storagemanager/api/dataset/Dataset.java rename to src/main/java/fr/inria/corese/core/next/query/dataset/Dataset.java index 4375789d8..6f02424ea 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/api/dataset/Dataset.java +++ b/src/main/java/fr/inria/corese/core/next/query/dataset/Dataset.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.storagemanager.api.dataset; +package fr.inria.corese.core.next.query.dataset; import java.util.Set; From 3023f4d50fb72a1985c92d202f18257429841c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20C=C3=A9r=C3=A8s?= Date: Thu, 16 Jul 2026 16:39:22 +0200 Subject: [PATCH 2/2] Move Dataset into query API --- .../java/fr/inria/corese/core/next/query/api/Operation.java | 2 +- .../corese/core/next/query/{ => api}/dataset/Dataset.java | 4 ++-- .../core/next/query/api/repository/RepositoryConnection.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/fr/inria/corese/core/next/query/{ => api}/dataset/Dataset.java (98%) diff --git a/src/main/java/fr/inria/corese/core/next/query/api/Operation.java b/src/main/java/fr/inria/corese/core/next/query/api/Operation.java index 6264061b5..4a465d80a 100644 --- a/src/main/java/fr/inria/corese/core/next/query/api/Operation.java +++ b/src/main/java/fr/inria/corese/core/next/query/api/Operation.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.next.data.api.Value; import fr.inria.corese.core.next.query.api.result.BindingSet; -import fr.inria.corese.core.next.query.dataset.Dataset; +import fr.inria.corese.core.next.query.api.dataset.Dataset; /** * A generic SPARQL operation (query or update) on a Corese repository. diff --git a/src/main/java/fr/inria/corese/core/next/query/dataset/Dataset.java b/src/main/java/fr/inria/corese/core/next/query/api/dataset/Dataset.java similarity index 98% rename from src/main/java/fr/inria/corese/core/next/query/dataset/Dataset.java rename to src/main/java/fr/inria/corese/core/next/query/api/dataset/Dataset.java index 6f02424ea..5952464c3 100644 --- a/src/main/java/fr/inria/corese/core/next/query/dataset/Dataset.java +++ b/src/main/java/fr/inria/corese/core/next/query/api/dataset/Dataset.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.query.dataset; +package fr.inria.corese.core.next.query.api.dataset; import java.util.Set; @@ -77,4 +77,4 @@ public interface Dataset { * @return this Dataset instance (or a new instance) cleared of all graphs. */ Dataset clear(); -} \ No newline at end of file +} diff --git a/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java b/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java index a77cd796e..ab9c12c8b 100644 --- a/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java +++ b/src/main/java/fr/inria/corese/core/next/query/api/repository/RepositoryConnection.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.next.query.api.repository; import fr.inria.corese.core.next.data.api.ValueFactory; +import fr.inria.corese.core.next.query.api.dataset.Dataset; import fr.inria.corese.core.next.query.api.exception.QuerySyntaxException; import fr.inria.corese.core.next.query.api.exception.RepositoryException; -import fr.inria.corese.core.next.query.dataset.Dataset; import fr.inria.corese.core.next.query.api.*; /** @@ -141,4 +141,4 @@ Update prepareUpdate(QueryLanguage queryLanguage, String updateString) * @throws IllegalStateException if the connection is closed */ void rollback() throws RepositoryException; -} \ No newline at end of file +}