From fa7309cb19cfe93342acf6830983f8f0a6d51a36 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 1 Mar 2017 01:37:42 +0100 Subject: [PATCH] [New] Added StrolchElementQuery.internal() --- .../java/li/strolch/runtime/StrolchConstants.java | 2 +- .../java/li/strolch/model/StrolchModelConstants.java | 2 ++ .../java/li/strolch/model/query/ActivityQuery.java | 6 ++++++ .../main/java/li/strolch/model/query/OrderQuery.java | 6 ++++++ .../java/li/strolch/model/query/ResourceQuery.java | 6 ++++++ .../li/strolch/model/query/StrolchElementQuery.java | 12 ++++++++++++ 6 files changed, 33 insertions(+), 1 deletion(-) diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/StrolchConstants.java b/li.strolch.agent/src/main/java/li/strolch/runtime/StrolchConstants.java index f327d0131..e8c1a4d83 100644 --- a/li.strolch.agent/src/main/java/li/strolch/runtime/StrolchConstants.java +++ b/li.strolch.agent/src/main/java/li/strolch/runtime/StrolchConstants.java @@ -101,7 +101,7 @@ public class StrolchConstants { public static final String PRIVILEGE_INVALIDATE_SESSION = "InvalidateSession"; public static final String PRIVILEGE_GET_SESSION = "GetSession"; - public static final String INTERNAL = "internal"; + public static final String INTERNAL = StrolchModelConstants.INTERNAL; } public static class PolicyConstants { diff --git a/li.strolch.model/src/main/java/li/strolch/model/StrolchModelConstants.java b/li.strolch.model/src/main/java/li/strolch/model/StrolchModelConstants.java index 531c458cf..6a4274dfa 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/StrolchModelConstants.java +++ b/li.strolch.model/src/main/java/li/strolch/model/StrolchModelConstants.java @@ -55,4 +55,6 @@ public class StrolchModelConstants { * This uom value indicates that the {@link Parameter} has no defined uom */ public static final String UOM_NONE = "None"; //$NON-NLS-1$ + + public static final String INTERNAL = "internal"; } diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ActivityQuery.java b/li.strolch.model/src/main/java/li/strolch/model/query/ActivityQuery.java index fb2cf095d..230dd4d4f 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/query/ActivityQuery.java +++ b/li.strolch.model/src/main/java/li/strolch/model/query/ActivityQuery.java @@ -59,6 +59,12 @@ public class ActivityQuery extends StrolchElementQuery public ActivityVisitor getActivityVisitor() { return this.activityVisitor; } + + @Override + public ActivityQuery internal() { + super.internal(); + return this; + } public ActivityQuery setActivityVisitor(ActivityVisitor activityVisitor) { DBC.PRE.assertNotNull("activityVisitor", activityVisitor); diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/OrderQuery.java b/li.strolch.model/src/main/java/li/strolch/model/query/OrderQuery.java index 0255e9f7b..17c110a70 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/query/OrderQuery.java +++ b/li.strolch.model/src/main/java/li/strolch/model/query/OrderQuery.java @@ -59,6 +59,12 @@ public class OrderQuery extends StrolchElementQuery { public OrderVisitor getOrderVisitor() { return this.orderVisitor; } + + @Override + public OrderQuery internal() { + super.internal(); + return this; + } public OrderQuery setOrderVisitor(OrderVisitor orderVisitor) { DBC.PRE.assertNotNull("orderVisitor", orderVisitor); diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ResourceQuery.java b/li.strolch.model/src/main/java/li/strolch/model/query/ResourceQuery.java index 2733323eb..d9d020c53 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/query/ResourceQuery.java +++ b/li.strolch.model/src/main/java/li/strolch/model/query/ResourceQuery.java @@ -60,6 +60,12 @@ public class ResourceQuery extends StrolchElementQuery return this.resourceVisitor; } + @Override + public ResourceQuery internal() { + super.internal(); + return this; + } + public ResourceQuery setResourceVisitor(ResourceVisitor resourceVisitor) { DBC.PRE.assertNotNull("resourceVisitor", resourceVisitor); this.resourceVisitor = resourceVisitor; diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/StrolchElementQuery.java b/li.strolch.model/src/main/java/li/strolch/model/query/StrolchElementQuery.java index 731954a50..ca30a8f07 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/query/StrolchElementQuery.java +++ b/li.strolch.model/src/main/java/li/strolch/model/query/StrolchElementQuery.java @@ -15,6 +15,7 @@ */ package li.strolch.model.query; +import li.strolch.model.StrolchModelConstants; import li.strolch.utils.dbc.DBC; /** @@ -36,6 +37,17 @@ public abstract class StrolchElementQuery implements Str this.navigation = navigation; } + /** + * Marks this query as an internal query, thus allowing it to be performed without the authenticated user to need + * the required privilege + * + * @return this object for chaining + */ + public StrolchElementQuery internal() { + this.privilegeValue = StrolchModelConstants.INTERNAL; + return this; + } + public void setPrivilegeValue(String privilegeValue) { this.privilegeValue = privilegeValue; }