Commit 1e1109ef authored by Jeremie Bresson's avatar Jeremie Bresson
Browse files

Merge remote-tracking branch 'origin/main' into 6.x

parents 764ce784 5ac9fc9b
...@@ -30,7 +30,7 @@ public abstract class AbstractApi implements Constants { ...@@ -30,7 +30,7 @@ public abstract class AbstractApi implements Constants {
} }
/** /**
* 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 * @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 * @return the project ID or path from the provided Long, String, or Project instance
...@@ -65,7 +65,7 @@ public abstract class AbstractApi implements Constants { ...@@ -65,7 +65,7 @@ public abstract class AbstractApi implements Constants {
} }
/** /**
* 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 * @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 * @return the group ID or path from the provided Long, String, or Group instance
...@@ -100,10 +100,10 @@ public abstract class AbstractApi implements Constants { ...@@ -100,10 +100,10 @@ public abstract class AbstractApi implements Constants {
} }
/** /**
* 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 * @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 * @throws GitLabApiException if any exception occurs during execution
*/ */
public Object getUserIdOrUsername(Object obj) throws GitLabApiException { public Object getUserIdOrUsername(Object obj) throws GitLabApiException {
...@@ -130,15 +130,15 @@ public abstract class AbstractApi implements Constants { ...@@ -130,15 +130,15 @@ public abstract class AbstractApi implements Constants {
} else { } else {
throw (new RuntimeException("Cannot determine ID or username from provided " + obj.getClass().getSimpleName() + 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 * @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 * @throws GitLabApiException if any exception occurs during execution
*/ */
public Object getLabelIdOrName(Object obj) throws GitLabApiException { public Object getLabelIdOrName(Object obj) throws GitLabApiException {
...@@ -165,7 +165,7 @@ public abstract class AbstractApi implements Constants { ...@@ -165,7 +165,7 @@ public abstract class AbstractApi implements Constants {
} else { } else {
throw (new RuntimeException("Cannot determine ID or name from provided " + obj.getClass().getSimpleName() + 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"));
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment