@@ -85,20 +85,22 @@ public List<MergeRequest> getMergeRequests(MergeRequestFilter filter, int page,
85
85
*
86
86
* @param filter a MergeRequestFilter instance with the filter settings
87
87
* @param itemsPerPage the number of MergeRequest instances that will be fetched per page
88
- * @return all merge requests for the specified project matching the filter
88
+ * @return all merge requests for the specified project/group matching the filter
89
89
* @throws GitLabApiException if any exception occurs
90
90
*/
91
91
public Pager <MergeRequest > getMergeRequests (MergeRequestFilter filter , int itemsPerPage ) throws GitLabApiException {
92
92
93
93
MultivaluedMap <String , String > queryParams = (filter != null ? filter .getQueryParams ().asMap () : null );
94
- if (filter != null && (filter .getProjectId () != null && filter .getProjectId ().intValue () > 0 ) ||
95
- (filter .getIids () != null && filter .getIids ().size () > 0 )) {
94
+ if (filter != null && (( filter .getProjectId () != null && filter .getProjectId ().intValue () > 0 ) ||
95
+ (filter .getIids () != null && filter .getIids ().size () > 0 ))) {
96
96
97
97
if (filter .getProjectId () == null || filter .getProjectId ().intValue () == 0 ) {
98
98
throw new RuntimeException ("project ID cannot be null or 0" );
99
99
}
100
100
101
101
return (new Pager <MergeRequest >(this , MergeRequest .class , itemsPerPage , queryParams , "projects" , filter .getProjectId (), "merge_requests" ));
102
+ } else if (filter != null && filter .getGroupId () != null && filter .getGroupId ().intValue () > 0 ) {
103
+ return (new Pager <MergeRequest >(this , MergeRequest .class , itemsPerPage , queryParams , "groups" , filter .getGroupId (), "merge_requests" ));
102
104
} else {
103
105
return (new Pager <MergeRequest >(this , MergeRequest .class , itemsPerPage , queryParams , "merge_requests" ));
104
106
}
0 commit comments