Merge branch 'master' into json_binding

Author: jabby

src/main/java/org/gitlab4j/api/AbstractApi.java

@@ -1,6 +1,7 @@
 package org.gitlab4j.api;
 
 import java.io.File;
+import java.io.InputStream;
 import java.net.URL;
 
 import javax.ws.rs.NotAuthorizedException;
@@ -369,7 +370,7 @@ protected Response post(Response.Status expectedStatus, Form formData, URL url)
      * @param expectedStatus the HTTP status that should be returned from the server
      * @param name the name for the form field that contains the file name
      * @param fileToUpload a File instance pointing to the file to upload
-     * @param mediaType the content-type of the uploaded file, if null will be determined from fileToUpload
+     * @param mediaType unused; will be removed in the next major version
      * @param pathArgs variable list of arguments used to build the URI
      * @return a ClientResponse instance with the data returned from the endpoint
      * @throws GitLabApiException if any exception occurs during execution
@@ -382,14 +383,22 @@ protected Response upload(Response.Status expectedStatus, String name, File file
         }
     }
 
+    protected Response upload(Response.Status expectedStatus, String name, InputStream inputStream, String filename, String mediaType, Object... pathArgs) throws GitLabApiException {
+        try {
+            return validate(getApiClient().upload(name, inputStream, filename, mediaType, pathArgs), expectedStatus);
+        } catch (Exception e) {
+            throw handle(e);
+        }
+    }
+
     /**
      * Perform a file upload with the specified File instance and path objects, returning
      * a ClientResponse instance with the data returned from the endpoint.
      *
      * @param expectedStatus the HTTP status that should be returned from the server
      * @param name the name for the form field that contains the file name
      * @param fileToUpload a File instance pointing to the file to upload
-     * @param mediaType the content-type of the uploaded file, if null will be determined from fileToUpload
+     * @param mediaType unused; will be removed in the next major version
      * @param url the fully formed path to the GitLab API endpoint
      * @return a ClientResponse instance with the data returned from the endpoint
      * @throws GitLabApiException if any exception occurs during execution
@@ -409,7 +418,7 @@ protected Response upload(Response.Status expectedStatus, String name, File file
      * @param expectedStatus the HTTP status that should be returned from the server
      * @param name the name for the form field that contains the file name
      * @param fileToUpload a File instance pointing to the file to upload
-     * @param mediaType the content-type of the uploaded file, if null will be determined from fileToUpload
+     * @param mediaType unused; will be removed in the next major version
      * @param formData the Form containing the name/value pairs
      * @param url the fully formed path to the GitLab API endpoint
      * @return a ClientResponse instance with the data returned from the endpoint

src/main/java/org/gitlab4j/api/Constants.java

@@ -509,7 +509,7 @@ public String toString() {
     /** Enum to use for specifying the event action_type. */
     public enum ActionType {
 
-        CREATED, UPDATED, CLOSED, REOPENED, PUSHED, COMMENTED, MERGED, JOINED, LEFT, DESTROYED, EXPIRED, REMOVED;
+        CREATED, UPDATED, OPENED, CLOSED, REOPENED, PUSHED, COMMENTED, MERGED, JOINED, LEFT, DESTROYED, EXPIRED, REMOVED, DELETED, APPROVED, ACCEPTED, IMPORTED;
 
         private static JacksonJsonEnumHelper<ActionType> enumHelper = new JacksonJsonEnumHelper<>(ActionType.class);
 
@@ -962,5 +962,27 @@ public String toString() {
             return (enumHelper.toString(this));
         }
     }
+
+    /** Enum to use for specifying the Event scope. */
+    public enum EventScope {
+        ALL;
+
+        private static JacksonJsonEnumHelper<EventScope> enumHelper = new JacksonJsonEnumHelper<>(EventScope.class);
+
+        @JsonCreator
+        public static EventScope forValue(String value) {
+            return enumHelper.forValue(value);
+        }
+
+        @JsonValue
+        public String toValue() {
+            return (enumHelper.toString(this));
+        }
+
+        @Override
+        public String toString() {
+            return (enumHelper.toString(this));
+        }
+    }
 }
 

src/main/java/org/gitlab4j/api/EventsApi.java

@@ -36,6 +36,24 @@ public List<Event> getAuthenticatedUserEvents(ActionType action, TargetType targ
         return (getAuthenticatedUserEvents(action, targetType, before, after, sortOrder, getDefaultPerPage()).all());
     }
 
+    /**
+     * Get a list of all events for the authenticated user, across all of the user's projects.
+     *
+     * <pre><code>GitLab Endpoint: GET /events</code></pre>
+     *
+     * @param action include only events of a particular action type, optional
+     * @param targetType include only events of a particular target type, optional
+     * @param before include only events created before a particular date, optional
+     * @param after include only events created after a particular date, optional
+     * @param sortOrder sort events in ASC or DESC order by created_at. Default is DESC, optional
+     * @return a list of events for the authenticated user and matching the supplied parameters
+     * @throws GitLabApiException if any exception occurs
+     */
+    public List<Event> getAllAuthenticatedUserEvents(ActionType action, TargetType targetType,
+            Date before, Date after, SortOrder sortOrder) throws GitLabApiException {
+        return (getAuthenticatedUserEvents(action, targetType, before, after, sortOrder, getDefaultPerPage(), EventScope.ALL).all());
+    }
+
     /**
      * Get a list of events for the authenticated user and in the specified page range.
      *
@@ -53,6 +71,27 @@ public List<Event> getAuthenticatedUserEvents(ActionType action, TargetType targ
      */
     public List<Event> getAuthenticatedUserEvents(ActionType action, TargetType targetType,
             Date before, Date after, SortOrder sortOrder, int page, int perPage) throws GitLabApiException {
+        return (getAuthenticatedUserEvents(action, targetType, before, after, sortOrder, page, perPage, null));
+    }
+
+    /**
+     * Get a list of events for the authenticated user and in the specified page range.
+     *
+     * <pre><code>GitLab Endpoint: GET /events</code></pre>
+     *
+     * @param action include only events of a particular action type, optional
+     * @param targetType include only events of a particular target type, optional
+     * @param before include only events created before a particular date, optional
+     * @param after include only events created after a particular date, optional
+     * @param sortOrder sort events in ASC or DESC order by created_at. Default is DESC, optional
+     * @param page the page to get
+     * @param perPage the number of projects per page
+     * @param scope include all events across a user’s projects, optional 
+     * @return a list of events for the authenticated user and matching the supplied parameters
+     * @throws GitLabApiException if any exception occurs
+     */
+    public List<Event> getAuthenticatedUserEvents(ActionType action, TargetType targetType,
+            Date before, Date after, SortOrder sortOrder, int page, int perPage, EventScope scope) throws GitLabApiException {
 
         GitLabApiForm formData = new GitLabApiForm()
                 .withParam("action", action)
@@ -61,7 +100,8 @@ public List<Event> getAuthenticatedUserEvents(ActionType action, TargetType targ
                 .withParam("after", after)
                 .withParam("sort", sortOrder)
                 .withParam(PAGE_PARAM,  page)
-                .withParam(PER_PAGE_PARAM, perPage);
+                .withParam(PER_PAGE_PARAM, perPage)
+                .withParam("scope", scope != null ? scope.toValue().toLowerCase() : null);
 
         Response response = get(Response.Status.OK, formData.asMap(), "events");
         return (response.readEntity(new GenericType<List<Event>>() {}));
@@ -83,13 +123,34 @@ public List<Event> getAuthenticatedUserEvents(ActionType action, TargetType targ
      */
     public Pager<Event> getAuthenticatedUserEvents(ActionType action, TargetType targetType, Date before, Date after,
             SortOrder sortOrder, int itemsPerPage) throws GitLabApiException {
+        return (getAuthenticatedUserEvents(action, targetType, before, after, sortOrder, itemsPerPage, null));
+    }
+
+    /**
+     * Get a list of events for the authenticated user and in the specified page range.
+     *
+     * <pre><code>GitLab Endpoint: GET /events</code></pre>
+     *
+     * @param action include only events of a particular action type, optional
+     * @param targetType include only events of a particular target type, optional
+     * @param before include only events created before a particular date, optional
+     * @param after include only events created after a particular date, optional
+     * @param sortOrder sort events in ASC or DESC order by created_at. Default is DESC, optional
+     * @param itemsPerPage the number of Event instances that will be fetched per page
+     * @param scope include all events across a user’s projects, optional 
+     * @return a Pager of events for the authenticated user and matching the supplied parameters
+     * @throws GitLabApiException if any exception occurs
+     */
+    public Pager<Event> getAuthenticatedUserEvents(ActionType action, TargetType targetType, Date before, Date after,
+            SortOrder sortOrder, int itemsPerPage, EventScope scope) throws GitLabApiException {
 
         GitLabApiForm formData = new GitLabApiForm()
                 .withParam("action", action)
                 .withParam("target_type", targetType != null ? targetType.toValue().toLowerCase() : null)
                 .withParam("before", before)
                 .withParam("after", after)
-                .withParam("sort", sortOrder);
+                .withParam("sort", sortOrder)
+                .withParam("scope", scope != null ? scope.toValue().toLowerCase() : null);
 
         return (new Pager<Event>(this, Event.class, itemsPerPage, formData.asMap(), "events"));
     }
@@ -109,7 +170,25 @@ public Pager<Event> getAuthenticatedUserEvents(ActionType action, TargetType tar
      */
     public Stream<Event> getAuthenticatedUserEventsStream(ActionType action, TargetType targetType,
             Date before, Date after, SortOrder sortOrder) throws GitLabApiException {
-        return (getAuthenticatedUserEvents(action, targetType, before, after, sortOrder, getDefaultPerPage()).stream());
+        return (getAuthenticatedUserEvents(action, targetType, before, after, sortOrder, getDefaultPerPage(), null).stream());
+    }
+
+    /**
+     * Get a Stream of all events for the authenticated user, across all of the user's projects.
+     *
+     * <pre><code>GitLab Endpoint: GET /events</code></pre>
+     *
+     * @param action include only events of a particular action type, optional
+     * @param targetType include only events of a particular target type, optional
+     * @param before include only events created before a particular date, optional
+     * @param after include only events created after a particular date, optional
+     * @param sortOrder sort events in ASC or DESC order by created_at. Default is DESC, optional
+     * @return a Stream of events for the authenticated user and matching the supplied parameters
+     * @throws GitLabApiException if any exception occurs
+     */
+    public Stream<Event> getAllAuthenticatedUserEventsStream(ActionType action, TargetType targetType,
+            Date before, Date after, SortOrder sortOrder) throws GitLabApiException {
+        return (getAuthenticatedUserEvents(action, targetType, before, after, sortOrder, getDefaultPerPage(), EventScope.ALL).stream());
     }
 
     /**

src/main/java/org/gitlab4j/api/GitLabApi.java

@@ -5,6 +5,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.WeakHashMap;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -711,6 +712,14 @@ public String getAuthToken() {
         return (apiClient.getAuthToken());
     }
 
+    /**
+     * Set auth token supplier for gitlab api client.
+     * @param authTokenSupplier - supplier which provide actual auth token
+     */
+    public void setAuthTokenSupplier(Supplier<String> authTokenSupplier) {
+        apiClient.setAuthTokenSupplier(authTokenSupplier);
+    }
+
     /**
      * Get the secret token.
      *