Skip to content

Feature/261 datamanager architecture refactoring new model #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abdessamad-abdoun merged 9 commits into from
Feb 5, 2026
Merged

Feature/261 datamanager architecture refactoring new model #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8987f28
Refactor DataManager architecture new Model
abdessamad-abdoun Jan 30, 2026
667d72d
Refactor DataManager architecture new Model TU
abdessamad-abdoun Jan 30, 2026
f6247f1
Refactor DataManager architecture new Model TU
abdessamad-abdoun Jan 30, 2026
f289fdf
Refactor DataManager architecture new Model TU
abdessamad-abdoun Jan 30, 2026
9a0632e
Refactor DataManager architecture new Model TU
abdessamad-abdoun Feb 2, 2026
499a704
Refactor DataManager architecture new Model TU
abdessamad-abdoun Feb 2, 2026
c34379a
Refactor DataManager architecture revue
abdessamad-abdoun Feb 3, 2026
699836f
Refactor DataManager architecture new Model
abdessamad-abdoun Feb 4, 2026
71c80bc
Refactor DataManager architecture new Model
abdessamad-abdoun Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 0 additions & 10 deletions src/main/java/fr/inria/corese/core/next/api/query/GraphQuery.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .../fr/inria/corese/core/next/api/BNode.java → ...nria/corese/core/next/data/api/BNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

/**
* Represents a blank node in a RDF graph.
Expand Down
2 changes: 1 addition & 1 deletion .../corese/core/next/api/IPrefixHandler.java → ...se/core/next/data/api/IPrefixHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

import java.util.Map;
import java.util.Set;
Expand Down
2 changes: 1 addition & 1 deletion ...va/fr/inria/corese/core/next/api/IRI.java → .../inria/corese/core/next/data/api/IRI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

/**
* Represents an IRI
Expand Down
4 changes: 2 additions & 2 deletions ...r/inria/corese/core/next/api/Literal.java → ...ia/corese/core/next/data/api/Literal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

import fr.inria.corese.core.next.api.literal.CoreDatatype ;
import fr.inria.corese.core.next.data.api.literal.CoreDatatype;

import javax.xml.datatype.XMLGregorianCalendar;
import java.math.BigDecimal;
Expand Down
4 changes: 2 additions & 2 deletions .../fr/inria/corese/core/next/api/Model.java → ...nria/corese/core/next/data/api/Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

import java.io.Serializable;
import java.util.Optional;
import java.util.Set;

import fr.inria.corese.core.next.impl.exception.IncorrectOperationException;
import fr.inria.corese.core.next.data.impl.exception.IncorrectOperationException;

/**
* This class represents an RDF model, a set of statements.
Expand Down
2 changes: 1 addition & 1 deletion ...inria/corese/core/next/api/Namespace.java → .../corese/core/next/data/api/Namespace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

import java.io.Serializable;

Expand Down
2 changes: 1 addition & 1 deletion .../corese/core/next/api/NamespaceAware.java → ...se/core/next/data/api/NamespaceAware.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

import java.util.Optional;
import java.util.Set;
Expand Down
2 changes: 1 addition & 1 deletion .../inria/corese/core/next/api/Resource.java → ...a/corese/core/next/data/api/Resource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

/**
* Super interface of all resources of an RDF graph (statements, IRI, blank
Expand Down
2 changes: 1 addition & 1 deletion ...inria/corese/core/next/api/Statement.java → .../corese/core/next/data/api/Statement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

import java.io.Serializable;

Expand Down
2 changes: 1 addition & 1 deletion ...fr/inria/corese/core/next/api/Triple.java → ...ria/corese/core/next/data/api/Triple.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

public interface Triple extends Resource {

Expand Down
2 changes: 1 addition & 1 deletion .../fr/inria/corese/core/next/api/Value.java → ...nria/corese/core/next/data/api/Value.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

import java.io.Serializable;

Expand Down
4 changes: 2 additions & 2 deletions ...ia/corese/core/next/api/ValueFactory.java → ...rese/core/next/data/api/ValueFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.inria.corese.core.next.api;
package fr.inria.corese.core.next.data.api;

import fr.inria.corese.core.next.api.literal.CoreDatatype;
import fr.inria.corese.core.next.data.api.literal.CoreDatatype;

import javax.xml.datatype.XMLGregorianCalendar;
import java.math.BigDecimal;
Expand Down
2 changes: 1 addition & 1 deletion ...t/api/base/exception/CoreseException.java → ...a/api/base/exception/CoreseException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api.base.exception;
package fr.inria.corese.core.next.data.api.base.exception;

/**
* CoreseException is the superclass for all exceptions thrown by the Corese framework.
Expand Down
4 changes: 2 additions & 2 deletions ...e/next/api/base/io/AbstractIOOptions.java → ...t/data/api/base/io/AbstractIOOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.inria.corese.core.next.api.base.io;
package fr.inria.corese.core.next.data.api.base.io;

import fr.inria.corese.core.next.api.io.IOOptions;
import fr.inria.corese.core.next.data.io.IOOptions;

/**
* Abstract class for parser/serializers that sets up the necessity of implementing a builder pattern.
Expand Down
2 changes: 1 addition & 1 deletion ...ese/core/next/api/base/io/FileFormat.java → ...ore/next/data/api/base/io/FileFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api.base.io;
package fr.inria.corese.core.next.data.api.base.io;

import java.util.List;
import java.util.Objects;
Expand Down
2 changes: 1 addition & 1 deletion ...rese/core/next/api/base/io/RDFFormat.java → ...core/next/data/api/base/io/RDFFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api.base.io;
package fr.inria.corese.core.next.data.api.base.io;

import java.util.List;
import java.util.Locale;
Expand Down
14 changes: 7 additions & 7 deletions ...api/base/io/parser/AbstractRDFParser.java → ...api/base/io/parser/AbstractRDFParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package fr.inria.corese.core.next.api.base.io.parser;
package fr.inria.corese.core.next.data.api.base.io.parser;

import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.Objects;

import fr.inria.corese.core.next.api.Model;
import fr.inria.corese.core.next.api.ValueFactory;
import fr.inria.corese.core.next.api.base.io.AbstractIOOptions;
import fr.inria.corese.core.next.api.io.IOOptions;
import fr.inria.corese.core.next.api.io.common.BaseIRIOptions;
import fr.inria.corese.core.next.api.io.parser.RDFParser;
import fr.inria.corese.core.next.data.api.Model;
import fr.inria.corese.core.next.data.api.ValueFactory;
import fr.inria.corese.core.next.data.api.base.io.AbstractIOOptions;
import fr.inria.corese.core.next.data.io.IOOptions;
import fr.inria.corese.core.next.data.io.common.BaseIRIOptions;
import fr.inria.corese.core.next.data.io.parser.RDFParser;

/**
* Abstract class for RDFParser that set up the inner Model and ValueFactory
Expand Down
12 changes: 6 additions & 6 deletions ...e/io/parser/AbstractRDFParserFactory.java → ...e/io/parser/AbstractRDFParserFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package fr.inria.corese.core.next.api.base.io.parser;
package fr.inria.corese.core.next.data.api.base.io.parser;

import fr.inria.corese.core.next.api.Model;
import fr.inria.corese.core.next.api.ValueFactory;
import fr.inria.corese.core.next.api.base.io.RDFFormat;
import fr.inria.corese.core.next.api.io.parser.RDFParser;
import fr.inria.corese.core.next.api.io.parser.RDFParserFactory;
import fr.inria.corese.core.next.data.api.Model;
import fr.inria.corese.core.next.data.api.ValueFactory;
import fr.inria.corese.core.next.data.api.base.io.RDFFormat;
import fr.inria.corese.core.next.data.io.parser.RDFParser;
import fr.inria.corese.core.next.data.io.parser.RDFParserFactory;

/**
* Abstract base class for {@link RDFParserFactory}s.
Expand Down
4 changes: 2 additions & 2 deletions ...re/next/api/base/model/AbstractBNode.java → ...xt/data/api/base/model/AbstractBNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.inria.corese.core.next.api.base.model;
package fr.inria.corese.core.next.data.api.base.model;

import fr.inria.corese.core.next.api.BNode;
import fr.inria.corese.core.next.data.api.BNode;

/**
* Abstract implementation of the {@link BNode} interface, providing common functionality for blank node representations.
Expand Down
8 changes: 4 additions & 4 deletions ...core/next/api/base/model/AbstractIRI.java → ...next/data/api/base/model/AbstractIRI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package fr.inria.corese.core.next.api.base.model;
package fr.inria.corese.core.next.data.api.base.model;

import fr.inria.corese.core.next.api.IRI;
import fr.inria.corese.core.next.impl.common.util.IRIUtils;
import fr.inria.corese.core.next.impl.exception.IncorrectFormatException;
import fr.inria.corese.core.next.data.api.IRI;
import fr.inria.corese.core.next.data.impl.common.util.IRIUtils;
import fr.inria.corese.core.next.data.impl.exception.IncorrectFormatException;

import java.io.Serial;

Expand Down
16 changes: 8 additions & 8 deletions ...re/next/api/base/model/AbstractModel.java → ...xt/data/api/base/model/AbstractModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api.base.model;
package fr.inria.corese.core.next.data.api.base.model;

import java.util.AbstractSet;
import java.util.ArrayList;
Expand All @@ -10,13 +10,13 @@
import java.util.Optional;
import java.util.Set;

import fr.inria.corese.core.next.api.IRI;
import fr.inria.corese.core.next.api.Model;
import fr.inria.corese.core.next.api.Namespace;
import fr.inria.corese.core.next.api.Resource;
import fr.inria.corese.core.next.api.Statement;
import fr.inria.corese.core.next.api.Value;
import fr.inria.corese.core.next.impl.temp.ModelNamespace;
import fr.inria.corese.core.next.data.api.IRI;
import fr.inria.corese.core.next.data.api.Model;
import fr.inria.corese.core.next.data.api.Namespace;
import fr.inria.corese.core.next.data.api.Resource;
import fr.inria.corese.core.next.data.api.Statement;
import fr.inria.corese.core.next.data.api.Value;
import fr.inria.corese.core.next.data.impl.temp.ModelNamespace;

/**
* Abstract class that implements the Model interface.
Expand Down
4 changes: 2 additions & 2 deletions ...ext/api/base/model/AbstractNamespace.java → ...ata/api/base/model/AbstractNamespace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package fr.inria.corese.core.next.api.base.model;
package fr.inria.corese.core.next.data.api.base.model;

import java.io.Serial;
import java.util.Objects;

import fr.inria.corese.core.next.api.Namespace;
import fr.inria.corese.core.next.data.api.Namespace;

/**
* A base implementation of the {@link Namespace} interface.
Expand Down
4 changes: 2 additions & 2 deletions ...ext/api/base/model/AbstractStatement.java → ...ata/api/base/model/AbstractStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.inria.corese.core.next.api.base.model;
package fr.inria.corese.core.next.data.api.base.model;

import fr.inria.corese.core.next.api.Statement;
import fr.inria.corese.core.next.data.api.Statement;
import java.util.Objects;

/**
Expand Down
14 changes: 7 additions & 7 deletions ...re/next/api/base/model/ReadOnlyModel.java → ...xt/data/api/base/model/ReadOnlyModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package fr.inria.corese.core.next.api.base.model;
package fr.inria.corese.core.next.data.api.base.model;

import java.util.Collections;
import java.util.Iterator;
import java.util.Optional;
import java.util.Set;

import fr.inria.corese.core.next.api.IRI;
import fr.inria.corese.core.next.api.Model;
import fr.inria.corese.core.next.api.Namespace;
import fr.inria.corese.core.next.api.Resource;
import fr.inria.corese.core.next.api.Statement;
import fr.inria.corese.core.next.api.Value;
import fr.inria.corese.core.next.data.api.IRI;
import fr.inria.corese.core.next.data.api.Model;
import fr.inria.corese.core.next.data.api.Namespace;
import fr.inria.corese.core.next.data.api.Resource;
import fr.inria.corese.core.next.data.api.Statement;
import fr.inria.corese.core.next.data.api.Value;

/**
* A read-only wrapper for a {@link Model}. All modification operations throw
Expand Down
6 changes: 3 additions & 3 deletions .../base/model/literal/AbstractDuration.java → .../base/model/literal/AbstractDuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api.base.model.literal;
package fr.inria.corese.core.next.data.api.base.model.literal;

import java.time.DateTimeException;
import java.time.temporal.TemporalAmount;
Expand All @@ -9,8 +9,8 @@
import java.util.SortedSet;
import java.util.TreeSet;

import fr.inria.corese.core.next.api.literal.CoreDatatype;
import fr.inria.corese.core.next.impl.common.literal.XSD;
import fr.inria.corese.core.next.data.api.literal.CoreDatatype;
import fr.inria.corese.core.next.data.impl.common.literal.XSD;

/**
* Abstract class representing a duration literal in RDF.
Expand Down
12 changes: 6 additions & 6 deletions ...i/base/model/literal/AbstractLiteral.java → ...i/base/model/literal/AbstractLiteral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.inria.corese.core.next.api.base.model.literal;
package fr.inria.corese.core.next.data.api.base.model.literal;

import java.math.BigDecimal;
import java.math.BigInteger;
Expand All @@ -9,11 +9,11 @@

import javax.xml.datatype.XMLGregorianCalendar;

import fr.inria.corese.core.next.api.IRI;
import fr.inria.corese.core.next.api.Literal;
import fr.inria.corese.core.next.api.literal.CoreDatatype;
import fr.inria.corese.core.next.impl.common.literal.XSD;
import fr.inria.corese.core.next.impl.exception.IncorrectOperationException;
import fr.inria.corese.core.next.data.api.IRI;
import fr.inria.corese.core.next.data.api.Literal;
import fr.inria.corese.core.next.data.api.literal.CoreDatatype;
import fr.inria.corese.core.next.data.impl.common.literal.XSD;
import fr.inria.corese.core.next.data.impl.exception.IncorrectOperationException;

/**
* Base class for all literals. All value accessors throw an exception by default.
Expand Down
4 changes: 2 additions & 2 deletions ...pi/base/model/literal/AbstractNumber.java → ...pi/base/model/literal/AbstractNumber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.inria.corese.core.next.api.base.model.literal;
package fr.inria.corese.core.next.data.api.base.model.literal;

import fr.inria.corese.core.next.api.IRI;
import fr.inria.corese.core.next.data.api.IRI;

/**
* Abstract class representing a number literal in RDF.
Expand Down
4 changes: 2 additions & 2 deletions .../model/literal/AbstractStringLiteral.java → .../model/literal/AbstractStringLiteral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.inria.corese.core.next.api.base.model.literal;
package fr.inria.corese.core.next.data.api.base.model.literal;

import fr.inria.corese.core.next.api.IRI;
import fr.inria.corese.core.next.data.api.IRI;

/**
* Abstract class representing a string literal in Corese. It extends {@link AbstractLiteral}
Expand Down
4 changes: 2 additions & 2 deletions ...literal/AbstractTemporalPointLiteral.java → ...literal/AbstractTemporalPointLiteral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.inria.corese.core.next.api.base.model.literal;
package fr.inria.corese.core.next.data.api.base.model.literal;

import fr.inria.corese.core.next.api.IRI;
import fr.inria.corese.core.next.data.api.IRI;

/**
* Represents a temporal literal representing a point in time. Typically a date or a date and time. Implements the comparison between temporal literals.
Expand Down
6 changes: 3 additions & 3 deletions ...i/base/model/literal/DefaultDatatype.java → ...i/base/model/literal/DefaultDatatype.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package fr.inria.corese.core.next.api.base.model.literal;
package fr.inria.corese.core.next.data.api.base.model.literal;

import fr.inria.corese.core.next.api.IRI;
import fr.inria.corese.core.next.api.literal.CoreDatatype;
import fr.inria.corese.core.next.data.api.IRI;
import fr.inria.corese.core.next.data.api.literal.CoreDatatype;

public enum DefaultDatatype implements CoreDatatype {
NONE();
Expand Down
6 changes: 3 additions & 3 deletions ...e/core/next/api/literal/CoreDatatype.java → ...e/next/data/api/literal/CoreDatatype.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package fr.inria.corese.core.next.api.literal;
package fr.inria.corese.core.next.data.api.literal;

import fr.inria.corese.core.next.api.IRI;
import fr.inria.corese.core.next.api.base.model.literal.DefaultDatatype;
import fr.inria.corese.core.next.data.api.IRI;
import fr.inria.corese.core.next.data.api.base.model.literal.DefaultDatatype;

/**
* Represents a literal datatype.
Expand Down
4 changes: 2 additions & 2 deletions ...ese/core/next/api/query/BooleanQuery.java → ...ore/next/data/api/query/BooleanQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.inria.corese.core.next.api.query;
package fr.inria.corese.core.next.data.api.query;

import fr.inria.corese.core.next.api.query.exception.QueryEvaluationException;
import fr.inria.corese.core.next.data.api.query.exception.QueryEvaluationException;

public interface BooleanQuery extends Query<Boolean> {
/**
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/fr/inria/corese/core/next/data/api/query/GraphQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package fr.inria.corese.core.next.data.api.query;

import fr.inria.corese.core.next.data.api.query.exception.QueryEvaluationException;
import fr.inria.corese.core.next.data.api.query.result.GraphQueryResult;

public interface GraphQuery extends Query<GraphQueryResult> {

@Override
GraphQueryResult evaluate() throws QueryEvaluationException;
}
8 changes: 4 additions & 4 deletions ...corese/core/next/api/query/Operation.java → ...e/core/next/data/api/query/Operation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package fr.inria.corese.core.next.api.query;
package fr.inria.corese.core.next.data.api.query;

import fr.inria.corese.core.next.api.Value;
import fr.inria.corese.core.next.api.query.dataset.Dataset;
import fr.inria.corese.core.next.api.query.result.BindingSet;
import fr.inria.corese.core.next.data.api.Value;
import fr.inria.corese.core.next.data.api.query.dataset.Dataset;
import fr.inria.corese.core.next.data.api.query.result.BindingSet;

/**
* A generic SPARQL operation (query or update) on a Corese repository.
Expand Down
Loading