Default sorting for Datastore REST API

Signed-off-by: Claudio Mezzasalma <claudio.mezzasalma@eurotech.com>
eclipse-kapua · Jul 25, 2019 · fc9abd1 · fc9abd1
1 parent 069b177
commit fc9abd1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/...esources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataChannels.java b/...esources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataChannels.java
@@ -21,6 +21,8 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
+import java.util.Collections;
+
 import io.swagger.annotations.Authorization;
 
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
@@ -33,11 +35,14 @@
 import org.eclipse.kapua.service.datastore.internal.mediator.ChannelInfoField;
 import org.eclipse.kapua.service.datastore.internal.model.query.AndPredicateImpl;
 import org.eclipse.kapua.service.datastore.internal.model.query.ChannelMatchPredicateImpl;
+import org.eclipse.kapua.service.datastore.internal.schema.ChannelInfoSchema;
 import org.eclipse.kapua.service.datastore.model.ChannelInfo;
 import org.eclipse.kapua.service.datastore.model.ChannelInfoListResult;
 import org.eclipse.kapua.service.datastore.model.query.AndPredicate;
 import org.eclipse.kapua.service.datastore.model.query.ChannelInfoQuery;
 import org.eclipse.kapua.service.datastore.model.query.ChannelMatchPredicate;
+import org.eclipse.kapua.service.datastore.model.query.SortDirection;
+import org.eclipse.kapua.service.datastore.model.query.SortField;
 import org.eclipse.kapua.service.datastore.model.query.StorablePredicateFactory;
 import org.eclipse.kapua.service.datastore.model.query.TermPredicate;
 
@@ -101,7 +106,7 @@ public ChannelInfoListResult simpleQuery( //
         query.setPredicate(andPredicate);
         query.setOffset(offset);
         query.setLimit(limit);
-
+        query.setSortFields(Collections.singletonList(SortField.of(SortDirection.ASC, ChannelInfoSchema.CHANNEL_NAME)));
         return query(scopeId, query);
     }
 

diff --git a/...resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataClients.java b/...resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataClients.java
@@ -21,6 +21,8 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
+import java.util.Collections;
+
 import io.swagger.annotations.Authorization;
 
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
@@ -31,10 +33,13 @@
 import org.eclipse.kapua.service.datastore.ClientInfoRegistryService;
 import org.eclipse.kapua.service.datastore.DatastoreObjectFactory;
 import org.eclipse.kapua.service.datastore.internal.mediator.ClientInfoField;
+import org.eclipse.kapua.service.datastore.internal.schema.ClientInfoSchema;
 import org.eclipse.kapua.service.datastore.model.ClientInfo;
 import org.eclipse.kapua.service.datastore.model.ClientInfoListResult;
 import org.eclipse.kapua.service.datastore.model.query.AndPredicate;
 import org.eclipse.kapua.service.datastore.model.query.ClientInfoQuery;
+import org.eclipse.kapua.service.datastore.model.query.SortDirection;
+import org.eclipse.kapua.service.datastore.model.query.SortField;
 import org.eclipse.kapua.service.datastore.model.query.StorablePredicateFactory;
 import org.eclipse.kapua.service.datastore.model.query.TermPredicate;
 
@@ -92,7 +97,7 @@ public ClientInfoListResult simpleQuery( //
 
         query.setOffset(offset);
         query.setLimit(limit);
-
+        query.setSortFields(Collections.singletonList(SortField.of(SortDirection.ASC, ClientInfoSchema.CLIENT_ID)));
         return query(scopeId, query);
     }
 

diff --git a/...esources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java b/...esources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java
@@ -30,13 +30,16 @@
 import org.eclipse.kapua.service.datastore.client.model.InsertResponse;
 import org.eclipse.kapua.service.datastore.internal.mediator.ChannelInfoField;
 import org.eclipse.kapua.service.datastore.internal.mediator.MessageField;
+import org.eclipse.kapua.service.datastore.internal.schema.MessageSchema;
 import org.eclipse.kapua.service.datastore.model.DatastoreMessage;
 import org.eclipse.kapua.service.datastore.model.MessageListResult;
 import org.eclipse.kapua.service.datastore.model.StorableId;
 import org.eclipse.kapua.service.datastore.model.query.AndPredicate;
 import org.eclipse.kapua.service.datastore.model.query.MessageQuery;
 import org.eclipse.kapua.service.datastore.model.query.MetricPredicate;
 import org.eclipse.kapua.service.datastore.model.query.RangePredicate;
+import org.eclipse.kapua.service.datastore.model.query.SortDirection;
+import org.eclipse.kapua.service.datastore.model.query.SortField;
 import org.eclipse.kapua.service.datastore.model.query.StorableFetchStyle;
 import org.eclipse.kapua.service.datastore.model.query.StorablePredicate;
 import org.eclipse.kapua.service.datastore.model.query.StorablePredicateFactory;
@@ -51,6 +54,7 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
+import java.util.Collections;
 import java.util.Date;
 
 @Api(value = "Data Messages", authorizations = { @Authorization(value = "kapuaAccessToken") })
@@ -132,7 +136,7 @@ public <V extends Comparable<V>> MessageListResult simpleQuery(  //
         query.setPredicate(andPredicate);
         query.setOffset(offset);
         query.setLimit(limit);
-
+        query.setSortFields(Collections.singletonList(SortField.of(SortDirection.DESC, MessageSchema.MESSAGE_TIMESTAMP)));
         return query(scopeId, query);
     }
 

diff --git a/...resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMetrics.java b/...resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMetrics.java
@@ -21,6 +21,8 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
+import java.util.Collections;
+
 import io.swagger.annotations.Authorization;
 
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
@@ -31,11 +33,14 @@
 import org.eclipse.kapua.service.datastore.MetricInfoRegistryService;
 import org.eclipse.kapua.service.datastore.internal.mediator.MetricInfoField;
 import org.eclipse.kapua.service.datastore.internal.model.query.ChannelMatchPredicateImpl;
+import org.eclipse.kapua.service.datastore.internal.schema.MetricInfoSchema;
 import org.eclipse.kapua.service.datastore.model.MetricInfo;
 import org.eclipse.kapua.service.datastore.model.MetricInfoListResult;
 import org.eclipse.kapua.service.datastore.model.query.AndPredicate;
 import org.eclipse.kapua.service.datastore.model.query.ChannelMatchPredicate;
 import org.eclipse.kapua.service.datastore.model.query.MetricInfoQuery;
+import org.eclipse.kapua.service.datastore.model.query.SortDirection;
+import org.eclipse.kapua.service.datastore.model.query.SortField;
 import org.eclipse.kapua.service.datastore.model.query.StorablePredicateFactory;
 import org.eclipse.kapua.service.datastore.model.query.TermPredicate;
 
@@ -105,7 +110,7 @@ public MetricInfoListResult simpleQuery( //
         query.setPredicate(andPredicate);
         query.setOffset(offset);
         query.setLimit(limit);
-
+        query.setSortFields(Collections.singletonList(SortField.of(SortDirection.ASC, MetricInfoSchema.METRIC_MTR_NAME)));
         return query(scopeId, query);
     }