From 325b45e3734881b85b948cd2322b956b73f684af Mon Sep 17 00:00:00 2001 From: Umang Mittal Date: Wed, 27 Oct 2021 15:27:18 -0400 Subject: [PATCH 1/2] Deprecated enums still being used #931 --- src/main/java/com/box/sdk/EventLog.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/box/sdk/EventLog.java b/src/main/java/com/box/sdk/EventLog.java index 9bda5c269..981eff59c 100644 --- a/src/main/java/com/box/sdk/EventLog.java +++ b/src/main/java/com/box/sdk/EventLog.java @@ -59,7 +59,7 @@ public class EventLog implements Iterable { * @return a log of all the events that met the given criteria. */ public static EventLog getEnterpriseEvents(BoxAPIConnection api, String position, Date after, Date before, - BoxEvent.Type... types) { + BoxEvent.EventType... types) { return getEnterpriseEvents(api, position, after, before, ENTERPRISE_LIMIT, types); } @@ -72,7 +72,8 @@ public static EventLog getEnterpriseEvents(BoxAPIConnection api, String position * @param types an optional list of event types to filter by. * @return a log of all the events that met the given criteria. */ - public static EventLog getEnterpriseEvents(BoxAPIConnection api, Date after, Date before, BoxEvent.Type... types) { + public static EventLog getEnterpriseEvents(BoxAPIConnection api, Date after, Date before, + BoxEvent.EventType... types) { return getEnterpriseEvents(api, null, after, before, ENTERPRISE_LIMIT, types); } @@ -89,7 +90,7 @@ public static EventLog getEnterpriseEvents(BoxAPIConnection api, Date after, Dat * @return a log of all the events that met the given criteria. */ public static EventLog getEnterpriseEvents(BoxAPIConnection api, String position, Date after, Date before, - int limit, BoxEvent.Type... types) { + int limit, BoxEvent.EventType... types) { URL url = ENTERPRISE_EVENT_URL_TEMPLATE.build(api.getBaseURL()); @@ -117,7 +118,7 @@ public static EventLog getEnterpriseEvents(BoxAPIConnection api, String position if (types.length > 0) { StringBuilder filterBuilder = new StringBuilder(); - for (BoxEvent.Type filterType : types) { + for (BoxEvent.EventType filterType : types) { filterBuilder.append(filterType.name()); filterBuilder.append(','); } From d84e4740990ce47175ba7354409b1b21f204dbf1 Mon Sep 17 00:00:00 2001 From: Umang Mittal Date: Wed, 27 Oct 2021 15:33:15 -0400 Subject: [PATCH 2/2] Deprecated enums still being used #931 --- src/main/java/com/box/sdk/EventLog.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/box/sdk/EventLog.java b/src/main/java/com/box/sdk/EventLog.java index 981eff59c..988ecac10 100644 --- a/src/main/java/com/box/sdk/EventLog.java +++ b/src/main/java/com/box/sdk/EventLog.java @@ -55,12 +55,12 @@ public class EventLog implements Iterable { * @param position the starting position of the event stream. * @param after the lower bound on the timestamp of the events returned. * @param before the upper bound on the timestamp of the events returned. - * @param types an optional list of event types to filter by. + * @param eventTypes an optional list of event types to filter by. * @return a log of all the events that met the given criteria. */ public static EventLog getEnterpriseEvents(BoxAPIConnection api, String position, Date after, Date before, - BoxEvent.EventType... types) { - return getEnterpriseEvents(api, position, after, before, ENTERPRISE_LIMIT, types); + BoxEvent.EventType... eventTypes) { + return getEnterpriseEvents(api, position, after, before, ENTERPRISE_LIMIT, eventTypes); } /** @@ -69,12 +69,12 @@ public static EventLog getEnterpriseEvents(BoxAPIConnection api, String position * @param api the API connection to use. * @param after the lower bound on the timestamp of the events returned. * @param before the upper bound on the timestamp of the events returned. - * @param types an optional list of event types to filter by. + * @param eventTypes an optional list of event types to filter by. * @return a log of all the events that met the given criteria. */ public static EventLog getEnterpriseEvents(BoxAPIConnection api, Date after, Date before, - BoxEvent.EventType... types) { - return getEnterpriseEvents(api, null, after, before, ENTERPRISE_LIMIT, types); + BoxEvent.EventType... eventTypes) { + return getEnterpriseEvents(api, null, after, before, ENTERPRISE_LIMIT, eventTypes); } /** @@ -86,15 +86,15 @@ public static EventLog getEnterpriseEvents(BoxAPIConnection api, Date after, Dat * @param after the lower bound on the timestamp of the events returned. * @param before the upper bound on the timestamp of the events returned. * @param limit the number of entries to be returned in the response. - * @param types an optional list of event types to filter by. + * @param eventTypes an optional list of event types to filter by. * @return a log of all the events that met the given criteria. */ public static EventLog getEnterpriseEvents(BoxAPIConnection api, String position, Date after, Date before, - int limit, BoxEvent.EventType... types) { + int limit, BoxEvent.EventType... eventTypes) { URL url = ENTERPRISE_EVENT_URL_TEMPLATE.build(api.getBaseURL()); - if (position != null || types.length > 0 || after != null + if (position != null || eventTypes.length > 0 || after != null || before != null || limit != ENTERPRISE_LIMIT) { QueryStringBuilder queryBuilder = new QueryStringBuilder(url.getQuery()); @@ -116,9 +116,9 @@ public static EventLog getEnterpriseEvents(BoxAPIConnection api, String position queryBuilder.appendParam("limit", limit); } - if (types.length > 0) { + if (eventTypes.length > 0) { StringBuilder filterBuilder = new StringBuilder(); - for (BoxEvent.EventType filterType : types) { + for (BoxEvent.EventType filterType : eventTypes) { filterBuilder.append(filterType.name()); filterBuilder.append(','); }