diff --git a/src/main/java/fr/inria/corese/core/next/data/impl/io/serialization/DataSerializerFactory.java b/src/main/java/fr/inria/corese/core/next/data/impl/io/serialization/DataSerializerFactory.java index dfaf98553..60562f466 100644 --- a/src/main/java/fr/inria/corese/core/next/data/impl/io/serialization/DataSerializerFactory.java +++ b/src/main/java/fr/inria/corese/core/next/data/impl/io/serialization/DataSerializerFactory.java @@ -16,7 +16,7 @@ import fr.inria.corese.core.next.data.impl.io.serialization.rdfxml.RDFXMLSerializer; import fr.inria.corese.core.next.data.impl.io.serialization.trig.TriGSerializer; import fr.inria.corese.core.next.data.impl.io.serialization.turtle.TurtleSerializer; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import java.util.Collections; import java.util.HashMap; @@ -55,7 +55,7 @@ public class DataSerializerFactory implements SerializerFactory { * it falls back to the format's default configuration. */ public DataSerializerFactory() { - this.coreseValueFactory = new CoreseAdaptedValueFactory(); + this.coreseValueFactory = new CoreseValueFactory(); Map> tempRegistry = new HashMap<>(); Map> tempDefaultRegistry = new HashMap<>(); diff --git a/src/main/java/fr/inria/corese/core/next/data/impl/temp/CoreseValueConverter.java b/src/main/java/fr/inria/corese/core/next/data/impl/temp/CoreseValueConverter.java index 0f9f7de9d..13e0c0f9d 100644 --- a/src/main/java/fr/inria/corese/core/next/data/impl/temp/CoreseValueConverter.java +++ b/src/main/java/fr/inria/corese/core/next/data/impl/temp/CoreseValueConverter.java @@ -18,7 +18,7 @@ public class CoreseValueConverter { // Factory for creating Corese-compatible Value instances - private final ValueFactory factory = new CoreseAdaptedValueFactory(); + private final ValueFactory factory = new CoreseValueFactory(); // Constant representing the default Corese graph context private static final Node DEFAULT_CORESE_CONTEXT = DatatypeMap.createResource(ExpType.DEFAULT_GRAPH); diff --git a/src/main/java/fr/inria/corese/core/next/data/impl/temp/CoreseAdaptedValueFactory.java b/src/main/java/fr/inria/corese/core/next/data/impl/temp/CoreseValueFactory.java similarity index 99% rename from src/main/java/fr/inria/corese/core/next/data/impl/temp/CoreseAdaptedValueFactory.java rename to src/main/java/fr/inria/corese/core/next/data/impl/temp/CoreseValueFactory.java index ba5a29d3e..e3888ed48 100644 --- a/src/main/java/fr/inria/corese/core/next/data/impl/temp/CoreseAdaptedValueFactory.java +++ b/src/main/java/fr/inria/corese/core/next/data/impl/temp/CoreseValueFactory.java @@ -37,13 +37,13 @@ /** * Factory for all the Corese adapted values. */ -public class CoreseAdaptedValueFactory implements ValueFactory { +public class CoreseValueFactory implements ValueFactory { private static final SecureRandom secureRandom = new SecureRandom(); private final AtomicLong nodeID = new AtomicLong(secureRandom.nextLong()); - public CoreseAdaptedValueFactory() { + public CoreseValueFactory() { } /** diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/api/core/DatatypeValueFactory.java b/src/main/java/fr/inria/corese/core/next/query/kgram/api/core/DatatypeNodeFactory.java similarity index 83% rename from src/main/java/fr/inria/corese/core/next/query/kgram/api/core/DatatypeValueFactory.java rename to src/main/java/fr/inria/corese/core/next/query/kgram/api/core/DatatypeNodeFactory.java index d38956ec1..7e45c9f34 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/api/core/DatatypeValueFactory.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/api/core/DatatypeNodeFactory.java @@ -5,7 +5,7 @@ /** * @author Olivier Corby, Wimmics, INRIA 2019 */ -public interface DatatypeValueFactory { +public interface DatatypeNodeFactory { Node nodeList(List list); diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/DQPFactory.java b/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/DistributedQueryPlanFactory.java similarity index 79% rename from src/main/java/fr/inria/corese/core/next/query/kgram/api/query/DQPFactory.java rename to src/main/java/fr/inria/corese/core/next/query/kgram/api/query/DistributedQueryPlanFactory.java index db744464b..2f39b5f51 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/DQPFactory.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/DistributedQueryPlanFactory.java @@ -5,7 +5,7 @@ /** * @author corby */ -public interface DQPFactory { +public interface DistributedQueryPlanFactory { BgpGenerator instance(); diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/Environment.java b/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/Environment.java index 4750ddc07..9e04470ae 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/Environment.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/Environment.java @@ -5,7 +5,7 @@ import fr.inria.corese.core.next.query.kgram.api.core.Expr; import fr.inria.corese.core.next.query.kgram.api.core.Node; import fr.inria.corese.core.next.query.kgram.core.*; -import fr.inria.corese.core.next.query.kgram.event.EventManager; +import fr.inria.corese.core.next.query.kgram.event.KgramEventDispatcher; import fr.inria.corese.core.next.query.kgram.path.Path; import fr.inria.corese.core.next.query.kgram.tool.ApproximateSearchEnv; import fr.inria.corese.core.sparql.api.IDatatype; @@ -95,7 +95,7 @@ default void setGraphNode(Node n) { int count(); - EventManager getEventManager(); + KgramEventDispatcher getEventManager(); Object getObject(); diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/Producer.java b/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/Producer.java index b456017f4..f75e6e518 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/Producer.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/api/query/Producer.java @@ -153,7 +153,7 @@ Iterable getEdges(Node gNode, List from, Edge qEdge, Environment env boolean isBindable(Node node); - DatatypeValueFactory getDatatypeValueFactory(); + DatatypeNodeFactory getDatatypeNodeFactory(); /** * Given an object resulting from the evaluation of an extension function, diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/core/Eval.java b/src/main/java/fr/inria/corese/core/next/query/kgram/core/Eval.java index 0b7f12a15..ec453ebbe 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/core/Eval.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/core/Eval.java @@ -5,7 +5,7 @@ import fr.inria.corese.core.next.query.kgram.api.query.*; import fr.inria.corese.core.next.query.kgram.event.Event; import fr.inria.corese.core.next.query.kgram.event.EventImpl; -import fr.inria.corese.core.next.query.kgram.event.EventManager; +import fr.inria.corese.core.next.query.kgram.event.KgramEventDispatcher; import fr.inria.corese.core.next.query.kgram.event.ResultListener; import fr.inria.corese.core.next.query.kgram.path.PathFinder; import fr.inria.corese.core.sparql.api.IDatatype; @@ -52,7 +52,7 @@ public class Eval implements ExpType, Plugin { setNewMappingsVersion(true); } - EventManager manager; + KgramEventDispatcher manager; boolean hasEvent = false; // Edge and Node producer Producer saveProducer; @@ -1798,7 +1798,7 @@ private boolean match(Mapping map) { public void createManager() { if (manager == null) { - setEventManager(new EventManager()); + setEventManager(new KgramEventDispatcher()); if (memory != null) { memory.setEventManager(manager); } @@ -1808,11 +1808,11 @@ public void createManager() { } } - public EventManager getEventManager() { + public KgramEventDispatcher getEventManager() { return manager; } - public void setEventManager(EventManager man) { + public void setEventManager(KgramEventDispatcher man) { manager = man; hasEvent = true; } diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/core/Exp.java b/src/main/java/fr/inria/corese/core/next/query/kgram/core/Exp.java index 77b2dd470..57b3c064f 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/core/Exp.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/core/Exp.java @@ -1004,7 +1004,7 @@ public boolean bound(List fvec, List evec) { * inSubScope = true : collect nodes of left of optional and surely bound by union * optional = true : we are inside an optional */ - void getNodes(ExpHandler h) { + void getNodes(ExpNodeCollector h) { switch (type()) { case FILTER: // get exists {} nodes @@ -1125,7 +1125,7 @@ boolean isSkipStatement() { /** * complete handler selectList with this query selectList */ - void queryNodeList(ExpHandler h) { + void queryNodeList(ExpNodeCollector h) { List selectList = h.getSelectNodeList(); List subSelectList = getQuery().getSelect(); @@ -1156,7 +1156,7 @@ public Exp getPattern(Expr exp) { /** * This is a filter get exists{} nodes if any */ - void getExistNodes(Expr exp, ExpHandler h, List lExistNode) { + void getExistNodes(Expr exp, ExpNodeCollector h, List lExistNode) { if (exp.oper() == ExprType.EXIST) { Exp pat = getPattern(exp); List lNode = pat.getTheNodes(h.copy()); @@ -1211,13 +1211,13 @@ List getInScopeNodes(boolean bind) { return getTheNodes(handler(true, bind).sample()); } - public List getTheNodes(ExpHandler h) { + public List getTheNodes(ExpNodeCollector h) { getNodes(h); return h.getNodes(); } - ExpHandler handler(boolean inSubScope, boolean bind) { - return new ExpHandler(inSubScope, bind); + ExpNodeCollector handler(boolean inSubScope, boolean bind) { + return new ExpNodeCollector(inSubScope, bind); } void add(List lNode, Node node) { diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/core/ExpHandler.java b/src/main/java/fr/inria/corese/core/next/query/kgram/core/ExpNodeCollector.java similarity index 85% rename from src/main/java/fr/inria/corese/core/next/query/kgram/core/ExpHandler.java rename to src/main/java/fr/inria/corese/core/next/query/kgram/core/ExpNodeCollector.java index 5e042bd29..a742b4dd2 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/core/ExpHandler.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/core/ExpNodeCollector.java @@ -8,7 +8,7 @@ /** * */ -public class ExpHandler { +public class ExpNodeCollector { private List nodeList; private final List selectNodeList; @@ -22,19 +22,19 @@ public class ExpHandler { // when false, return nodes from first exp private boolean all = true; - public ExpHandler() { + public ExpNodeCollector() { nodeList = new ArrayList<>(); selectNodeList = new ArrayList<>(); existNodeList = new ArrayList<>(); } - public ExpHandler(boolean inSubScope, boolean bind) { + public ExpNodeCollector(boolean inSubScope, boolean bind) { this(); setInSubScope(inSubScope).setBind(bind); } - public ExpHandler copy() { - ExpHandler h = new ExpHandler(); + public ExpNodeCollector copy() { + ExpNodeCollector h = new ExpNodeCollector(); h.setAll(isAll()).setBind(isBind()) .setBlank(isBlank()).setExist(isExist()) .setInSubScope(isInSubScope()); @@ -116,7 +116,7 @@ public boolean isInSubScope() { return inSubScope; } - public ExpHandler setInSubScope(boolean inSubScope) { + public ExpNodeCollector setInSubScope(boolean inSubScope) { this.inSubScope = inSubScope; return this; } @@ -129,7 +129,7 @@ public boolean isBind() { return bind; } - public ExpHandler setBind(boolean bind) { + public ExpNodeCollector setBind(boolean bind) { this.bind = bind; return this; } @@ -138,7 +138,7 @@ public boolean isBlank() { return blank; } - public ExpHandler setBlank(boolean blank) { + public ExpNodeCollector setBlank(boolean blank) { this.blank = blank; return this; } @@ -147,7 +147,7 @@ public boolean isOptional() { return optional; } - public ExpHandler setOptional(boolean optional) { + public ExpNodeCollector setOptional(boolean optional) { this.optional = optional; return this; } @@ -156,7 +156,7 @@ public boolean isExist() { return exist; } - public ExpHandler setExist(boolean exist) { + public ExpNodeCollector setExist(boolean exist) { this.exist = exist; return this; } @@ -165,20 +165,20 @@ public boolean isAll() { return all; } - public ExpHandler setAll(boolean all) { + public ExpNodeCollector setAll(boolean all) { this.all = all; return this; } // return nodes from first exp of BGP // use case: compute relevant variable bindings - public ExpHandler sample() { + public ExpNodeCollector sample() { setAll(false); return this; } // return all nodes - public ExpHandler all() { + public ExpNodeCollector all() { setAll(true); return this; } diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/core/Mappings.java b/src/main/java/fr/inria/corese/core/next/query/kgram/core/Mappings.java index f9437c987..9e7a41a4f 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/core/Mappings.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/core/Mappings.java @@ -6,7 +6,7 @@ import fr.inria.corese.core.next.query.kgram.api.query.Producer; import fr.inria.corese.core.next.query.kgram.event.Event; import fr.inria.corese.core.next.query.kgram.event.EventImpl; -import fr.inria.corese.core.next.query.kgram.event.EventManager; +import fr.inria.corese.core.next.query.kgram.event.KgramEventDispatcher; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.*; @@ -39,7 +39,7 @@ public class Mappings extends PointerObject boolean isListGroup = false; boolean sortWithDesc = true; List reject; - EventManager manager; + KgramEventDispatcher manager; int count = 0; private Query query; private final List list; @@ -101,7 +101,7 @@ public static Mappings create(Query q, boolean subEval) { } - void setEventManager(EventManager man) { + void setEventManager(KgramEventDispatcher man) { manager = man; hasEvent = true; } diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/core/Memory.java b/src/main/java/fr/inria/corese/core/next/query/kgram/core/Memory.java index 99667db78..23293cb9b 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/core/Memory.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/core/Memory.java @@ -3,7 +3,7 @@ import fr.inria.corese.core.next.query.kgram.adapter.BindingAdapter; import fr.inria.corese.core.next.query.kgram.api.core.*; import fr.inria.corese.core.next.query.kgram.api.query.*; -import fr.inria.corese.core.next.query.kgram.event.EventManager; +import fr.inria.corese.core.next.query.kgram.event.KgramEventDispatcher; import fr.inria.corese.core.next.query.kgram.path.Path; import fr.inria.corese.core.next.query.kgram.tool.ApproximateSearchEnv; import fr.inria.corese.core.sparql.api.IDatatype; @@ -53,7 +53,7 @@ public class Memory extends PointerObject implements Environment { Mapping mapping; // true when processing aggregate at the end boolean isAggregate = false; - EventManager manager; + KgramEventDispatcher manager; boolean hasEvent = false; int nbEdge = 0; int nbNode = 0; @@ -75,14 +75,14 @@ public Memory(Matcher m, Evaluator e) { } @Override - public EventManager getEventManager() { + public KgramEventDispatcher getEventManager() { if (manager == null) { kgram.createManager(); } return manager; } - void setEventManager(EventManager man) { + void setEventManager(KgramEventDispatcher man) { manager = man; hasEvent = true; } @@ -559,13 +559,13 @@ boolean pushList(Producer p, Node node, Edge edge, int i) { for (int j = i; j < edge.nbNode(); j++) { list.add(edge.getNode(j)); } - Node target = (p == null) ? node : p.getDatatypeValueFactory().nodeList(list); + Node target = (p == null) ? node : p.getDatatypeNodeFactory().nodeList(list); return push(node, target, i); } boolean pushCardinality(Producer p, Node node, Edge edge, int i) { int n = edge.nbNode() - i; - Node target = (p == null) ? node : p.getDatatypeValueFactory().nodeValue(n); + Node target = (p == null) ? node : p.getDatatypeNodeFactory().nodeValue(n); return push(node, target, i); } diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/core/Query.java b/src/main/java/fr/inria/corese/core/next/query/kgram/core/Query.java index ace164296..d8973227c 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/core/Query.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/core/Query.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.next.query.kgram.api.core.*; import fr.inria.corese.core.next.query.kgram.api.core.Filter; -import fr.inria.corese.core.next.query.kgram.api.query.DQPFactory; +import fr.inria.corese.core.next.query.kgram.api.query.DistributedQueryPlanFactory; import fr.inria.corese.core.next.query.kgram.api.query.Matcher; import fr.inria.corese.core.next.query.kgram.api.query.Producer; import fr.inria.corese.core.next.query.kgram.filter.Compile; @@ -44,12 +44,12 @@ public class Query extends Exp { public static boolean testJoin = false; public static boolean isOptional = true; - private static DQPFactory factory; + private static DistributedQueryPlanFactory factory; /** * @return the factory */ - public static DQPFactory getFactory() { + public static DistributedQueryPlanFactory getFactory() { return factory; } diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/core/SorterNew.java b/src/main/java/fr/inria/corese/core/next/query/kgram/core/SorterNew.java index 763c4e18b..5d7a2ea33 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/core/SorterNew.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/core/SorterNew.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Map.Entry; -import static fr.inria.corese.core.next.query.kgram.sorter.core.Const.plannable; +import static fr.inria.corese.core.next.query.kgram.sorter.core.QuerySorterConst.plannable; /** * A new sorter for QP diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/event/EventManager.java b/src/main/java/fr/inria/corese/core/next/query/kgram/event/KgramEventDispatcher.java similarity index 91% rename from src/main/java/fr/inria/corese/core/next/query/kgram/event/EventManager.java rename to src/main/java/fr/inria/corese/core/next/query/kgram/event/KgramEventDispatcher.java index 68faecfd1..5c5b64aa7 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/event/EventManager.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/event/KgramEventDispatcher.java @@ -10,7 +10,7 @@ * @author Olivier Corby, Edelweiss, INRIA 2010 * */ -public class EventManager implements Iterable { +public class KgramEventDispatcher implements Iterable { boolean isEval = false; diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Checker.java b/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Checker.java index b87ff0075..d70e7775b 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Checker.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Checker.java @@ -23,7 +23,7 @@ public class Checker implements ExprType { static final int BOOL = BOOLEAN; - static List alwaysFalse; + static List alwaysFalse; Matcher matcher; @@ -56,10 +56,10 @@ boolean match(Expr ee){ } - boolean match(Expr ee, List pat) { + boolean match(Expr ee, List pat) { boolean suc = false, b; - for (Pattern p : pat){ + for (FilterPattern p : pat){ b = matcher.match(p, ee); if (b){ suc = true; @@ -76,9 +76,9 @@ boolean match(Expr ee, List pat) { * */ - List alwaysFalse(){ + List alwaysFalse(){ if (alwaysFalse == null){ - List pat = new ArrayList<>(); + List pat = new ArrayList<>(); pat.add(neqSelf()); pat.add(ltSelf()); pat.add(notEqSelf()); @@ -101,53 +101,53 @@ List alwaysFalse(){ /** * ?from=cst || ?to=cst */ - Pattern path(String v1, String v2){ - Pattern e1 = term(EQ, Pattern.variable(v1), constant()); - Pattern e2 = term(EQ, Pattern.variable(v2), constant()); + FilterPattern path(String v1, String v2){ + FilterPattern e1 = term(EQ, FilterPattern.variable(v1), constant()); + FilterPattern e2 = term(EQ, FilterPattern.variable(v2), constant()); return or(e1, e2); } // always false - Pattern neqSelf(){ + FilterPattern neqSelf(){ // EXP != EXP - Pattern exp = pat(); + FilterPattern exp = pat(); return term(NE, exp, exp); } - Pattern ltSelf(){ + FilterPattern ltSelf(){ // EXP < EXP - Pattern exp = pat(); + FilterPattern exp = pat(); return term(LT, exp, exp); } - Pattern notEqSelf(){ + FilterPattern notEqSelf(){ // !(EXP = EXP) - Pattern exp = pat(); + FilterPattern exp = pat(); return not(term(EQ, exp, exp)); } - Pattern notGeSelf(){ + FilterPattern notGeSelf(){ // !(EXP >= EXP) - Pattern exp = pat(); + FilterPattern exp = pat(); return not(term(GE, exp, exp)); } - Pattern patNotPat(){ + FilterPattern patNotPat(){ // EXP && ! EXP - Pattern exp = pat(); + FilterPattern exp = pat(); return and(exp, not(exp)); } - Pattern notOr(){ + FilterPattern notOr(){ // ! (EXP || ! EXP) - Pattern exp = pat(); + FilterPattern exp = pat(); return not(or(exp, not(exp))); } @@ -155,74 +155,74 @@ Pattern notOr(){ // TODO: // we can have both with list of values // ?x = xpath() && ?x != xpath() - Pattern eqNeq(){ + FilterPattern eqNeq(){ // EXP1 = EXP2 && EXP1 != EXP2 - Pattern e1 = pat(); - Pattern e2 = pat(); + FilterPattern e1 = pat(); + FilterPattern e2 = pat(); return and(term(EQ, e1, e2), term(NE, e1, e2)); } - Pattern eqGt(){ + FilterPattern eqGt(){ // EXP1 = EXP2 && EXP1 > EXP2 - Pattern e1 = pat(); - Pattern e2 = pat(); + FilterPattern e1 = pat(); + FilterPattern e2 = pat(); return and(term(EQ, e1, e2), term(GT, e1, e2)); } - Pattern ltGt(){ + FilterPattern ltGt(){ // EXP1 > EXP2 && EXP1 < EXP2 - Pattern e1 = pat(); - Pattern e2 = pat(); + FilterPattern e1 = pat(); + FilterPattern e2 = pat(); return and(term(GT, e1, e2), term(LT, e1, e2)); } - Pattern gtNotGe(){ + FilterPattern gtNotGe(){ // EXP1 > EXP2 && ! (EXP1 >= EXP2) - Pattern e1 = pat(); - Pattern e2 = pat(); + FilterPattern e1 = pat(); + FilterPattern e2 = pat(); return and(term(GT, e1, e2), not(term(GE, e1, e2))); } - Pattern eqNotGe(){ + FilterPattern eqNotGe(){ // EXP1 = EXP2 && ! (EXP1 >= EXP2) - Pattern e1 = pat(); - Pattern e2 = pat(); + FilterPattern e1 = pat(); + FilterPattern e2 = pat(); return and(term(EQ, e1, e2), not(term(GE, e1, e2))); } - Pattern constant(){ - return Pattern.constant(); + FilterPattern constant(){ + return FilterPattern.constant(); } - Pattern pat() { - return new Pattern(ExprType.JOKER); + FilterPattern pat() { + return new FilterPattern(ExprType.JOKER); } - Pattern pat(Pattern e1) { - return new Pattern(ExprType.BOOLEAN, ExprType.NOT, e1); + FilterPattern pat(FilterPattern e1) { + return new FilterPattern(ExprType.BOOLEAN, ExprType.NOT, e1); } - Pattern pat(int type, int ope, Pattern e1, Pattern e2){ - return new Pattern(type, ope, e1, e2); + FilterPattern pat(int type, int ope, FilterPattern e1, FilterPattern e2){ + return new FilterPattern(type, ope, e1, e2); } - Pattern not(Pattern e){ + FilterPattern not(FilterPattern e){ return pat(e); } - Pattern and(Pattern e1, Pattern e2){ + FilterPattern and(FilterPattern e1, FilterPattern e2){ return pat(BOOLEAN, AND, e1, e2); } - Pattern or(Pattern e1, Pattern e2){ + FilterPattern or(FilterPattern e1, FilterPattern e2){ return pat(BOOLEAN, OR, e1, e2); } - Pattern term(int ope, Pattern e1, Pattern e2){ + FilterPattern term(int ope, FilterPattern e1, FilterPattern e2){ return pat(TERM, ope, e1, e2); } diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Compile.java b/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Compile.java index 969d1f306..5d08517f6 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Compile.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Compile.java @@ -91,7 +91,7 @@ void eq(Exp exp){ Expr ee = ff.getExp(); // ?x = ?y - Pattern pat = new Pattern(TERM, EQ, VARIABLE, VARIABLE); + FilterPattern pat = new FilterPattern(TERM, EQ, VARIABLE, VARIABLE); if (matcher.match(pat, ee)){ // compute Node list corresponding to variables List lNode = query.getNodes(exp); @@ -105,7 +105,7 @@ void eq(Exp exp){ } } // ?x = 'constant' - else if (matcher.match(new Pattern(TERM, EQ, VARIABLE, CONSTANT), ee)){ + else if (matcher.match(new FilterPattern(TERM, EQ, VARIABLE, CONSTANT), ee)){ Exp bind = buildCst(exp, ExpType.Type.OPT_BIND); if (bind != null){ exp.add(bind); @@ -150,14 +150,14 @@ Exp buildVar(Exp exp){ void gl(Exp exp){ Filter ff = exp.getFilter(); Expr ee = ff.getExp(); - Pattern pat = new Pattern(TERM, GL, VARIABLE, CONSTANT); + FilterPattern pat = new FilterPattern(TERM, GL, VARIABLE, CONSTANT); if (matcher.match(pat, ee)){ Exp test = buildCst(exp, ExpType.Type.TEST); if (test!=null) exp.add(test); } else { - pat = new Pattern(TERM, GL, VARIABLE, VARIABLE); + pat = new FilterPattern(TERM, GL, VARIABLE, VARIABLE); if (matcher.match(pat, ee)){ Exp test = buildVar(exp); if (test!=null) @@ -173,7 +173,7 @@ void gl(Exp exp){ void or(Exp exp){ Filter ff = exp.getFilter(); Expr ee = ff.getExp(); - Pattern pat = new Pattern(BOOLEAN, OR, new Pattern(TERM, EQ, VARIABLE, CONSTANT)); + FilterPattern pat = new FilterPattern(BOOLEAN, OR, new FilterPattern(TERM, EQ, VARIABLE, CONSTANT)); pat.setRec(); pat.setMatchConstant(); if (matcher.match(pat, ee)) { diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Pattern.java b/src/main/java/fr/inria/corese/core/next/query/kgram/filter/FilterPattern.java similarity index 90% rename from src/main/java/fr/inria/corese/core/next/query/kgram/filter/Pattern.java rename to src/main/java/fr/inria/corese/core/next/query/kgram/filter/FilterPattern.java index 78da91d7e..7abcf5f4e 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Pattern.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/filter/FilterPattern.java @@ -17,7 +17,7 @@ * * @author Olivier Corby, Edelweiss, INRIA 2010 */ -public class Pattern implements ExprType, Expr { +public class FilterPattern implements ExprType, Expr { int type, oper; String label; // recursive pattern, ako * @@ -26,42 +26,42 @@ public class Pattern implements ExprType, Expr { List args; Expr exp; - Pattern(int t) { + FilterPattern(int t) { type = t; oper = JOKER; args = new ArrayList<>(); } - Pattern(int t, int o) { + FilterPattern(int t, int o) { this(t); oper = o; } - Pattern(int t, int o, Expr e1) { + FilterPattern(int t, int o, Expr e1) { this(t, o); add(e1); } - Pattern(int t, int o, Expr e1, Expr e2) { + FilterPattern(int t, int o, Expr e1, Expr e2) { this(t, o, e1); add(e2); } - public Pattern(int t, int o, int e1, int e2){ + public FilterPattern(int t, int o, int e1, int e2){ this(t, o); - add(new Pattern(e1)); - add(new Pattern(e2)); + add(new FilterPattern(e1)); + add(new FilterPattern(e2)); } - static Pattern variable(String label) { - Pattern p = new Pattern(VARIABLE); + static FilterPattern variable(String label) { + FilterPattern p = new FilterPattern(VARIABLE); p.setLabel(label); return p; } - static Pattern constant() { - return new Pattern(CONSTANT); + static FilterPattern constant() { + return new FilterPattern(CONSTANT); } void add(Expr exp) { @@ -291,4 +291,4 @@ public boolean isDynamic() { public IDatatype evalWE(Evaluator eval, BindingContext b, Environment env, Producer p) { throw new UnsupportedOperationException("Not supported yet."); } -} \ No newline at end of file +} diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/filter/MatchBind.java b/src/main/java/fr/inria/corese/core/next/query/kgram/filter/MatchBind.java index 1233d55b9..62af5429d 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/filter/MatchBind.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/filter/MatchBind.java @@ -40,7 +40,7 @@ Expr getValue(Expr exp){ } void setValue(Expr qe, Expr te){ - if (qe instanceof Pattern){ + if (qe instanceof FilterPattern){ table.put(qe, te); stack.add(qe); } diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Matcher.java b/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Matcher.java index 3c521b53c..ac5db06e6 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Matcher.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/filter/Matcher.java @@ -16,12 +16,12 @@ public class Matcher implements ExprType { matchConstant = true; - public boolean match(Pattern qe, Expr te){ + public boolean match(FilterPattern qe, Expr te){ MatchBind bind = MatchBind.create(); return match(qe, te, bind); } - boolean match(Pattern qe, Expr te, MatchBind bind){ + boolean match(FilterPattern qe, Expr te, MatchBind bind){ rec = qe.isRec(); matchConstant = qe.isMatchConstant(); return process(qe, te, bind); @@ -230,7 +230,7 @@ boolean matchTerm(Expr qe, Expr te, MatchBind bind) { * Is it a Pattern constant */ boolean isBindable(Expr exp){ - return exp instanceof Pattern; + return exp instanceof FilterPattern; } boolean symmetric(Expr qe){ diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/path/PathFinder.java b/src/main/java/fr/inria/corese/core/next/query/kgram/path/PathFinder.java index 8cab7e8b3..e353a0b4e 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/path/PathFinder.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/path/PathFinder.java @@ -9,7 +9,7 @@ import fr.inria.corese.core.next.query.kgram.api.query.Matcher; import fr.inria.corese.core.next.query.kgram.api.query.Producer; import fr.inria.corese.core.next.query.kgram.core.*; -import fr.inria.corese.core.next.query.kgram.event.EventManager; +import fr.inria.corese.core.next.query.kgram.event.KgramEventDispatcher; import fr.inria.corese.core.next.query.kgram.event.ResultListener; import fr.inria.corese.core.next.query.kgram.tool.EdgeInv; import org.slf4j.Logger; @@ -53,7 +53,7 @@ public class PathFinder { public static long cedge = 0, cresult = 0, ctest = 0; // synchronized buffer between this and projection - private Buffer mbuffer; + private PathMappingBuffer mbuffer; private Environment memory; private ResultListener listener; private Eval kgram; @@ -136,7 +136,7 @@ void setEval(Eval ev) { } @SuppressWarnings("unused") - public void set(EventManager man) { + public void set(KgramEventDispatcher man) { } public void set(ResultListener rl) { @@ -302,7 +302,7 @@ int getIndex() { void mstart(Environment mem) { // buffer store path enumeration - mbuffer = new Buffer(); + mbuffer = new PathMappingBuffer(); // path enumeration in a thread GraphPath graphPath = new GraphPath(this, mem); // launch path computing (one by one) eg launch process() below diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/path/Buffer.java b/src/main/java/fr/inria/corese/core/next/query/kgram/path/PathMappingBuffer.java similarity index 94% rename from src/main/java/fr/inria/corese/core/next/query/kgram/path/Buffer.java rename to src/main/java/fr/inria/corese/core/next/query/kgram/path/PathMappingBuffer.java index 98a1dc80d..2086309e5 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/path/Buffer.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/path/PathMappingBuffer.java @@ -11,7 +11,7 @@ * @author Olivier Corby, Edelweiss, INRIA 2010 * */ -public class Buffer implements Iterable, Iterator { +public class PathMappingBuffer implements Iterable, Iterator { private Mapping map; private boolean hasNext = true; @@ -70,4 +70,4 @@ public Iterator iterator() { public void remove() { throw new UnsupportedOperationException("Remove operation is not supported"); } -} \ No newline at end of file +} diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/IEstimate.java b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/IEstimate.java index 626a05d3f..ac4839dad 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/IEstimate.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/IEstimate.java @@ -9,7 +9,9 @@ */ public interface IEstimate { + double MAX_COST = 1.0; //approximate minimum value, but not equal to 0 + double MIN_COST_0 = 1.0 / Double.MAX_VALUE; double NA_COST = -1; /** diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/QPGNode.java b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/QPGNode.java index fdc505c9c..81a00edc1 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/QPGNode.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/QPGNode.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static fr.inria.corese.core.kgram.sorter.core.Const.*; +import static fr.inria.corese.core.next.query.kgram.sorter.core.QuerySorterConst.*; /** * The node for triple pattern graph, which encapsualtes an expression (contain diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/QPGraph.java b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/QPGraph.java index 3de963710..72b7a80f1 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/QPGraph.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/QPGraph.java @@ -165,7 +165,7 @@ public List getAllNodes() { * @param type EDGE, VALUES, FILTER, GRAPH, otherwise return all */ public List getAllNodes(ExpType.Type type) { - if (Const.plannable(type)) { + if (QuerySorterConst.plannable(type)) { List list = new ArrayList<>(); for (QPGNode node : this.nodes) { if (node.getType() == type) { diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/Const.java b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/QuerySorterConst.java similarity index 93% rename from src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/Const.java rename to src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/QuerySorterConst.java index f5eb43623..33a6eed56 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/Const.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/core/QuerySorterConst.java @@ -7,13 +7,14 @@ * * @author Fuqi Song, Wimmics Inria I3S */ -public final class Const { +public final class QuerySorterConst { public static final int ALL = 0; public static final int SUBJECT = 1; public static final int PREDICATE = 2; public static final int OBJECT = 3; public static final int TRIPLE = 4; + public static final int NA = -1; public final static int BOUND = 0, LIST = 0, UNBOUND = Integer.MAX_VALUE; diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/BasicPatternGenerator.java b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/BasicPatternGenerator.java index 8146d7937..b9e65dca8 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/BasicPatternGenerator.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/BasicPatternGenerator.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.next.query.kgram.sorter.core.IProducerQP; -import static fr.inria.corese.core.kgram.sorter.core.Const.*; +import static fr.inria.corese.core.next.query.kgram.sorter.core.QuerySorterConst.*; /** * Generate the basic patterns ordering by the selectivity acorrding to the size diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java index 7a42f4fbf..45033bed6 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java @@ -5,8 +5,8 @@ import java.util.List; -import static fr.inria.corese.core.kgram.sorter.core.Const.*; -import static fr.inria.corese.core.kgram.sorter.core.IEstimate.MAX_COST; +import static fr.inria.corese.core.next.query.kgram.sorter.core.QuerySorterConst.*; +import static fr.inria.corese.core.next.query.kgram.sorter.core.IEstimate.MAX_COST; /** * Cost model for QPG edge @@ -66,7 +66,7 @@ public void estimate(List params) { ExpType.Type tNode1 = node1.getType(), tNode2 = node2.getType(); //1. type of one of them is FILTER or VALUES or BIND, ne assign pas le weight - if (!Const.evaluable(tNode1) && !Const.evaluable(tNode2)) { + if (!QuerySorterConst.evaluable(tNode1) && !QuerySorterConst.evaluable(tNode2)) { this.edge.setCost(MAX_COST); return; } @@ -106,6 +106,6 @@ public boolean isParametersOK(List params) { @Override final public boolean estimatable() { - return Const.evaluable(this.edge.get(0).getType()) && Const.evaluable(this.edge.get(1).getType()); + return QuerySorterConst.evaluable(this.edge.get(0).getType()) && QuerySorterConst.evaluable(this.edge.get(1).getType()); } } diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/QPGNodeCostModel.java b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/QPGNodeCostModel.java index 30f4a1dc4..6e7716e34 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/QPGNodeCostModel.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/sorter/impl/qpv1/QPGNodeCostModel.java @@ -9,9 +9,9 @@ import java.util.ArrayList; import java.util.List; -import static fr.inria.corese.core.kgram.sorter.core.Const.*; -import static fr.inria.corese.core.kgram.sorter.core.IEstimate.MAX_COST; -import static fr.inria.corese.core.kgram.sorter.core.IEstimate.MIN_COST_0; +import static fr.inria.corese.core.next.query.kgram.sorter.core.QuerySorterConst.*; +import static fr.inria.corese.core.next.query.kgram.sorter.core.IEstimate.MAX_COST; +import static fr.inria.corese.core.next.query.kgram.sorter.core.IEstimate.MIN_COST_0; /** * Class for constructing the pattern of a triple, including many parameters @@ -252,7 +252,7 @@ public boolean isParametersOK(List params) { @Override public boolean estimatable() { - return Const.evaluable(this.node.getType()); + return QuerySorterConst.evaluable(this.node.getType()); } } diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/tool/EnvironmentImpl.java b/src/main/java/fr/inria/corese/core/next/query/kgram/tool/EnvironmentImpl.java index d0824777f..9fb890a95 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/tool/EnvironmentImpl.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/tool/EnvironmentImpl.java @@ -7,7 +7,7 @@ import fr.inria.corese.core.next.query.kgram.api.query.Environment; import fr.inria.corese.core.next.query.kgram.api.query.ProcessVisitor; import fr.inria.corese.core.next.query.kgram.core.*; -import fr.inria.corese.core.next.query.kgram.event.EventManager; +import fr.inria.corese.core.next.query.kgram.event.KgramEventDispatcher; import fr.inria.corese.core.next.query.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; @@ -80,7 +80,7 @@ public Query getQuery() { } @Override - public EventManager getEventManager() { + public KgramEventDispatcher getEventManager() { // TODO Auto-generated method stub return null; } diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/tool/ProducerDefault.java b/src/main/java/fr/inria/corese/core/next/query/kgram/tool/ProducerDefault.java index 7db7309a8..00cdecc1e 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/tool/ProducerDefault.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/tool/ProducerDefault.java @@ -140,7 +140,7 @@ public void finish(Query q) { } @Override - public DatatypeValueFactory getDatatypeValueFactory() { + public DatatypeNodeFactory getDatatypeNodeFactory() { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } diff --git a/src/main/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerProducer.java b/src/main/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerProducer.java index e45009d64..5c91776d0 100644 --- a/src/main/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerProducer.java +++ b/src/main/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerProducer.java @@ -4,7 +4,7 @@ import fr.inria.corese.core.next.data.api.Resource; import fr.inria.corese.core.next.data.api.Value; import fr.inria.corese.core.next.data.api.ValueFactory; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.query.api.exception.UnsupportedQueryFeatureException; import fr.inria.corese.core.next.query.kgram.api.core.Edge; import fr.inria.corese.core.next.query.kgram.api.core.Node; @@ -42,7 +42,7 @@ public final class StorageManagerProducer extends ProducerDefault { * @param storage storage manager queried by this producer */ public StorageManagerProducer(StorageManager storage) { - this(storage, new CoreseAdaptedValueFactory()); + this(storage, new CoreseValueFactory()); } /** @@ -561,7 +561,7 @@ public int count() { } @Override - public fr.inria.corese.core.next.query.kgram.event.EventManager getEventManager() { + public fr.inria.corese.core.next.query.kgram.event.KgramEventDispatcher getEventManager() { return delegate == null ? null : delegate.getEventManager(); } diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphAdapter.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/CoreseGraphStatementStore.java similarity index 99% rename from src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphAdapter.java rename to src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/CoreseGraphStatementStore.java index 11c3adfb1..9fc0e8661 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphAdapter.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/CoreseGraphStatementStore.java @@ -13,14 +13,14 @@ /** * Adapter between legacy {@link Graph} and new Storage API. */ -public record GraphAdapter(Graph graph, ValueFactory valueFactory) { +public record CoreseGraphStatementStore(Graph graph, ValueFactory valueFactory) { /** * Compact constructor with validation. * * @throws IllegalArgumentException if graph or valueFactory is null */ - public GraphAdapter { + public CoreseGraphStatementStore { if (graph == null) throw new IllegalArgumentException("Graph cannot be null"); if (valueFactory == null) throw new IllegalArgumentException("ValueFactory cannot be null"); } @@ -393,4 +393,4 @@ private Node valueToNode(Value value) { throw new IllegalArgumentException("Unknown Value type: " + value); } } -} \ No newline at end of file +} diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphBulkOperations.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphBulkOperations.java index 4f0230999..ba62e69f6 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphBulkOperations.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphBulkOperations.java @@ -13,16 +13,16 @@ */ public class GraphBulkOperations implements BulkOperations { - private final GraphAdapter adapter; + private final CoreseGraphStatementStore adapter; /** * Constructs a new GraphBulkOperations. * - * @param adapter the GraphAdapter for Graph access (must not be null) + * @param adapter the CoreseGraphStatementStore for Graph access (must not be null) * @throws IllegalArgumentException if adapter is null */ - public GraphBulkOperations(GraphAdapter adapter) { - if (adapter == null) throw new IllegalArgumentException("GraphAdapter cannot be null"); + public GraphBulkOperations(CoreseGraphStatementStore adapter) { + if (adapter == null) throw new IllegalArgumentException("CoreseGraphStatementStore cannot be null"); this.adapter = adapter; } diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMetadataOperations.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMetadataOperations.java index 905796862..87f53ab36 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMetadataOperations.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMetadataOperations.java @@ -15,16 +15,16 @@ */ public class GraphMetadataOperations implements MetadataOperations { - private final GraphAdapter adapter; + private final CoreseGraphStatementStore adapter; /** * Constructs a new GraphMetadataOperations. * - * @param adapter the GraphAdapter for Graph access (must not be null) + * @param adapter the CoreseGraphStatementStore for Graph access (must not be null) * @throws IllegalArgumentException if adapter is null */ - public GraphMetadataOperations(GraphAdapter adapter) { - if (adapter == null) throw new IllegalArgumentException("GraphAdapter cannot be null"); + public GraphMetadataOperations(CoreseGraphStatementStore adapter) { + if (adapter == null) throw new IllegalArgumentException("CoreseGraphStatementStore cannot be null"); this.adapter = adapter; } diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMutationOperations.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMutationOperations.java index b7bee5a74..07a9cd2e5 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMutationOperations.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMutationOperations.java @@ -14,16 +14,16 @@ */ public class GraphMutationOperations implements MutationOperations { - private final GraphAdapter adapter; + private final CoreseGraphStatementStore adapter; /** * Constructs a new GraphMutationOperations. * - * @param adapter the GraphAdapter for Graph access (must not be null) + * @param adapter the CoreseGraphStatementStore for Graph access (must not be null) * @throws IllegalArgumentException if adapter is null */ - public GraphMutationOperations(GraphAdapter adapter) { - if (adapter == null) throw new IllegalArgumentException("GraphAdapter cannot be null"); + public GraphMutationOperations(CoreseGraphStatementStore adapter) { + if (adapter == null) throw new IllegalArgumentException("CoreseGraphStatementStore cannot be null"); this.adapter = adapter; } diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphQueryOperations.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphQueryOperations.java index 5a133665a..2ad678deb 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphQueryOperations.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphQueryOperations.java @@ -14,16 +14,16 @@ */ public class GraphQueryOperations implements QueryOperations { - private final GraphAdapter adapter; + private final CoreseGraphStatementStore adapter; /** * Constructs a new GraphQueryOperations. * - * @param adapter the GraphAdapter for Graph access (must not be null) + * @param adapter the CoreseGraphStatementStore for Graph access (must not be null) * @throws IllegalArgumentException if adapter is null */ - public GraphQueryOperations(GraphAdapter adapter) { - if (adapter == null) throw new IllegalArgumentException("GraphAdapter cannot be null"); + public GraphQueryOperations(CoreseGraphStatementStore adapter) { + if (adapter == null) throw new IllegalArgumentException("CoreseGraphStatementStore cannot be null"); this.adapter = adapter; } diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphStorageManager.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphStorageManager.java index c518c62bd..85c48f6ab 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphStorageManager.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphStorageManager.java @@ -17,7 +17,7 @@ */ public class GraphStorageManager implements StorageManager { - private final GraphAdapter adapter; + private final CoreseGraphStatementStore adapter; private final QueryOperations queryOps; private final MutationOperations mutationOps; private final MetadataOperations metadataOps; @@ -33,7 +33,7 @@ protected GraphStorageManager(Builder builder) { throw new IllegalArgumentException("ValueFactory cannot be null"); } - this.adapter = new GraphAdapter(builder.graph, builder.valueFactory); + this.adapter = new CoreseGraphStatementStore(builder.graph, builder.valueFactory); this.queryOps = new GraphQueryOperations(adapter); this.mutationOps = new GraphMutationOperations(adapter); this.metadataOps = new GraphMetadataOperations(adapter); diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryAdapter.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/InMemoryStatementStore.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryAdapter.java rename to src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/InMemoryStatementStore.java index 532ddb984..a8d05d93c 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryAdapter.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/InMemoryStatementStore.java @@ -14,14 +14,14 @@ /** * In-memory storage backend using {@link ConcurrentHashMap} for thread-safe operations. */ -public class MemoryAdapter { +public class InMemoryStatementStore { private final Set statements; /** - * Constructs a new MemoryAdapter with an empty statement set. + * Constructs a new InMemoryStatementStore with an empty statement set. */ - public MemoryAdapter() { + public InMemoryStatementStore() { this.statements = ConcurrentHashMap.newKeySet(); } diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryBulkOperations.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryBulkOperations.java index 92ecb9ddf..f2f44902a 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryBulkOperations.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryBulkOperations.java @@ -13,16 +13,16 @@ */ public class MemoryBulkOperations implements BulkOperations { - private final MemoryAdapter adapter; + private final InMemoryStatementStore adapter; /** * Constructs a new MemoryBulkOperations. * - * @param adapter the MemoryAdapter for data access (must not be null) + * @param adapter the InMemoryStatementStore for data access (must not be null) * @throws IllegalArgumentException if adapter is null */ - public MemoryBulkOperations(MemoryAdapter adapter) { - if (adapter == null) throw new IllegalArgumentException("MemoryAdapter cannot be null"); + public MemoryBulkOperations(InMemoryStatementStore adapter) { + if (adapter == null) throw new IllegalArgumentException("InMemoryStatementStore cannot be null"); this.adapter = adapter; } diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryLifecycleManager.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryLifecycleManager.java index cb3450ccf..cb7b30530 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryLifecycleManager.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryLifecycleManager.java @@ -17,11 +17,11 @@ public class MemoryLifecycleManager implements StorageLifecycle { /** * Constructs a new MemoryLifecycleManager. * - * @param adapter the MemoryAdapter to manage (must not be null) + * @param adapter the InMemoryStatementStore to manage (must not be null) * @throws IllegalArgumentException if adapter is null */ - public MemoryLifecycleManager(MemoryAdapter adapter) { - if (adapter == null) throw new IllegalArgumentException("MemoryAdapter cannot be null"); + public MemoryLifecycleManager(InMemoryStatementStore adapter) { + if (adapter == null) throw new IllegalArgumentException("InMemoryStatementStore cannot be null"); } /** diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMetadataOperations.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMetadataOperations.java index 1c77f0c9a..1415ed411 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMetadataOperations.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMetadataOperations.java @@ -15,16 +15,16 @@ */ public class MemoryMetadataOperations implements MetadataOperations { - private final MemoryAdapter adapter; + private final InMemoryStatementStore adapter; /** * Constructs a new MemoryMetadataOperations. * - * @param adapter the MemoryAdapter for data access (must not be null) + * @param adapter the InMemoryStatementStore for data access (must not be null) * @throws IllegalArgumentException if adapter is null */ - public MemoryMetadataOperations(MemoryAdapter adapter) { - if (adapter == null) throw new IllegalArgumentException("MemoryAdapter cannot be null"); + public MemoryMetadataOperations(InMemoryStatementStore adapter) { + if (adapter == null) throw new IllegalArgumentException("InMemoryStatementStore cannot be null"); this.adapter = adapter; } diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMutationOperations.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMutationOperations.java index f386ecd50..0ffe6c46d 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMutationOperations.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMutationOperations.java @@ -14,16 +14,16 @@ */ public class MemoryMutationOperations implements MutationOperations { - private final MemoryAdapter adapter; + private final InMemoryStatementStore adapter; /** * Constructs a new MemoryMutationOperations. * - * @param adapter the MemoryAdapter for data access (must not be null) + * @param adapter the InMemoryStatementStore for data access (must not be null) * @throws IllegalArgumentException if adapter is null */ - public MemoryMutationOperations(MemoryAdapter adapter) { - if (adapter == null) throw new IllegalArgumentException("MemoryAdapter cannot be null"); + public MemoryMutationOperations(InMemoryStatementStore adapter) { + if (adapter == null) throw new IllegalArgumentException("InMemoryStatementStore cannot be null"); this.adapter = adapter; } diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryQueryOperations.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryQueryOperations.java index 11c87a3f7..cf624c6c6 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryQueryOperations.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryQueryOperations.java @@ -14,16 +14,16 @@ */ public class MemoryQueryOperations implements QueryOperations { - private final MemoryAdapter adapter; + private final InMemoryStatementStore adapter; /** * Constructs a new MemoryQueryOperations. * - * @param adapter the MemoryAdapter for data access (must not be null) + * @param adapter the InMemoryStatementStore for data access (must not be null) * @throws IllegalArgumentException if adapter is null */ - public MemoryQueryOperations(MemoryAdapter adapter) { - if (adapter == null) throw new IllegalArgumentException("MemoryAdapter cannot be null"); + public MemoryQueryOperations(InMemoryStatementStore adapter) { + if (adapter == null) throw new IllegalArgumentException("InMemoryStatementStore cannot be null"); this.adapter = adapter; } diff --git a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryStorageManager.java b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryStorageManager.java index e730cbaa9..625031104 100644 --- a/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryStorageManager.java +++ b/src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryStorageManager.java @@ -14,7 +14,7 @@ */ public class MemoryStorageManager implements StorageManager { - private final MemoryAdapter adapter; + private final InMemoryStatementStore adapter; private final QueryOperations queryOps; private final MutationOperations mutationOps; private final MetadataOperations metadataOps; @@ -28,7 +28,7 @@ public class MemoryStorageManager implements StorageManager { * @param builder the builder with configuration */ protected MemoryStorageManager(Builder builder) { - this.adapter = new MemoryAdapter(); + this.adapter = new InMemoryStatementStore(); this.queryOps = new MemoryQueryOperations(adapter); this.mutationOps = new MemoryMutationOperations(adapter); this.metadataOps = new MemoryMetadataOperations(adapter); diff --git a/src/test/java/fr/inria/corese/core/next/data/factory/ModelFactoryTest.java b/src/test/java/fr/inria/corese/core/next/data/factory/ModelFactoryTest.java index df6087569..e056ec526 100644 --- a/src/test/java/fr/inria/corese/core/next/data/factory/ModelFactoryTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/factory/ModelFactoryTest.java @@ -4,7 +4,7 @@ import fr.inria.corese.core.next.data.api.Literal; 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.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.storagemanager.api.plugin.PluginException; import fr.inria.corese.core.next.storagemanager.api.plugin.PluginNotFoundException; import org.junit.jupiter.api.BeforeEach; @@ -30,7 +30,7 @@ class ModelFactoryTest { @BeforeEach void setUp() { - valueFactory = new CoreseAdaptedValueFactory(); + valueFactory = new CoreseValueFactory(); factory = new ModelFactory(valueFactory); // Create test data @@ -292,8 +292,8 @@ void completeWorkflowCreatePopulateQuery() throws PluginException { @Test @DisplayName("Should work with different ValueFactory implementations") void shouldWorkWithDifferentValueFactoryImplementations() throws PluginException { - // This test assumes CoreseAdaptedValueFactory works - ValueFactory vf = new CoreseAdaptedValueFactory(); + // This test assumes CoreseValueFactory works + ValueFactory vf = new CoreseValueFactory(); ModelFactory factory = new ModelFactory(vf); Model model = factory.createMemoryModel(); diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/jsonld/JSONLDCircularTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/jsonld/JSONLDCircularTest.java index d584fce57..8383ed500 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/jsonld/JSONLDCircularTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/jsonld/JSONLDCircularTest.java @@ -9,7 +9,7 @@ import fr.inria.corese.core.next.data.impl.io.parser.ParserFactory; import fr.inria.corese.core.next.data.impl.io.serialization.DataSerializerFactory; import fr.inria.corese.core.next.data.impl.io.util.ParserTestBase; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.storagemanager.api.plugin.StoragePluginManager; import fr.inria.corese.core.next.storagemanager.api.support.config.StorageConfig; import org.junit.jupiter.api.BeforeEach; @@ -58,7 +58,7 @@ class JSONLDCircularTest extends ParserTestBase { @BeforeEach void setUp() { - valueFactory = new CoreseAdaptedValueFactory(); + valueFactory = new CoreseValueFactory(); serializerFactory = new DataSerializerFactory(); parserFactory = new ParserFactory(); defaultConfig = new JSONLDOptions.Builder() diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/jsonld/JSONLDParserTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/jsonld/JSONLDParserTest.java index 612c23413..090ca88e2 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/jsonld/JSONLDParserTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/jsonld/JSONLDParserTest.java @@ -6,7 +6,7 @@ import fr.inria.corese.core.next.data.impl.io.common.JSONLDOptions; import fr.inria.corese.core.next.data.impl.io.parser.ParserFactory; import fr.inria.corese.core.next.data.impl.io.util.ParserTestBase; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; @@ -22,7 +22,7 @@ public class JSONLDParserTest extends ParserTestBase { private final ParserFactory factory = new ParserFactory(); - private final ValueFactory valueFactory = new CoreseAdaptedValueFactory(); + private final ValueFactory valueFactory = new CoreseValueFactory(); diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/nquads/NQuadsCircularTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/nquads/NQuadsCircularTest.java index 6aab82dad..1b46e6d09 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/nquads/NQuadsCircularTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/nquads/NQuadsCircularTest.java @@ -8,7 +8,7 @@ import fr.inria.corese.core.next.data.impl.io.serialization.DataSerializerFactory; import fr.inria.corese.core.next.data.impl.io.serialization.nquads.NQuadsSerializerOptions; import fr.inria.corese.core.next.data.impl.io.util.ParserTestBase; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -55,7 +55,7 @@ class NQuadsCircularTest extends ParserTestBase { @BeforeEach void setUp() { - valueFactory = new CoreseAdaptedValueFactory(); + valueFactory = new CoreseValueFactory(); serializerFactory = new DataSerializerFactory(); parserFactory = new ParserFactory(); defaultConfig = NQuadsSerializerOptions.defaultConfig(); diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/ntriples/NTriplesCircularTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/ntriples/NTriplesCircularTest.java index c8c0bb2a2..6caef0f60 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/ntriples/NTriplesCircularTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/ntriples/NTriplesCircularTest.java @@ -8,7 +8,7 @@ import fr.inria.corese.core.next.data.impl.io.serialization.DataSerializerFactory; import fr.inria.corese.core.next.data.impl.io.serialization.ntriples.NTriplesSerializerOptions; import fr.inria.corese.core.next.data.impl.io.util.ParserTestBase; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -51,7 +51,7 @@ class NTriplesCircularTest extends ParserTestBase { @BeforeEach void setUp() { - valueFactory = new CoreseAdaptedValueFactory(); + valueFactory = new CoreseValueFactory(); serializerFactory = new DataSerializerFactory(); parserFactory = new ParserFactory(); defaultConfig = NTriplesSerializerOptions.defaultConfig(); diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/rdfa/RDFaParserTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/rdfa/RDFaParserTest.java index 14487cbe8..21a82315a 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/rdfa/RDFaParserTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/rdfa/RDFaParserTest.java @@ -9,7 +9,7 @@ import fr.inria.corese.core.next.data.impl.io.parser.ParserFactory; import fr.inria.corese.core.next.data.impl.io.serialization.DataSerializerFactory; import fr.inria.corese.core.next.data.impl.io.util.ParserTestBase; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -27,7 +27,7 @@ class RDFaParserTest extends ParserTestBase { private static final Logger logger = LoggerFactory.getLogger(RDFaParserTest.class); private ParserFactory parserFactory = new ParserFactory(); - private ValueFactory valueFactory = new CoreseAdaptedValueFactory(); + private ValueFactory valueFactory = new CoreseValueFactory(); private final String defaultTurtlePrefixes = """ @prefix bibo: . @prefix cc: . @@ -48,7 +48,7 @@ class RDFaParserTest extends ParserTestBase { @Test void getRDFFormat() { Model model = createTestModel(); - ValueFactory factory = new CoreseAdaptedValueFactory(); + ValueFactory factory = new CoreseValueFactory(); RDFParser parser = new RDFaParser(model, factory); assertEquals(RDFFormat.RDFA, parser.getRDFFormat()); } @@ -74,7 +74,7 @@ void parseCurrentSubjectCreatorHead() { Model parsedModel = createTestModel(); Model resultModel = createTestModel(); - ValueFactory factory = new CoreseAdaptedValueFactory(); + ValueFactory factory = new CoreseValueFactory(); RDFParser testedParser = new RDFaParser(parsedModel, factory); RDFParser resultParser = parserFactory.createRDFParser(RDFFormat.TURTLE, resultModel, valueFactory); @@ -118,7 +118,7 @@ void parseCurrentSubjectCreatorMiddle() { Model parsedModel = createTestModel(); Model resultModel = createTestModel(); - ValueFactory factory = new CoreseAdaptedValueFactory(); + ValueFactory factory = new CoreseValueFactory(); RDFParser testedParser = new RDFaParser(parsedModel, factory); RDFParser resultParser = parserFactory.createRDFParser(RDFFormat.TURTLE, resultModel, valueFactory); diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/rdfxml/RDFXMLCircularTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/rdfxml/RDFXMLCircularTest.java index 0edaa5b2b..01991d86c 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/rdfxml/RDFXMLCircularTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/rdfxml/RDFXMLCircularTest.java @@ -8,7 +8,7 @@ import fr.inria.corese.core.next.data.impl.io.serialization.DataSerializerFactory; import fr.inria.corese.core.next.data.impl.io.serialization.rdfxml.RDFXMLSerializerOptions; import fr.inria.corese.core.next.data.impl.io.util.ParserTestBase; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -57,7 +57,7 @@ class RDFXMLCircularTest extends ParserTestBase { @BeforeEach void setUp() { - valueFactory = new CoreseAdaptedValueFactory(); + valueFactory = new CoreseValueFactory(); serializerFactory = new DataSerializerFactory(); parserFactory = new ParserFactory(); defaultConfig = RDFXMLSerializerOptions.defaultConfig(); diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/trig/TriGCircularTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/trig/TriGCircularTest.java index ca240bb1d..93616f365 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/trig/TriGCircularTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/trig/TriGCircularTest.java @@ -8,7 +8,7 @@ import fr.inria.corese.core.next.data.impl.io.serialization.DataSerializerFactory; import fr.inria.corese.core.next.data.impl.io.serialization.trig.TriGSerializerOptions; import fr.inria.corese.core.next.data.impl.io.util.ParserTestBase; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -55,7 +55,7 @@ class TriGCircularTest extends ParserTestBase { @BeforeEach void setUp() { - valueFactory = new CoreseAdaptedValueFactory(); + valueFactory = new CoreseValueFactory(); serializerFactory = new DataSerializerFactory(); parserFactory = new ParserFactory(); defaultConfig = TriGSerializerOptions.defaultConfig(); diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/turtle/TurtleCircularTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/turtle/TurtleCircularTest.java index 35e1a65f0..682f6cc70 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/turtle/TurtleCircularTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/turtle/TurtleCircularTest.java @@ -8,7 +8,7 @@ import fr.inria.corese.core.next.data.impl.io.serialization.DataSerializerFactory; import fr.inria.corese.core.next.data.impl.io.serialization.turtle.TurtleSerializerOptions; import fr.inria.corese.core.next.data.impl.io.util.ParserTestBase; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -51,7 +51,7 @@ class TurtleCircularTest extends ParserTestBase { @BeforeEach void setUp() { - valueFactory = new CoreseAdaptedValueFactory(); + valueFactory = new CoreseValueFactory(); serializerFactory = new DataSerializerFactory(); parserFactory = new ParserFactory(); defaultConfig = TurtleSerializerOptions.defaultConfig(); diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/turtle/TurtleParserTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/turtle/TurtleParserTest.java index 544517bcb..4859b6b65 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/turtle/TurtleParserTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/parser/turtle/TurtleParserTest.java @@ -6,7 +6,7 @@ import fr.inria.corese.core.next.data.api.io.parser.RDFParser; import fr.inria.corese.core.next.data.impl.common.vocabulary.RDFS; import fr.inria.corese.core.next.data.impl.io.util.ParserTestBase; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,7 +26,7 @@ public class TurtleParserTest extends ParserTestBase { private static final Logger logger = LoggerFactory.getLogger(TurtleParserTest.class); - private ValueFactory factory = new CoreseAdaptedValueFactory(); + private ValueFactory factory = new CoreseValueFactory(); @Test public void testParseWithPrefixAndTriple() { diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/serialization/canonical/RDFC10SerializerTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/serialization/canonical/RDFC10SerializerTest.java index 884be2061..4a9f86dff 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/serialization/canonical/RDFC10SerializerTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/serialization/canonical/RDFC10SerializerTest.java @@ -8,7 +8,7 @@ import fr.inria.corese.core.next.data.impl.exception.SerializationException; import fr.inria.corese.core.next.data.impl.io.parser.ParserFactory; import fr.inria.corese.core.next.data.impl.io.serialization.DataSerializerFactory; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.storagemanager.api.plugin.StoragePluginManager; import fr.inria.corese.core.next.storagemanager.api.support.config.StorageConfig; import org.junit.jupiter.api.AfterEach; @@ -328,7 +328,7 @@ void testSerializeFigure2() { } private String serializeToRdfCanonical(String resourcePath) { - ValueFactory valueFactory = new CoreseAdaptedValueFactory(); + ValueFactory valueFactory = new CoreseValueFactory(); StorageConfig config = StorageConfig.builder() .property("type", "memory") .build(); diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/serialization/jsonld/JSONLDSerializerTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/serialization/jsonld/JSONLDSerializerTest.java index 488c21c0e..91ff992bd 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/serialization/jsonld/JSONLDSerializerTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/serialization/jsonld/JSONLDSerializerTest.java @@ -5,7 +5,7 @@ import fr.inria.corese.core.next.data.api.io.serializer.RDFSerializer; import fr.inria.corese.core.next.data.impl.StorageModel; import fr.inria.corese.core.next.data.impl.io.common.JSONLDOptions; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.storagemanager.api.plugin.StoragePluginManager; import fr.inria.corese.core.next.storagemanager.api.support.config.StorageConfig; import jakarta.json.Json; @@ -23,7 +23,7 @@ class JSONLDSerializerTest { private Model model; - private ValueFactory factory = new CoreseAdaptedValueFactory(); + private ValueFactory factory = new CoreseValueFactory(); private IRI iriNode = factory.createIRI("http://example.org/iri1"); private IRI iriPred = factory.createIRI("http://example.org/pred1"); private Literal basicLiteral = factory.createLiteral("literal1"); @@ -41,7 +41,7 @@ public void setUp() { model = StorageModel.builder() .storage(StoragePluginManager.create(config)) - .valueFactory(new CoreseAdaptedValueFactory()) + .valueFactory(new CoreseValueFactory()) .build(); } diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/io/util/ParserTestBase.java b/src/test/java/fr/inria/corese/core/next/data/impl/io/util/ParserTestBase.java index 772a07172..ca4b4c588 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/io/util/ParserTestBase.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/io/util/ParserTestBase.java @@ -4,7 +4,7 @@ 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.impl.StorageModel; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.storagemanager.api.plugin.StoragePluginManager; import fr.inria.corese.core.next.storagemanager.api.support.config.StorageConfig; import org.junit.jupiter.api.BeforeEach; @@ -18,7 +18,7 @@ public abstract class ParserTestBase { @BeforeEach void setUpBase() { - valueFactory = new CoreseAdaptedValueFactory(); + valueFactory = new CoreseValueFactory(); } /** diff --git a/src/test/java/fr/inria/corese/core/next/data/impl/temp/CoreseAdaptedValueFactoryTest.java b/src/test/java/fr/inria/corese/core/next/data/impl/temp/CoreseValueFactoryTest.java similarity index 96% rename from src/test/java/fr/inria/corese/core/next/data/impl/temp/CoreseAdaptedValueFactoryTest.java rename to src/test/java/fr/inria/corese/core/next/data/impl/temp/CoreseValueFactoryTest.java index c2649e51c..55d571f5b 100644 --- a/src/test/java/fr/inria/corese/core/next/data/impl/temp/CoreseAdaptedValueFactoryTest.java +++ b/src/test/java/fr/inria/corese/core/next/data/impl/temp/CoreseValueFactoryTest.java @@ -3,7 +3,7 @@ import java.time.Duration; import fr.inria.corese.core.next.data.impl.common.vocabulary.XSD; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.data.impl.temp.CoreseIRI; import fr.inria.corese.core.next.data.impl.temp.CoreseNodeAdapter; import fr.inria.corese.core.next.data.impl.temp.CoreseStatement; @@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.*; -public class CoreseAdaptedValueFactoryTest extends ValueFactoryTest { +public class CoreseValueFactoryTest extends ValueFactoryTest { private String stringTestValue; private IRI xsdStringIRI; @@ -32,7 +32,7 @@ public class CoreseAdaptedValueFactoryTest extends ValueFactoryTest { @BeforeEach @Override public void setUp() { - this.valueFactory = new CoreseAdaptedValueFactory(); + this.valueFactory = new CoreseValueFactory(); stringTestValue = "String value"; xsdStringIRI = fr.inria.corese.core.next.data.impl.common.literal.XSD.STRING.getIRI(); subject = new CoreseIRI("http://corese.com/subject"); diff --git a/src/test/java/fr/inria/corese/core/next/kgram/core/EvalTest.java b/src/test/java/fr/inria/corese/core/next/kgram/core/EvalTest.java index f09b055d9..7c4e6a2ba 100644 --- a/src/test/java/fr/inria/corese/core/next/kgram/core/EvalTest.java +++ b/src/test/java/fr/inria/corese/core/next/kgram/core/EvalTest.java @@ -5,7 +5,7 @@ import fr.inria.corese.core.next.query.kgram.core.Eval; import fr.inria.corese.core.next.query.kgram.core.Mappings; import fr.inria.corese.core.next.query.kgram.core.Memory; -import fr.inria.corese.core.next.query.kgram.event.EventManager; +import fr.inria.corese.core.next.query.kgram.event.KgramEventDispatcher; import fr.inria.corese.core.next.query.kgram.event.ResultListener; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -225,7 +225,7 @@ class EventManagerTests { @Test @DisplayName("Should set and get event manager") void testSetAndGetEventManager() { - EventManager mockManager = mock(EventManager.class); + KgramEventDispatcher mockManager = mock(KgramEventDispatcher.class); eval.setEventManager(mockManager); assertEquals(mockManager, eval.getEventManager(), "Event manager should match"); diff --git a/src/test/java/fr/inria/corese/core/next/query/impl/sparql/execution/NextSparqlPipelineExecutorTest.java b/src/test/java/fr/inria/corese/core/next/query/impl/sparql/execution/NextSparqlPipelineExecutorTest.java index 4e6b13bcf..e1d85e87f 100644 --- a/src/test/java/fr/inria/corese/core/next/query/impl/sparql/execution/NextSparqlPipelineExecutorTest.java +++ b/src/test/java/fr/inria/corese/core/next/query/impl/sparql/execution/NextSparqlPipelineExecutorTest.java @@ -4,7 +4,7 @@ import fr.inria.corese.core.next.data.api.Resource; import fr.inria.corese.core.next.data.api.Value; import fr.inria.corese.core.next.data.api.ValueFactory; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.query.api.result.TupleQueryResult; import fr.inria.corese.core.next.storagemanager.impl.memory.MemoryStorageManager; import org.junit.jupiter.api.BeforeEach; @@ -38,7 +38,7 @@ class NextSparqlPipelineExecutorTest { @BeforeEach void setUp() { - valueFactory = new CoreseAdaptedValueFactory(); + valueFactory = new CoreseValueFactory(); storage = MemoryStorageManager.builder().build(); executor = new NextSparqlPipelineExecutor(storage); diff --git a/src/test/java/fr/inria/corese/core/next/query/impl/sparql/io/serializer/common/AbstractResultSerializerTest.java b/src/test/java/fr/inria/corese/core/next/query/impl/sparql/io/serializer/common/AbstractResultSerializerTest.java index 90c87ec24..7d525075e 100644 --- a/src/test/java/fr/inria/corese/core/next/query/impl/sparql/io/serializer/common/AbstractResultSerializerTest.java +++ b/src/test/java/fr/inria/corese/core/next/query/impl/sparql/io/serializer/common/AbstractResultSerializerTest.java @@ -3,7 +3,7 @@ import fr.inria.corese.core.next.data.api.Value; import fr.inria.corese.core.next.data.api.ValueFactory; import fr.inria.corese.core.next.data.api.io.IOOptions; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.query.api.io.serializer.ResultSerializer; import fr.inria.corese.core.next.query.api.result.BindingSet; import fr.inria.corese.core.next.query.api.result.TupleQueryResult; @@ -20,7 +20,7 @@ public abstract class AbstractResultSerializerTest { - private final ValueFactory factory = new CoreseAdaptedValueFactory(); + private final ValueFactory factory = new CoreseValueFactory(); protected abstract ResultSerializer getResultSerializer(TupleQueryResult results); protected abstract ResultSerializer getResultSerializer(TupleQueryResult results, IOOptions options); diff --git a/src/test/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerEdgeTest.java b/src/test/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerEdgeTest.java index e28bcd12f..db3905718 100644 --- a/src/test/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerEdgeTest.java +++ b/src/test/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerEdgeTest.java @@ -4,7 +4,7 @@ import fr.inria.corese.core.next.data.api.Literal; import fr.inria.corese.core.next.data.api.Statement; import fr.inria.corese.core.next.data.api.ValueFactory; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.query.kgram.api.core.Node; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ class StorageManagerEdgeTest { - private final ValueFactory valueFactory = new CoreseAdaptedValueFactory(); + private final ValueFactory valueFactory = new CoreseValueFactory(); @Test void exposesStorageStatementAsKgramEdge() { diff --git a/src/test/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerProducerTest.java b/src/test/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerProducerTest.java index a46f5e7de..78d2480db 100644 --- a/src/test/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerProducerTest.java +++ b/src/test/java/fr/inria/corese/core/next/query/kgram/tool/StorageManagerProducerTest.java @@ -4,7 +4,7 @@ import fr.inria.corese.core.next.data.api.Resource; import fr.inria.corese.core.next.data.api.Value; import fr.inria.corese.core.next.data.api.ValueFactory; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.query.impl.parser.SparqlParser; import fr.inria.corese.core.next.query.impl.sparql.ast.QueryAst; import fr.inria.corese.core.next.query.impl.sparql.ast.SelectQueryAst; @@ -53,7 +53,7 @@ class StorageManagerProducerTest { @BeforeEach void setUp() { - valueFactory = new CoreseAdaptedValueFactory(); + valueFactory = new CoreseValueFactory(); storage = MemoryStorageManager.builder().build(); producer = new StorageManagerProducer(storage); diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/api/plugin/TestExternalPlugin.java b/src/test/java/fr/inria/corese/core/next/storagemanager/api/plugin/TestExternalPlugin.java index 668ce9dbd..ee4d1a9f0 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/api/plugin/TestExternalPlugin.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/api/plugin/TestExternalPlugin.java @@ -3,7 +3,7 @@ import fr.inria.corese.core.next.data.api.IRI; import fr.inria.corese.core.next.data.api.Statement; import fr.inria.corese.core.next.data.api.ValueFactory; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import fr.inria.corese.core.next.storagemanager.api.StorageManager; import fr.inria.corese.core.next.storagemanager.api.support.config.StorageConfig; import fr.inria.corese.core.next.storagemanager.api.support.model.StatementPattern; @@ -116,7 +116,7 @@ private static void testDemoPlugin() throws Exception { logger.info("StorageManager created via StoragePluginManager"); // 3. Create test data - ValueFactory vf = new CoreseAdaptedValueFactory(); + ValueFactory vf = new CoreseValueFactory(); IRI alice = vf.createIRI("http://example.org/Alice"); IRI knows = vf.createIRI("http://xmlns.com/foaf/0.1/knows"); IRI bob = vf.createIRI("http://example.org/Bob"); diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphAdapterTest.java b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/CoreseGraphStatementStoreTest.java similarity index 89% rename from src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphAdapterTest.java rename to src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/CoreseGraphStatementStoreTest.java index 47e9719a5..4d8e602ca 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphAdapterTest.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/CoreseGraphStatementStoreTest.java @@ -15,9 +15,9 @@ import static org.mockito.Mockito.when; /** - * Unit tests for GraphAdapter. + * Unit tests for CoreseGraphStatementStore. */ -class GraphAdapterTest { +class CoreseGraphStatementStoreTest { @Mock private Graph mockGraph; @@ -25,12 +25,12 @@ class GraphAdapterTest { @Mock private ValueFactory mockFactory; - private GraphAdapter adapter; + private CoreseGraphStatementStore adapter; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); - adapter = new GraphAdapter(mockGraph, mockFactory); + adapter = new CoreseGraphStatementStore(mockGraph, mockFactory); } @Nested @@ -41,20 +41,20 @@ class ConstructorTests { @DisplayName("Should throw when graph is null") void shouldThrowWhenGraphIsNull() { assertThrows(IllegalArgumentException.class, - () -> new GraphAdapter(null, mockFactory)); + () -> new CoreseGraphStatementStore(null, mockFactory)); } @Test @DisplayName("Should throw when valueFactory is null") void shouldThrowWhenValueFactoryIsNull() { assertThrows(IllegalArgumentException.class, - () -> new GraphAdapter(mockGraph, null)); + () -> new CoreseGraphStatementStore(mockGraph, null)); } @Test @DisplayName("Should create adapter with valid parameters") void shouldCreateAdapterWithValidParameters() { - GraphAdapter adapter = new GraphAdapter(mockGraph, mockFactory); + CoreseGraphStatementStore adapter = new CoreseGraphStatementStore(mockGraph, mockFactory); assertNotNull(adapter); assertEquals(mockGraph, adapter.graph()); assertEquals(mockFactory, adapter.valueFactory()); diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphBulkOperationsTest.java b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphBulkOperationsTest.java index d0fcccb67..3281b6af7 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphBulkOperationsTest.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphBulkOperationsTest.java @@ -25,7 +25,7 @@ class GraphBulkOperationsTest { @Mock - private GraphAdapter mockAdapter; + private CoreseGraphStatementStore mockAdapter; private GraphBulkOperations bulkOps; diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMetadataOperationsTest.java b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMetadataOperationsTest.java index 13484b1c8..58e3e62bd 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMetadataOperationsTest.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMetadataOperationsTest.java @@ -18,7 +18,7 @@ class GraphMetadataOperationsTest { @Mock - private GraphAdapter mockAdapter; + private CoreseGraphStatementStore mockAdapter; private GraphMetadataOperations metadataOps; diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMutationOperationsTest.java b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMutationOperationsTest.java index e91dbf4bc..340aaf4fd 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMutationOperationsTest.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphMutationOperationsTest.java @@ -22,7 +22,7 @@ class GraphMutationOperationsTest { @Mock - private GraphAdapter mockAdapter; + private CoreseGraphStatementStore mockAdapter; @Mock private Statement mockStatement; diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphQueryOperationsTest.java b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphQueryOperationsTest.java index d854071ce..740fbdd59 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphQueryOperationsTest.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/graph/GraphQueryOperationsTest.java @@ -25,7 +25,7 @@ class GraphQueryOperationsTest { @Mock - private GraphAdapter mockAdapter; + private CoreseGraphStatementStore mockAdapter; private GraphQueryOperations queryOps; diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryAdapterTest.java b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/InMemoryStatementStoreTest.java similarity index 91% rename from src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryAdapterTest.java rename to src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/InMemoryStatementStoreTest.java index 4f19d78f6..c6a1bd41a 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryAdapterTest.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/InMemoryStatementStoreTest.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.next.storagemanager.impl.memory; import fr.inria.corese.core.next.data.api.*; -import fr.inria.corese.core.next.data.impl.temp.CoreseAdaptedValueFactory; +import fr.inria.corese.core.next.data.impl.temp.CoreseValueFactory; import org.junit.jupiter.api.*; import java.util.*; @@ -10,102 +10,102 @@ import static org.mockito.Mockito.*; /** - * Unit tests for MemoryAdapter. + * Unit tests for InMemoryStatementStore. */ -class MemoryAdapterTest { +class InMemoryStatementStoreTest { - private MemoryAdapter adapter; + private InMemoryStatementStore adapter; private ValueFactory valueFactory; - + @BeforeEach void setUp() { - adapter = new MemoryAdapter(); - valueFactory = new CoreseAdaptedValueFactory(); + adapter = new InMemoryStatementStore(); + valueFactory = new CoreseValueFactory(); } @Nested @DisplayName("CRUD operations") class CrudOperationsTests { - + @Test @DisplayName("Should add statement successfully") void shouldAddStatementSuccessfully() { Statement stmt = mock(Statement.class); - + boolean added = adapter.add(stmt); - + assertTrue(added); assertEquals(1, adapter.size()); assertTrue(adapter.contains(stmt)); } - + @Test @DisplayName("Should not add duplicate statement") void shouldNotAddDuplicateStatement() { Statement stmt = mock(Statement.class); adapter.add(stmt); - + boolean added = adapter.add(stmt); - + assertFalse(added); assertEquals(1, adapter.size()); } - + @Test @DisplayName("Should remove statement successfully") void shouldRemoveStatementSuccessfully() { Statement stmt = mock(Statement.class); adapter.add(stmt); - + boolean removed = adapter.remove(stmt); - + assertTrue(removed); assertEquals(0, adapter.size()); assertFalse(adapter.contains(stmt)); } - + @Test @DisplayName("Should return false when removing non-existent statement") void shouldReturnFalseWhenRemovingNonExistentStatement() { Statement stmt = mock(Statement.class); - + boolean removed = adapter.remove(stmt); - + assertFalse(removed); } - + @Test @DisplayName("Should check if statement exists") void shouldCheckIfStatementExists() { Statement stmt = mock(Statement.class); - + assertFalse(adapter.contains(stmt)); - + adapter.add(stmt); assertTrue(adapter.contains(stmt)); } - + @Test @DisplayName("Should return correct size") void shouldReturnCorrectSize() { assertEquals(0, adapter.size()); - + adapter.add(mock(Statement.class)); assertEquals(1, adapter.size()); - + adapter.add(mock(Statement.class)); assertEquals(2, adapter.size()); } - + @Test @DisplayName("Should clear all statements") void shouldClearAllStatements() { adapter.add(mock(Statement.class)); adapter.add(mock(Statement.class)); adapter.add(mock(Statement.class)); - + adapter.clear(); - + assertEquals(0, adapter.size()); } } @@ -113,7 +113,7 @@ void shouldClearAllStatements() { @Nested @DisplayName("Pattern matching") class PatternMatchingTests { - + @Test @DisplayName("Should find all statements with null pattern") void shouldFindAllStatementsWithNullPattern() { @@ -121,14 +121,14 @@ void shouldFindAllStatementsWithNullPattern() { Statement stmt2 = mock(Statement.class); adapter.add(stmt1); adapter.add(stmt2); - + Set results = adapter.find(null, null, null, null); - + assertEquals(2, results.size()); assertTrue(results.contains(stmt1)); assertTrue(results.contains(stmt2)); } - + @Test @DisplayName("Should find statements by subject") void shouldFindStatementsBySubject() { @@ -136,26 +136,26 @@ void shouldFindStatementsBySubject() { Resource subject2 = mock(Resource.class); IRI predicate = mock(IRI.class); Value object = mock(Value.class); - + Statement stmt1 = mock(Statement.class); when(stmt1.getSubject()).thenReturn(subject1); when(stmt1.getPredicate()).thenReturn(predicate); when(stmt1.getObject()).thenReturn(object); - + Statement stmt2 = mock(Statement.class); when(stmt2.getSubject()).thenReturn(subject2); when(stmt2.getPredicate()).thenReturn(predicate); when(stmt2.getObject()).thenReturn(object); - + adapter.add(stmt1); adapter.add(stmt2); - + Set results = adapter.find(subject1, null, null, null); - + assertEquals(1, results.size()); assertTrue(results.contains(stmt1)); } - + @Test @DisplayName("Should find statements by predicate") void shouldFindStatementsByPredicate() { @@ -163,22 +163,22 @@ void shouldFindStatementsByPredicate() { IRI predicate1 = mock(IRI.class); IRI predicate2 = mock(IRI.class); Value object = mock(Value.class); - + Statement stmt1 = mock(Statement.class); when(stmt1.getSubject()).thenReturn(subject); when(stmt1.getPredicate()).thenReturn(predicate1); when(stmt1.getObject()).thenReturn(object); - + Statement stmt2 = mock(Statement.class); when(stmt2.getSubject()).thenReturn(subject); when(stmt2.getPredicate()).thenReturn(predicate2); when(stmt2.getObject()).thenReturn(object); - + adapter.add(stmt1); adapter.add(stmt2); - + Set results = adapter.find(null, predicate1, null, null); - + assertEquals(1, results.size()); assertTrue(results.contains(stmt1)); } @@ -221,15 +221,15 @@ void shouldNotMatchIriAndBlankNodeContextsWithSameStringValue() { assertTrue(results.isEmpty()); } - + @Test @DisplayName("Should return empty set when no matches") void shouldReturnEmptySetWhenNoMatches() { adapter.add(mock(Statement.class)); - + Resource unknownSubject = mock(Resource.class); Set results = adapter.find(unknownSubject, null, null, null); - + assertTrue(results.isEmpty()); } } @@ -237,37 +237,37 @@ void shouldReturnEmptySetWhenNoMatches() { @Nested @DisplayName("Context operations") class ContextOperationsTests { - + @Test @DisplayName("Should clear specific context") void shouldClearSpecificContext() { Resource context1 = mock(Resource.class); Resource context2 = mock(Resource.class); - + Statement stmt1 = mock(Statement.class); when(stmt1.getContext()).thenReturn(context1); - + Statement stmt2 = mock(Statement.class); when(stmt2.getContext()).thenReturn(context2); - + adapter.add(stmt1); adapter.add(stmt2); - + adapter.clearContext(context1); - + assertEquals(1, adapter.size()); assertFalse(adapter.contains(stmt1)); assertTrue(adapter.contains(stmt2)); } - + @Test @DisplayName("Should handle clearing non-existent context") void shouldHandleClearingNonExistentContext() { adapter.add(mock(Statement.class)); Resource unknownContext = mock(Resource.class); - + adapter.clearContext(unknownContext); - + assertEquals(1, adapter.size()); } } @@ -275,7 +275,7 @@ void shouldHandleClearingNonExistentContext() { @Nested @DisplayName("Metadata operations") class MetadataOperationsTests { - + @Test @DisplayName("Should return all subjects") void shouldReturnAllSubjects() { @@ -283,27 +283,27 @@ void shouldReturnAllSubjects() { Resource subject2 = mock(Resource.class); IRI predicate = mock(IRI.class); Value object = mock(Value.class); - + Statement stmt1 = mock(Statement.class); when(stmt1.getSubject()).thenReturn(subject1); when(stmt1.getPredicate()).thenReturn(predicate); when(stmt1.getObject()).thenReturn(object); - + Statement stmt2 = mock(Statement.class); when(stmt2.getSubject()).thenReturn(subject2); when(stmt2.getPredicate()).thenReturn(predicate); when(stmt2.getObject()).thenReturn(object); - + adapter.add(stmt1); adapter.add(stmt2); - + Set subjects = adapter.getSubjects(); - + assertEquals(2, subjects.size()); assertTrue(subjects.contains(subject1)); assertTrue(subjects.contains(subject2)); } - + @Test @DisplayName("Should return all predicates") void shouldReturnAllPredicates() { @@ -311,27 +311,27 @@ void shouldReturnAllPredicates() { IRI predicate1 = mock(IRI.class); IRI predicate2 = mock(IRI.class); Value object = mock(Value.class); - + Statement stmt1 = mock(Statement.class); when(stmt1.getSubject()).thenReturn(subject); when(stmt1.getPredicate()).thenReturn(predicate1); when(stmt1.getObject()).thenReturn(object); - + Statement stmt2 = mock(Statement.class); when(stmt2.getSubject()).thenReturn(subject); when(stmt2.getPredicate()).thenReturn(predicate2); when(stmt2.getObject()).thenReturn(object); - + adapter.add(stmt1); adapter.add(stmt2); - + Set predicates = adapter.getPredicates(); - + assertEquals(2, predicates.size()); assertTrue(predicates.contains(predicate1)); assertTrue(predicates.contains(predicate2)); } - + @Test @DisplayName("Should return all objects") void shouldReturnAllObjects() { @@ -339,48 +339,48 @@ void shouldReturnAllObjects() { IRI predicate = mock(IRI.class); Value object1 = mock(Value.class); Value object2 = mock(Value.class); - + Statement stmt1 = mock(Statement.class); when(stmt1.getSubject()).thenReturn(subject); when(stmt1.getPredicate()).thenReturn(predicate); when(stmt1.getObject()).thenReturn(object1); - + Statement stmt2 = mock(Statement.class); when(stmt2.getSubject()).thenReturn(subject); when(stmt2.getPredicate()).thenReturn(predicate); when(stmt2.getObject()).thenReturn(object2); - + adapter.add(stmt1); adapter.add(stmt2); - + Set objects = adapter.getObjects(); - + assertEquals(2, objects.size()); assertTrue(objects.contains(object1)); assertTrue(objects.contains(object2)); } - + @Test @DisplayName("Should return all contexts excluding null") void shouldReturnAllContextsExcludingNull() { Resource context1 = mock(Resource.class); Resource context2 = mock(Resource.class); - + Statement stmt1 = mock(Statement.class); when(stmt1.getContext()).thenReturn(context1); - + Statement stmt2 = mock(Statement.class); when(stmt2.getContext()).thenReturn(context2); - + Statement stmt3 = mock(Statement.class); when(stmt3.getContext()).thenReturn(null); // Default graph - + adapter.add(stmt1); adapter.add(stmt2); adapter.add(stmt3); - + Set contexts = adapter.getContexts(); - + assertEquals(2, contexts.size()); assertTrue(contexts.contains(context1)); assertTrue(contexts.contains(context2)); diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryBulkOperationsTest.java b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryBulkOperationsTest.java index 2adb4a9aa..5a7440386 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryBulkOperationsTest.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryBulkOperationsTest.java @@ -19,7 +19,7 @@ class MemoryBulkOperationsTest { @Mock - private MemoryAdapter mockAdapter; + private InMemoryStatementStore mockAdapter; private MemoryBulkOperations bulkOps; diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryLifecycleManagerTests.java b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryLifecycleManagerTests.java index 8a4a9890d..0b426dcff 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryLifecycleManagerTests.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryLifecycleManagerTests.java @@ -13,12 +13,12 @@ @DisplayName("MemoryLifecycleManager tests") class MemoryLifecycleManagerTests { - private MemoryAdapter adapter; + private InMemoryStatementStore adapter; private MemoryLifecycleManager lifecycleManager; @BeforeEach void setUp() { - adapter = new MemoryAdapter(); + adapter = new InMemoryStatementStore(); lifecycleManager = new MemoryLifecycleManager(adapter); } diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMetadataOperationsTest.java b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMetadataOperationsTest.java index dcc6c6482..61cb4c33c 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMetadataOperationsTest.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMetadataOperationsTest.java @@ -26,7 +26,7 @@ class MemoryMetadataOperationsTest { @Mock - private MemoryAdapter mockAdapter; + private InMemoryStatementStore mockAdapter; private MemoryMetadataOperations metadataOps; diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMutationOperationsTest.java b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMutationOperationsTest.java index b21c26101..3d018d999 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMutationOperationsTest.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryMutationOperationsTest.java @@ -24,7 +24,7 @@ class MemoryMutationOperationsTest { @Mock - private MemoryAdapter mockAdapter; + private InMemoryStatementStore mockAdapter; @Mock private Statement mockStatement; diff --git a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryQueryOperationsTest.java b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryQueryOperationsTest.java index 6c75fbbe3..a7537f0db 100644 --- a/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryQueryOperationsTest.java +++ b/src/test/java/fr/inria/corese/core/next/storagemanager/impl/memory/MemoryQueryOperationsTest.java @@ -19,7 +19,7 @@ class MemoryQueryOperationsTest { @Mock - private MemoryAdapter mockAdapter; + private InMemoryStatementStore mockAdapter; private MemoryQueryOperations queryOps;