From 06f89734ad211339622123aaeeb299d42bd90b91 Mon Sep 17 00:00:00 2001 From: anquetil Date: Tue, 25 Aug 2026 14:11:28 +0200 Subject: [PATCH 1/4] created enum AccessModes in sparql.triple.parser.AccessRight --- .../sparql/triple/parser/AccessRight.java | 20 +++++++++---------- .../triple/parser/AccessRightDefinition.java | 6 ++++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java index b98d31bda..6541eac11 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java @@ -2,6 +2,7 @@ import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.sparql.api.IDatatype; +import fr.inria.corese.core.sparql.triple.parser.AccessRight.AccessRights; /** * @@ -39,10 +40,7 @@ public final String getURI() { } } - - public static final int GT_MODE = 0; - public static final int EQ_MODE = 1; - public static final int BI_MODE = 2; + public enum AccessModes { GT_MODE, EQ_MODE, BI_MODE } public static final byte ZERO = 0b0000000; // available for access right: @@ -59,7 +57,7 @@ public final String getURI() { public static final byte[] BINARY = {ZERO, ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN}; - public static final int DEFAULT_MODE = GT_MODE; + public static final AccessModes DEFAULT_MODE = AccessModes.GT_MODE; public static final String GT_ACCESS_MODE = NSManager.EXT+"gt"; public static final String EQ_ACCESS_MODE = NSManager.EXT+"eq"; @@ -87,7 +85,7 @@ public final String getURI() { private AccessRights[] whereList = new AccessRights[0]; private AccessRights where = DEFAULT; - private static int mode = DEFAULT_MODE; + private static AccessModes mode = DEFAULT_MODE; private AccessRightDefinition insertRightDefinition; private AccessRightDefinition deleteRightDefinition; @@ -338,24 +336,24 @@ public static AccessRights getLevel(byte byteValue) { } - public static int getMode() { + public static AccessModes getMode() { return mode; } - public static void setMode(int m) { + public static void setMode(AccessModes m) { mode = m; } public static void gtMode() { - setMode(GT_MODE); + setMode(AccessModes.GT_MODE); } public static void eqMode() { - setMode(EQ_MODE); + setMode(AccessModes.EQ_MODE); } public static void biMode() { - setMode(BI_MODE); + setMode(AccessModes.BI_MODE); } diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java index 79012e3ff..81d0da877 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java @@ -2,6 +2,8 @@ import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.sparql.triple.parser.AccessRight.AccessModes; + import java.util.HashMap; /** @@ -154,13 +156,13 @@ AccessRight.AccessRights getAccessBasic(Edge edge) { return null; } - int getMode() { + AccessModes getMode() { return AccessRight.getMode(); } AccessRight.AccessRights combine(AccessRight.AccessRights b1, AccessRight.AccessRights b2) { - if (getMode() == AccessRight.BI_MODE) { + if (getMode() == AccessModes.BI_MODE) { return combineBinary(b1, b2); } return moreRestricted(b1, b2); From e925eca858a245da710502c8895a53cf105708d4 Mon Sep 17 00:00:00 2001 From: anquetil Date: Tue, 25 Aug 2026 14:35:10 +0200 Subject: [PATCH 2/4] simplifying use of AccessRight.AccessRights enum in sparql.triple.parser.AccessRightDefinition --- .../triple/parser/AccessRightDefinition.java | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java index 81d0da877..2a865e28e 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java @@ -2,6 +2,7 @@ import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.sparql.triple.parser.AccessRight.AccessRights; import fr.inria.corese.core.sparql.triple.parser.AccessRight.AccessModes; import java.util.HashMap; @@ -31,7 +32,7 @@ public class AccessRightDefinition { setSingleton(new AccessRightDefinition()); } - public class AccessMap extends HashMap { + public class AccessMap extends HashMap { /** @@ -40,11 +41,11 @@ public class AccessMap extends HashMap { * otherwise return null * @return */ - AccessRight.AccessRights getAccess(Node node) { + AccessRights getAccess(Node node) { if (isEmpty()) { return null; } - AccessRight.AccessRights b = get(node.getLabel()); + AccessRights b = get(node.getLabel()); if (b != null) { return b; } @@ -111,22 +112,22 @@ int size() { * res is the URI|namespace access right granted for edge * @return */ - AccessRight.AccessRights getAccess(Edge edge, AccessRight.AccessRights def) { - AccessRight.AccessRights res = getAccess(edge); + AccessRights getAccess(Edge edge, AccessRights def) { + AccessRights res = getAccess(edge); if (res == null) { return def; } return res; } - AccessRight.AccessRights getAccess(Edge edge) { + AccessRights getAccess(Edge edge) { return getAccessDirect(edge); } /** * URI of default may overload namespace of current (if current has no URI) */ - AccessRight.AccessRights getAccessDirect(Edge edge) { + AccessRights getAccessDirect(Edge edge) { if (size() == 0) { return null; } @@ -134,23 +135,23 @@ AccessRight.AccessRights getAccessDirect(Edge edge) { } - AccessRight.AccessRights get(AccessRight.AccessRights current, AccessRight.AccessRights defaut) { + AccessRights get(AccessRights current, AccessRights defaut) { return (current == null) ? defaut : current; } - AccessRight.AccessRights getAccessOrDefault(Edge edge) { - AccessRight.AccessRights res = getAccessBasic(edge); + AccessRights getAccessOrDefault(Edge edge) { + AccessRights res = getAccessBasic(edge); if (res == null) { return getSingleton().getAccessBasic(edge); } return res; } - AccessRight.AccessRights getAccessBasic(Edge edge) { + AccessRights getAccessBasic(Edge edge) { if (size() > 0) { - AccessRight.AccessRights node = combine(getSubject(edge), getObject(edge)); - AccessRight.AccessRights access = combine(getPredicate(edge), getGraph(edge)); + AccessRights node = combine(getSubject(edge), getObject(edge)); + AccessRights access = combine(getPredicate(edge), getGraph(edge)); return combine(node, access); } return null; @@ -161,14 +162,14 @@ AccessModes getMode() { } - AccessRight.AccessRights combine(AccessRight.AccessRights b1, AccessRight.AccessRights b2) { + AccessRights combine(AccessRights b1, AccessRights b2) { if (getMode() == AccessModes.BI_MODE) { return combineBinary(b1, b2); } return moreRestricted(b1, b2); } - AccessRight.AccessRights combineBinary(AccessRight.AccessRights b1, AccessRight.AccessRights b2) { + AccessRights combineBinary(AccessRights b1, AccessRights b2) { if (b1 == null) { return b2; } @@ -179,7 +180,7 @@ AccessRight.AccessRights combineBinary(AccessRight.AccessRights b1, AccessRight. } - AccessRight.AccessRights moreRestricted(AccessRight.AccessRights b1, AccessRight.AccessRights b2) { + AccessRights moreRestricted(AccessRights b1, AccessRights b2) { if (b1 == null) { return b2; } @@ -192,22 +193,22 @@ AccessRight.AccessRights moreRestricted(AccessRight.AccessRights b1, AccessRight // return null when there is no uri access right - AccessRight.AccessRights getPredicate(Edge edge) { + AccessRights getPredicate(Edge edge) { return getPredicate().getAccess(edge.getProperty()); } - AccessRight.AccessRights getGraph(Edge edge) { + AccessRights getGraph(Edge edge) { if (edge.getGraph() == null) { return null; } return getGraph().getAccess(edge.getGraph()); } - AccessRight.AccessRights getSubject(Edge edge) { + AccessRights getSubject(Edge edge) { return getNode().getAccess(edge.getNode(0)); } - AccessRight.AccessRights getObject(Edge edge) { + AccessRights getObject(Edge edge) { return getNode().getAccess(edge.getNode(1)); } From c5e35cf00376b019e55c0f3cba4793a6dc6e8c85 Mon Sep 17 00:00:00 2001 From: anquetil Date: Tue, 25 Aug 2026 14:44:18 +0200 Subject: [PATCH 3/4] remove 2 unused attributes in sparql.triple.parser.AccessRightDefinition --- .../triple/parser/AccessRightDefinition.java | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java index 2a865e28e..20725386f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java @@ -23,10 +23,6 @@ public class AccessRightDefinition { private AccessMap graphAccess; private AccessMap predicateAccess; - private boolean debug = false; - private boolean inheritDefault = false; - - static { setSingleton(new AccessRightDefinition()); @@ -92,7 +88,6 @@ void init() { public void inheritDefault() { inherit(getSingleton()); - setInheritDefault(true); } @@ -242,13 +237,6 @@ public AccessMap getPredicate() { } - /** - * @param debug the debug to set - */ - public void setDebug(boolean debug) { - this.debug = debug; - } - /** * @return the singleton */ @@ -304,18 +292,5 @@ public AccessMap getPredicateAccess() { public void setPredicateAccess(AccessMap predicateAccess) { this.predicateAccess = predicateAccess; } - - - /** - * @param inheritDefault the inheritDefault to set - */ - public void setInheritDefault(boolean inheritDefault) { - this.inheritDefault = inheritDefault; - } - - - - - } From f6f22c5d735f0345510413b3a1cf7cdf4dfca41d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20C=C3=A9r=C3=A8s?= Date: Thu, 27 Aug 2026 10:48:00 +0200 Subject: [PATCH 4/4] refactor(sparql): polish AccessMode enum, modernize switch, remove dead code and redundant imports --- .../sparql/triple/parser/AccessRight.java | 36 ++++++++----------- .../triple/parser/AccessRightDefinition.java | 6 ++-- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java index 6541eac11..8b53e9673 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java @@ -2,7 +2,6 @@ import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.sparql.api.IDatatype; -import fr.inria.corese.core.sparql.triple.parser.AccessRight.AccessRights; /** * @@ -11,8 +10,6 @@ public class AccessRight { private static boolean active = false; - // @deprecated - private static boolean inheritDefault = false; public enum AccessRights { // NONE means no access right @@ -40,7 +37,7 @@ public final String getURI() { } } - public enum AccessModes { GT_MODE, EQ_MODE, BI_MODE } + public enum AccessMode { GT, EQ, BINARY } public static final byte ZERO = 0b0000000; // available for access right: @@ -57,7 +54,7 @@ public enum AccessModes { GT_MODE, EQ_MODE, BI_MODE } public static final byte[] BINARY = {ZERO, ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN}; - public static final AccessModes DEFAULT_MODE = AccessModes.GT_MODE; + public static final AccessMode DEFAULT_MODE = AccessMode.GT; public static final String GT_ACCESS_MODE = NSManager.EXT+"gt"; public static final String EQ_ACCESS_MODE = NSManager.EXT+"eq"; @@ -85,13 +82,11 @@ public enum AccessModes { GT_MODE, EQ_MODE, BI_MODE } private AccessRights[] whereList = new AccessRights[0]; private AccessRights where = DEFAULT; - private static AccessModes mode = DEFAULT_MODE; + private static AccessMode mode = DEFAULT_MODE; private AccessRightDefinition insertRightDefinition; private AccessRightDefinition deleteRightDefinition; - private boolean debug = false; - /** @@ -155,14 +150,11 @@ public boolean acceptWhereList(AccessRights target) { } public static boolean accept(AccessRights query, AccessRights target) { - switch (mode) { - case EQ_MODE: - return acceptEQ(query, target); - case BI_MODE: - return acceptBI(query, target); - default: - return acceptGT(query, target); - } + return switch (mode) { + case EQ -> acceptEQ(query, target); + case BINARY -> acceptBI(query, target); + default -> acceptGT(query, target); + }; } @@ -336,24 +328,24 @@ public static AccessRights getLevel(byte byteValue) { } - public static AccessModes getMode() { + public static AccessMode getMode() { return mode; } - public static void setMode(AccessModes m) { + public static void setMode(AccessMode m) { mode = m; } public static void gtMode() { - setMode(AccessModes.GT_MODE); + setMode(AccessMode.GT); } public static void eqMode() { - setMode(AccessModes.EQ_MODE); + setMode(AccessMode.EQ); } - public static void biMode() { - setMode(AccessModes.BI_MODE); + public static void biMode() { + setMode(AccessMode.BINARY); } diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java index 20725386f..d0eb3121d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java @@ -3,7 +3,7 @@ import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.triple.parser.AccessRight.AccessRights; -import fr.inria.corese.core.sparql.triple.parser.AccessRight.AccessModes; +import fr.inria.corese.core.sparql.triple.parser.AccessRight.AccessMode; import java.util.HashMap; @@ -152,13 +152,13 @@ AccessRights getAccessBasic(Edge edge) { return null; } - AccessModes getMode() { + AccessMode getMode() { return AccessRight.getMode(); } AccessRights combine(AccessRights b1, AccessRights b2) { - if (getMode() == AccessModes.BI_MODE) { + if (getMode() == AccessMode.BINARY) { return combineBinary(b1, b2); } return moreRestricted(b1, b2);