Commit 982f4b64 authored by Jeremie Bresson's avatar Jeremie Bresson
Browse files

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

parents 4829c204 f7441c79
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
/** /**
...@@ -48,4 +50,9 @@ public class ApprovedBy { ...@@ -48,4 +50,9 @@ public class ApprovedBy {
public Object getApprovedBy() { public Object getApprovedBy() {
return (user != null ? user : group); return (user != null ? user : group);
} }
@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
} }
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class Assignee extends AbstractUser<Assignee> { public class Assignee extends AbstractUser<Assignee> {
@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
} }
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class DiffRef { public class DiffRef {
private String baseSha; private String baseSha;
private String headSha; private String headSha;
...@@ -31,4 +33,9 @@ public class DiffRef { ...@@ -31,4 +33,9 @@ public class DiffRef {
public void setStartSha(final String startSha) { public void setStartSha(final String startSha) {
this.startSha = startSha; this.startSha = startSha;
} }
@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
} }
...@@ -4,6 +4,7 @@ import java.util.List; ...@@ -4,6 +4,7 @@ import java.util.List;
import org.gitlab4j.api.Constants.GroupOrderBy; import org.gitlab4j.api.Constants.GroupOrderBy;
import org.gitlab4j.api.Constants.SortOrder; import org.gitlab4j.api.Constants.SortOrder;
import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.GitLabApiForm;
/** /**
...@@ -152,4 +153,9 @@ public class GroupFilter { ...@@ -152,4 +153,9 @@ public class GroupFilter {
.withParam("top_level_only", topLevelOnly) .withParam("top_level_only", topLevelOnly)
); );
} }
@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
} }
...@@ -2,6 +2,7 @@ package org.gitlab4j.api.models; ...@@ -2,6 +2,7 @@ package org.gitlab4j.api.models;
import org.gitlab4j.api.Constants.ProjectOrderBy; import org.gitlab4j.api.Constants.ProjectOrderBy;
import org.gitlab4j.api.Constants.SortOrder; import org.gitlab4j.api.Constants.SortOrder;
import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.GitLabApiForm;
/** /**
...@@ -189,4 +190,9 @@ public class GroupProjectsFilter { ...@@ -189,4 +190,9 @@ public class GroupProjectsFilter {
.withParam("include_subgroups", includeSubGroups) .withParam("include_subgroups", includeSubGroups)
); );
} }
@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
} }
...@@ -12,6 +12,7 @@ import org.gitlab4j.api.Constants.MergeRequestScope; ...@@ -12,6 +12,7 @@ import org.gitlab4j.api.Constants.MergeRequestScope;
import org.gitlab4j.api.Constants.MergeRequestSearchIn; import org.gitlab4j.api.Constants.MergeRequestSearchIn;
import org.gitlab4j.api.Constants.MergeRequestState; import org.gitlab4j.api.Constants.MergeRequestState;
import org.gitlab4j.api.Constants.SortOrder; import org.gitlab4j.api.Constants.SortOrder;
import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.GitLabApiForm;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
...@@ -369,4 +370,9 @@ public class MergeRequestFilter { ...@@ -369,4 +370,9 @@ public class MergeRequestFilter {
} }
return params; return params;
} }
@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
} }
...@@ -5,6 +5,7 @@ import java.util.Date; ...@@ -5,6 +5,7 @@ import java.util.Date;
import org.gitlab4j.api.Constants.PipelineOrderBy; import org.gitlab4j.api.Constants.PipelineOrderBy;
import org.gitlab4j.api.Constants.PipelineScope; import org.gitlab4j.api.Constants.PipelineScope;
import org.gitlab4j.api.Constants.SortOrder; import org.gitlab4j.api.Constants.SortOrder;
import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.GitLabApiForm;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
...@@ -166,4 +167,9 @@ public class PipelineFilter { ...@@ -166,4 +167,9 @@ public class PipelineFilter {
.withParam("order_by", orderBy) .withParam("order_by", orderBy)
.withParam("sort", sort)); .withParam("sort", sort));
} }
@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
} }
...@@ -5,6 +5,7 @@ import java.util.Date; ...@@ -5,6 +5,7 @@ import java.util.Date;
import org.gitlab4j.api.Constants; import org.gitlab4j.api.Constants;
import org.gitlab4j.api.Constants.ProjectOrderBy; import org.gitlab4j.api.Constants.ProjectOrderBy;
import org.gitlab4j.api.Constants.SortOrder; import org.gitlab4j.api.Constants.SortOrder;
import org.gitlab4j.api.utils.JacksonJson;
import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.GitLabApiForm;
/** /**
...@@ -376,4 +377,9 @@ public class ProjectFilter { ...@@ -376,4 +377,9 @@ public class ProjectFilter {
.withParam("topic_id",topic_id) .withParam("topic_id",topic_id)
); );
} }
@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
} }
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
public class Version { public class Version {
private String version; private String version;
...@@ -20,4 +22,9 @@ public class Version { ...@@ -20,4 +22,9 @@ public class Version {
public void setRevision(String revision) { public void setRevision(String revision) {
this.revision = revision; this.revision = revision;
} }
@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
} }
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