Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jmini committed Oct 9, 2023
2 parents 764ce78 + 5ac9fc9 commit 1e1109e
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/main/java/org/gitlab4j/api/AbstractApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public AbstractApi(GitLabApi gitLabApi) {
}

/**
* Returns the project ID or path from the provided Integer, String, or Project instance.
* Returns the project ID or path from the provided Long, String, or Project instance.
*
* @param obj the object to determine the ID or path from
* @return the project ID or path from the provided Long, String, or Project instance
Expand Down Expand Up @@ -65,7 +65,7 @@ public Object getProjectIdOrPath(Object obj) throws GitLabApiException {
}

/**
* Returns the group ID or path from the provided Integer, String, or Group instance.
* Returns the group ID or path from the provided Long, String, or Group instance.
*
* @param obj the object to determine the ID or path from
* @return the group ID or path from the provided Long, String, or Group instance
Expand Down Expand Up @@ -100,10 +100,10 @@ public Object getGroupIdOrPath(Object obj) throws GitLabApiException {
}

/**
* Returns the user ID or path from the provided Integer, String, or User instance.
* Returns the user ID or path from the provided Long, String, or User instance.
*
* @param obj the object to determine the ID or username from
* @return the user ID or username from the provided Integer, String, or User instance
* @return the user ID or username from the provided Long, String, or User instance
* @throws GitLabApiException if any exception occurs during execution
*/
public Object getUserIdOrUsername(Object obj) throws GitLabApiException {
Expand All @@ -130,15 +130,15 @@ public Object getUserIdOrUsername(Object obj) throws GitLabApiException {

} else {
throw (new RuntimeException("Cannot determine ID or username from provided " + obj.getClass().getSimpleName() +
" instance, must be Integer, String, or a User instance"));
" instance, must be Long, String, or a User instance"));
}
}

/**
* Returns the label ID or name from the provided Integer, String, or Label instance.
* Returns the label ID or name from the provided Long, String, or Label instance.
*
* @param obj the object to determine the ID or name from
* @return the user ID or name from the provided Integer, String, or Label instance
* @return the user ID or name from the provided Long, String, or Label instance
* @throws GitLabApiException if any exception occurs during execution
*/
public Object getLabelIdOrName(Object obj) throws GitLabApiException {
Expand All @@ -165,7 +165,7 @@ public Object getLabelIdOrName(Object obj) throws GitLabApiException {

} else {
throw (new RuntimeException("Cannot determine ID or name from provided " + obj.getClass().getSimpleName() +
" instance, must be Integer, String, or a Label instance"));
" instance, must be Long, String, or a Label instance"));
}
}

Expand Down

0 comments on commit 1e1109e

Please sign in to comment.