Skip to content

Commit

Permalink
#30399 just renaming orders to order
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdotcms
jdotcms committed Oct 18, 2024
1 parent 11a47ce commit 000b8cf
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 deletions.
18 changes: 9 additions & 9 deletions dotCMS/src/main/java/com/dotcms/analytics/query/AnalyticsQuery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* "limit": 100,
* "offset": 1,
* "timeDimensions": "Events.day day",
* "orders": "Events.day ASC"
* "order": "Events.day ASC"
* }
* }
*
Expand All @@ -41,7 +41,7 @@ public class AnalyticsQuery implements Serializable {
private final long limit;
private final long offset;
private final String timeDimensions; // Events.day day
private String orders; // Events.day ASC
private String order; // Events.day ASC

private AnalyticsQuery(final Builder builder) {
this.dimensions = builder.dimensions;
Expand All @@ -50,7 +50,7 @@ private AnalyticsQuery(final Builder builder) {
this.limit = builder.limit;
this.offset = builder.offset;
this.timeDimensions = builder.timeDimensions;
this.orders = builder.orders;
this.order = builder.order;
}

public Set<String> getDimensions() {
Expand All @@ -77,8 +77,8 @@ public String getTimeDimensions() {
return timeDimensions;
}

public String getOrders() {
return orders;
public String getOrder() {
return order;
}

public static class Builder {
Expand All @@ -96,7 +96,7 @@ public static class Builder {
@JsonProperty()
private String timeDimensions;
@JsonProperty()
private String orders;
private String order;


public Builder dimensions(Set<String> dimensions) {
Expand Down Expand Up @@ -129,8 +129,8 @@ public Builder timeDimensions(String timeDimensions) {
return this;
}

public Builder orders(String orders) {
this.orders = orders;
public Builder order(String orders) {
this.order = orders;
return this;
}

Expand All @@ -152,7 +152,7 @@ public String toString() {
", limit=" + limit +
", offset=" + offset +
", timeDimensions='" + timeDimensions + '\'' +
", orders='" + orders + '\'' +
", order='" + order + '\'' +
'}';
}
}
Expand Down
8 changes: 4 additions & 4 deletions dotCMS/src/main/java/com/dotcms/analytics/query/AnalyticsQueryParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class AnalyticsQueryParser {
* "limit":100,
* "offset":1,
* "timeDimensions":"Events.day day",
* "orders":"Events.day ASC"
* "order":"Events.day ASC"
* }
* @param json
* @return AnalyticsQuery
Expand Down Expand Up @@ -75,7 +75,7 @@ public AnalyticsQuery parseJsonToQuery(final String json) {
* "limit":100,
* "offset":1,
* "timeDimensions":"Events.day day",
* "orders":"Events.day ASC"
* "order":"Events.day ASC"
* }
* @param json
* @return CubeJSQuery
Expand Down Expand Up @@ -117,8 +117,8 @@ public CubeJSQuery parseQueryToCubeQuery(final AnalyticsQuery query) {

builder.limit(query.getLimit()).offset(query.getOffset());

if (UtilMethods.isSet(query.getOrders())) {
builder.orders(parseOrders(query.getOrders()));
if (UtilMethods.isSet(query.getOrder())) {
builder.orders(parseOrders(query.getOrder()));
}

if (UtilMethods.isSet(query.getTimeDimensions())) {
Expand Down
4 changes: 2 additions & 2 deletions dotCMS/src/main/java/com/dotcms/analytics/viewtool/AnalyticsTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void init(final Object initData) {
* "limit":100,
* "offset":1,
* "timeDimensions":"Events.day day",
* "orders":"Events.day ASC"
* "order":"Events.day ASC"
* }")
*
* $analytics.runReportFromJson($query)
Expand All @@ -118,7 +118,7 @@ public ReportResponse runReportFromJson(final String query) {
* $myMap.put('limit', 100)
* $myMap.put('offset', 1)
* $myMap.put('timeDimensions', "Events.day day")
* $myMap.put('orders', "Events.day ASC")
* $myMap.put('order', "Events.day ASC")
*
* $analytics.runReportFromMap($myQuery)
* </code>
Expand Down
2 changes: 1 addition & 1 deletion dotCMS/src/main/java/com/dotcms/rest/api/v1/analytics/content/ContentAnalyticsResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public ContentAnalyticsResource(final WebResource webResource,
" \"measures\": [\n" +
" \"request.count\"\n" +
" ],\n" +
" \"orders\": \"request.count DESC\",\n" +
" \"order\": \"request.count DESC\",\n" +
" \"dimensions\": [\n" +
" \"request.url\",\n" +
" \"request.pageId\",\n" +
Expand Down
2 changes: 1 addition & 1 deletion dotCMS/src/test/java/com/dotcms/analytics/content/ContentAnalyticsAPITest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void getContentAnalyticsReport() {
// ╚══════════════════╝
final AnalyticsQuery analyticsQuery = new AnalyticsQuery.Builder()
.measures(Set.of("request.count"))
.orders("request.count DESC")
.order("request.count DESC")
.dimensions(Set.of("request.url", "request.pageId", "request.pageTitle"))
.filters("request.whatAmI = ['PAGE']")
.limit(100)
Expand Down
2 changes: 1 addition & 1 deletion dotCMS/src/test/java/com/dotcms/analytics/content/ContentAnalyticsFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void getContentAnalyticsReport() throws DotDataException, DotSecurityExce

final AnalyticsQuery analyticsQuery = new AnalyticsQuery.Builder()
.measures(Set.of("request.count"))
.orders("request.count DESC")
.order("request.count DESC")
.dimensions(Set.of("request.url", "request.pageId", "request.pageTitle"))
.filters("request.whatAmI = ['PAGE']")
.limit(100)
Expand Down
14 changes: 7 additions & 7 deletions dotCMS/src/test/java/com/dotcms/analytics/query/AnalyticsQueryParserTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class AnalyticsQueryParserTest {
* "limit":100,
* "offset":1,
* "timeDimensions":"Events.day day",
* "orders":"Events.day ASC"
* "order":"Events.day ASC"
* }
*
* 1) parseJsonToQuery should return a valid query based on the parsed
Expand Down Expand Up @@ -114,7 +114,7 @@ private static AnalyticsQuery testAnalyticsQueryAndReturn(AnalyticsQueryParser a
"\t\"limit\":100,\n" +
"\t\"offset\":1,\n" +
"\t\"timeDimensions\":\"Events.day day\",\n" +
"\t\"orders\":\"Events.day ASC\"\n" +
"\t\"order\":\"Events.day ASC\"\n" +
"}");
Assert.assertNotNull("Query can not be null", query);
Assert.assertTrue("Dimensions should have Events.experiment:", query.getDimensions().contains("Events.experiment"));
Expand All @@ -130,7 +130,7 @@ private static AnalyticsQuery testAnalyticsQueryAndReturn(AnalyticsQueryParser a

Assert.assertEquals("Time dimensions is wrong", "Events.day day", query.getTimeDimensions());

Assert.assertEquals("Orders is wrong", "Events.day ASC", query.getOrders());
Assert.assertEquals("Orders is wrong", "Events.day ASC", query.getOrder());
return query;
}

Expand All @@ -143,7 +143,7 @@ private static AnalyticsQuery testAnalyticsQueryAndReturn(AnalyticsQueryParser a
* "limit":100,
* "offset":1,
* "timeDimensions":Events.day day",
* "orders":"Events.day ASC"
* "order":"Events.day ASC"
* }
*
* should throw an DotRuntimeException
Expand All @@ -161,7 +161,7 @@ public void test_parsing_a_bad_sintax_query() throws Exception {
"\t\"limit\":100,\n" +
"\t\"offset\":1,\n" +
"\t\"timeDimensions\":Events.day day\",\n" +
"\t\"orders\":\"Events.day ASC\"\n" +
"\t\"order\":\"Events.day ASC\"\n" +
"}");

}
Expand All @@ -175,7 +175,7 @@ public void test_parsing_a_bad_sintax_query() throws Exception {
* "limit":100,
* "offset":1,
* "timeDimensions":"Events.day day",
* "orders":"Events.day XXX"
* "order":"Events.day XXX"
* }
*
* should throw an DotRuntimeException
Expand All @@ -193,7 +193,7 @@ public void test_parsing_a_bad_sintax_on_query() throws Exception {
"\t\"limit\":100,\n" +
"\t\"offset\":1,\n" +
"\t\"timeDimensions\":\"Events.day day\",\n" +
"\t\"orders\":\"Events.day XXX\"\n" +
"\t\"order\":\"Events.day XXX\"\n" +
"}");

}
Expand Down

0 comments on commit 000b8cf

Please sign in to comment.