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..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 @@ -10,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 @@ -39,10 +37,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 AccessMode { GT, EQ, BINARY } public static final byte ZERO = 0b0000000; // available for access right: @@ -59,7 +54,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 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"; @@ -87,13 +82,11 @@ public final String getURI() { private AccessRights[] whereList = new AccessRights[0]; private AccessRights where = DEFAULT; - private static int mode = DEFAULT_MODE; + private static AccessMode mode = DEFAULT_MODE; private AccessRightDefinition insertRightDefinition; private AccessRightDefinition deleteRightDefinition; - private boolean debug = false; - /** @@ -157,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); + }; } @@ -338,24 +328,24 @@ public static AccessRights getLevel(byte byteValue) { } - public static int getMode() { + public static AccessMode getMode() { return mode; } - public static void setMode(int m) { + public static void setMode(AccessMode m) { mode = m; } public static void gtMode() { - setMode(GT_MODE); + setMode(AccessMode.GT); } public static void eqMode() { - setMode(EQ_MODE); + setMode(AccessMode.EQ); } - public static void biMode() { - setMode(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 79012e3ff..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 @@ -2,6 +2,9 @@ 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.AccessMode; + import java.util.HashMap; /** @@ -20,16 +23,12 @@ public class AccessRightDefinition { private AccessMap graphAccess; private AccessMap predicateAccess; - private boolean debug = false; - private boolean inheritDefault = false; - - static { setSingleton(new AccessRightDefinition()); } - public class AccessMap extends HashMap { + public class AccessMap extends HashMap { /** @@ -38,11 +37,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; } @@ -89,7 +88,6 @@ void init() { public void inheritDefault() { inherit(getSingleton()); - setInheritDefault(true); } @@ -109,22 +107,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; } @@ -132,41 +130,41 @@ 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; } - int getMode() { + AccessMode getMode() { return AccessRight.getMode(); } - AccessRight.AccessRights combine(AccessRight.AccessRights b1, AccessRight.AccessRights b2) { - if (getMode() == AccessRight.BI_MODE) { + AccessRights combine(AccessRights b1, AccessRights b2) { + if (getMode() == AccessMode.BINARY) { 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; } @@ -177,7 +175,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; } @@ -190,22 +188,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)); } @@ -239,13 +237,6 @@ public AccessMap getPredicate() { } - /** - * @param debug the debug to set - */ - public void setDebug(boolean debug) { - this.debug = debug; - } - /** * @return the singleton */ @@ -301,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; - } - - - - - }