You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by dg...@apache.org on 2018/01/10 16:51:07 UTC

incubator-unomi git commit: Add entry point in RulesServiceEndPoint to retrieve the whole rule instead of just the metadata

Repository: incubator-unomi
Updated Branches:
  refs/heads/master 2e77a3323 -> 2fcc1cf15


Add entry point in RulesServiceEndPoint to retrieve the whole rule instead of just the metadata


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/2fcc1cf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/2fcc1cf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/2fcc1cf1

Branch: refs/heads/master
Commit: 2fcc1cf158ee99ab272c9401b92e13e43b26883f
Parents: 2e77a33
Author: Dinesh <di...@ynov.com>
Authored: Wed Jan 10 17:48:31 2018 +0100
Committer: Dinesh <di...@ynov.com>
Committed: Wed Jan 10 17:48:31 2018 +0100

----------------------------------------------------------------------
 .../org/apache/unomi/api/services/RulesService.java     |  8 ++++++++
 .../org/apache/unomi/rest/RulesServiceEndPoint.java     | 12 ++++++++++++
 .../unomi/services/services/RulesServiceImpl.java       | 11 +++++++++++
 3 files changed, 31 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2fcc1cf1/api/src/main/java/org/apache/unomi/api/services/RulesService.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/services/RulesService.java b/api/src/main/java/org/apache/unomi/api/services/RulesService.java
index f7de0e2..786ecfd 100644
--- a/api/src/main/java/org/apache/unomi/api/services/RulesService.java
+++ b/api/src/main/java/org/apache/unomi/api/services/RulesService.java
@@ -49,6 +49,14 @@ public interface RulesService {
     PartialList<Metadata> getRuleMetadatas(Query query);
 
     /**
+     * Retrieves rule details for rules matching the specified query.
+     *
+     * @param query the query specifying which rules to retrieve
+     * @return a {@link PartialList} of rule details for the rules matching the specified query
+     */
+    PartialList<Rule> getRuleDetails(Query query);
+
+    /**
      * Retrieves the rule identified by the specified identifier.
      *
      * @param ruleId the identifier of the rule we want to retrieve

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2fcc1cf1/rest/src/main/java/org/apache/unomi/rest/RulesServiceEndPoint.java
----------------------------------------------------------------------
diff --git a/rest/src/main/java/org/apache/unomi/rest/RulesServiceEndPoint.java b/rest/src/main/java/org/apache/unomi/rest/RulesServiceEndPoint.java
index 56940cb..8ed3bbe 100644
--- a/rest/src/main/java/org/apache/unomi/rest/RulesServiceEndPoint.java
+++ b/rest/src/main/java/org/apache/unomi/rest/RulesServiceEndPoint.java
@@ -114,6 +114,18 @@ public class RulesServiceEndPoint {
     }
 
     /**
+     * Retrieves rule details for rules matching the specified query.
+     *
+     * @param query the query specifying which rules to retrieve
+     * @return a {@link PartialList} of rule details for the rules matching the specified query
+     */
+    @POST
+    @Path("/query/detailed")
+    public PartialList<Rule> getRuleDetails(Query query) {
+        return rulesService.getRuleDetails(query);
+    }
+
+    /**
      * Retrieves the rule identified by the specified identifier.
      *
      * @param ruleId the identifier of the rule we want to retrieve

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2fcc1cf1/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
index 16d8d5d..63666e1 100644
--- a/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
@@ -319,6 +319,17 @@ public class RulesServiceImpl implements RulesService, EventListenerService, Syn
         return new PartialList<>(descriptions, rules.getOffset(), rules.getPageSize(), rules.getTotalSize());
     }
 
+    public PartialList<Rule> getRuleDetails(Query query) {
+        if (query.isForceRefresh()) {
+            persistenceService.refresh();
+        }
+        definitionsService.resolveConditionType(query.getCondition());
+        PartialList<Rule> rules = persistenceService.query(query.getCondition(), query.getSortby(), Rule.class, query.getOffset(), query.getLimit());
+        List<Rule> details = new LinkedList<>();
+        details.addAll(rules.getList());
+        return new PartialList<>(details, rules.getOffset(), rules.getPageSize(), rules.getTotalSize());
+    }
+
     public Rule getRule(String ruleId) {
         Rule rule = persistenceService.load(ruleId, Rule.class);
         if (rule != null) {