From c9f5b679dda64fd5beda9879d1fabf90d02da1fa Mon Sep 17 00:00:00 2001 From: Mustafa YILDIRIM Date: Thu, 2 May 2019 12:12:32 +0300 Subject: [PATCH 1/4] when creating project add initialize_with_readme option --- src/main/java/org/gitlab/api/GitlabAPI.java | 3 ++- .../java/org/gitlab/api/models/GitlabProject.java | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index c8770ec1..60aee6a3 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1167,7 +1167,8 @@ public GitlabProject createProject(GitlabProject project) throws IOException { .appendIf("request_access_enabled", project.isRequestAccessEnabled()) .appendIf("repository_storage", project.getRepositoryStorage()) .appendIf("approvals_before_merge", project.getApprovalsBeforeMerge()) - .appendIf("printing_merge_request_link_enabled", project.isPrintingMergeRequestLinkEnabled()); + .appendIf("printing_merge_request_link_enabled", project.isPrintingMergeRequestLinkEnabled()) + .appendIf("initialize_with_readme",project.isInitializeWithReadme()); GitlabNamespace namespace = project.getNamespace(); if (namespace != null) { diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index f1c6e803..37e49bc4 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -131,6 +131,9 @@ public class GitlabProject { @JsonProperty("import_status") private String importStatus; + @JsonProperty("initialize_with_readme") + private Boolean initializeWithReadme; + public Integer getId() { return id; } @@ -474,8 +477,16 @@ public Boolean isPrintingMergeRequestLinkEnabled() { public void setPrintingMergeRequestLinkEnabled(Boolean printingMergeRequestLinkEnabled) { this.printingMergeRequestLinkEnabled = printingMergeRequestLinkEnabled; } + + public Boolean isInitializeWithReadme() { + return initializeWithReadme; + } - @Override + public void setInitializeWithReadme(Boolean initializeWithReadme) { + this.initializeWithReadme = initializeWithReadme; + } + + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -497,4 +508,6 @@ public int hashCode() { result = 31 * result + (namespace != null ? namespace.hashCode() : 0); return result; } + + } From f2ca02d12254171c3e3954f3c2fef7c5b0ee66d2 Mon Sep 17 00:00:00 2001 From: Tim Olshansky <456103+timols@users.noreply.github.com> Date: Tue, 13 Aug 2019 11:42:14 -0700 Subject: [PATCH 2/4] Fix whitespace in GitlabAPI --- src/main/java/org/gitlab/api/GitlabAPI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 60aee6a3..e968ca37 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1168,7 +1168,7 @@ public GitlabProject createProject(GitlabProject project) throws IOException { .appendIf("repository_storage", project.getRepositoryStorage()) .appendIf("approvals_before_merge", project.getApprovalsBeforeMerge()) .appendIf("printing_merge_request_link_enabled", project.isPrintingMergeRequestLinkEnabled()) - .appendIf("initialize_with_readme",project.isInitializeWithReadme()); + .appendIf("initialize_with_readme",project.isInitializeWithReadme()); GitlabNamespace namespace = project.getNamespace(); if (namespace != null) { From 2aa9181b315d21a16de0b61cccc8f5496bc1b5a1 Mon Sep 17 00:00:00 2001 From: Mustafa YILDIRIM Date: Wed, 21 Aug 2019 16:03:30 +0300 Subject: [PATCH 3/4] fix whitespace alignment --- src/main/java/org/gitlab/api/GitlabAPI.java | 2 +- .../org/gitlab/api/models/GitlabProject.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 60aee6a3..684483e6 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1168,7 +1168,7 @@ public GitlabProject createProject(GitlabProject project) throws IOException { .appendIf("repository_storage", project.getRepositoryStorage()) .appendIf("approvals_before_merge", project.getApprovalsBeforeMerge()) .appendIf("printing_merge_request_link_enabled", project.isPrintingMergeRequestLinkEnabled()) - .appendIf("initialize_with_readme",project.isInitializeWithReadme()); + .appendIf("initialize_with_readme",project.isInitializeWithReadme()); GitlabNamespace namespace = project.getNamespace(); if (namespace != null) { diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index 37e49bc4..bc8fc4f2 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -133,7 +133,7 @@ public class GitlabProject { @JsonProperty("initialize_with_readme") private Boolean initializeWithReadme; - + public Integer getId() { return id; } @@ -477,16 +477,16 @@ public Boolean isPrintingMergeRequestLinkEnabled() { public void setPrintingMergeRequestLinkEnabled(Boolean printingMergeRequestLinkEnabled) { this.printingMergeRequestLinkEnabled = printingMergeRequestLinkEnabled; } - + public Boolean isInitializeWithReadme() { - return initializeWithReadme; - } + return initializeWithReadme; + } - public void setInitializeWithReadme(Boolean initializeWithReadme) { + public void setInitializeWithReadme(Boolean initializeWithReadme) { this.initializeWithReadme = initializeWithReadme; - } + } - @Override + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -508,6 +508,4 @@ public int hashCode() { result = 31 * result + (namespace != null ? namespace.hashCode() : 0); return result; } - - } From 86671df3a2ba29c777623627014a18c82e89bae0 Mon Sep 17 00:00:00 2001 From: Mustafa YILDIRIM Date: Wed, 21 Aug 2019 17:51:36 +0300 Subject: [PATCH 4/4] fix indentation --- src/main/java/org/gitlab/api/models/GitlabProject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index bc8fc4f2..a245d23b 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -479,11 +479,11 @@ public void setPrintingMergeRequestLinkEnabled(Boolean printingMergeRequestLinkE } public Boolean isInitializeWithReadme() { - return initializeWithReadme; + return initializeWithReadme; } public void setInitializeWithReadme(Boolean initializeWithReadme) { - this.initializeWithReadme = initializeWithReadme; + this.initializeWithReadme = initializeWithReadme; } @Override