Skip to content

Commit 1e1109e

Browse files
committed
Merge remote-tracking branch 'origin/main' into 6.x
2 parents 764ce78 + 5ac9fc9 commit 1e1109e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public AbstractApi(GitLabApi gitLabApi) {
3030
}
3131

3232
/**
33-
* Returns the project ID or path from the provided Integer, String, or Project instance.
33+
* Returns the project ID or path from the provided Long, String, or Project instance.
3434
*
3535
* @param obj the object to determine the ID or path from
3636
* @return the project ID or path from the provided Long, String, or Project instance
@@ -65,7 +65,7 @@ public Object getProjectIdOrPath(Object obj) throws GitLabApiException {
6565
}
6666

6767
/**
68-
* Returns the group ID or path from the provided Integer, String, or Group instance.
68+
* Returns the group ID or path from the provided Long, String, or Group instance.
6969
*
7070
* @param obj the object to determine the ID or path from
7171
* @return the group ID or path from the provided Long, String, or Group instance
@@ -100,10 +100,10 @@ public Object getGroupIdOrPath(Object obj) throws GitLabApiException {
100100
}
101101

102102
/**
103-
* Returns the user ID or path from the provided Integer, String, or User instance.
103+
* Returns the user ID or path from the provided Long, String, or User instance.
104104
*
105105
* @param obj the object to determine the ID or username from
106-
* @return the user ID or username from the provided Integer, String, or User instance
106+
* @return the user ID or username from the provided Long, String, or User instance
107107
* @throws GitLabApiException if any exception occurs during execution
108108
*/
109109
public Object getUserIdOrUsername(Object obj) throws GitLabApiException {
@@ -130,15 +130,15 @@ public Object getUserIdOrUsername(Object obj) throws GitLabApiException {
130130

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

137137
/**
138-
* Returns the label ID or name from the provided Integer, String, or Label instance.
138+
* Returns the label ID or name from the provided Long, String, or Label instance.
139139
*
140140
* @param obj the object to determine the ID or name from
141-
* @return the user ID or name from the provided Integer, String, or Label instance
141+
* @return the user ID or name from the provided Long, String, or Label instance
142142
* @throws GitLabApiException if any exception occurs during execution
143143
*/
144144
public Object getLabelIdOrName(Object obj) throws GitLabApiException {
@@ -165,7 +165,7 @@ public Object getLabelIdOrName(Object obj) throws GitLabApiException {
165165

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

0 commit comments

Comments
 (0)