Added missing attributes for ProjectApi #1237
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| package org.gitlab4j.api.models; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| import org.gitlab4j.models.utils.JacksonJson; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| public class ContainerExpirationPolicy implements Serializable { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private String cadence; | ||
| private Boolean enabled; | ||
|
|
||
| @JsonProperty("keep_n") | ||
|
There was a problem hiding this comment. Currently the way the models are written, we are not using For consistency reason, I would not add this now. There was a problem hiding this comment. I had to use With {
"cadence" : "1month",
"enabled" : true,
"keep_n" : 100,
"older_than" : "7d",
"name_regex" : ".*-development",
"name_regex_keep" : ".*-main"
}Without {
"cadence" : "1month",
"enabled" : true,
"keepN" : 100,
"olderThan" : "7d",
"nameRegex" : ".*-development",
"nameRegexKeep" : ".*-main"
}Additionally, I also saw it used in @JsonProperty("_links")
private Map<String, String> links; |
||
| private Integer keepN; | ||
|
|
||
| @JsonProperty("older_than") | ||
| private String olderThan; | ||
|
|
||
| @JsonProperty("name_regex") | ||
| private String nameRegex; | ||
|
|
||
| @JsonProperty("name_regex_keep") | ||
| private String nameRegexKeep; | ||
|
|
||
| private String nextRunAt; | ||
|
|
||
| public String getCadence() { | ||
| return cadence; | ||
| } | ||
|
|
||
| public void setCadence(String cadence) { | ||
| this.cadence = cadence; | ||
| } | ||
|
|
||
| public ContainerExpirationPolicy withCadence(String cadence) { | ||
| this.cadence = cadence; | ||
| return this; | ||
| } | ||
|
|
||
| public Boolean getEnabled() { | ||
| return enabled; | ||
| } | ||
|
|
||
| public void setEnabled(Boolean enabled) { | ||
| this.enabled = enabled; | ||
| } | ||
|
|
||
| public ContainerExpirationPolicy withEnabled(Boolean enabled) { | ||
| this.enabled = enabled; | ||
| return this; | ||
| } | ||
|
|
||
| public Integer getKeepN() { | ||
| return keepN; | ||
| } | ||
|
|
||
| public void setKeepN(Integer keepN) { | ||
| this.keepN = keepN; | ||
| } | ||
|
|
||
| public ContainerExpirationPolicy withKeepN(Integer keepN) { | ||
| this.keepN = keepN; | ||
| return this; | ||
| } | ||
|
|
||
| public String getOlderThan() { | ||
| return olderThan; | ||
| } | ||
|
|
||
| public void setOlderThan(String olderThan) { | ||
| this.olderThan = olderThan; | ||
| } | ||
|
|
||
| public ContainerExpirationPolicy withOlderThan(String olderThan) { | ||
| this.olderThan = olderThan; | ||
| return this; | ||
| } | ||
|
|
||
| public String getNameRegex() { | ||
| return nameRegex; | ||
| } | ||
|
|
||
| public void setNameRegex(String nameRegex) { | ||
| this.nameRegex = nameRegex; | ||
| } | ||
|
|
||
| public ContainerExpirationPolicy withNameRegex(String nameRegex) { | ||
| this.nameRegex = nameRegex; | ||
| return this; | ||
| } | ||
|
|
||
| public String getNameRegexKeep() { | ||
| return nameRegexKeep; | ||
| } | ||
|
|
||
| public void setNameRegexKeep(String nameRegexKeep) { | ||
| this.nameRegexKeep = nameRegexKeep; | ||
| } | ||
|
|
||
| public ContainerExpirationPolicy withNameRegexKeep(String nameRegexKeep) { | ||
| this.nameRegexKeep = nameRegexKeep; | ||
| return this; | ||
| } | ||
|
|
||
| public String getNextRunAt() { | ||
| return nextRunAt; | ||
| } | ||
|
|
||
| public void setNextRunAt(String nextRunAt) { | ||
| this.nextRunAt = nextRunAt; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return (JacksonJson.toJsonString(this)); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package org.gitlab4j.api.models; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| import org.gitlab4j.models.utils.JacksonJson; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| public class ContainerExpirationPolicyAttributes implements Serializable { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @JsonProperty("container_expiration_policy_attributes") | ||
| private ContainerExpirationPolicy containerExpirationPolicyAttributes; | ||
|
|
||
| public ContainerExpirationPolicy getContainerExpirationPolicyAttributes() { | ||
| return containerExpirationPolicyAttributes; | ||
| } | ||
|
|
||
| public void setContainerExpirationPolicyAttributes(ContainerExpirationPolicy containerExpirationPolicyAttributes) { | ||
| this.containerExpirationPolicyAttributes = containerExpirationPolicyAttributes; | ||
| } | ||
|
|
||
| public ContainerExpirationPolicyAttributes withContainerExpirationPolicyAttributes( | ||
| ContainerExpirationPolicy containerExpirationPolicyAttributes) { | ||
| this.containerExpirationPolicyAttributes = containerExpirationPolicyAttributes; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return (JacksonJson.toJsonString(this)); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why aren't you using just
ContainerExpirationPolicyas parameter?Inside the method, you could create a new Project and pass the parameter to it with
withContainerExpirationPolicy(..)If you serialise that project instance you will get the same result as with
containerExpirationPolicyAttributes.toString()(since all the other fields will benull)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried that before, but it does not work, I keep getting this error:
container_expiration_policy_attributes is invalidAccording to the documentation,
container_expiration_policy_attributesis used in the create/edit API to modify the policy, whilecontainer_expiration_policyis used in the list API to list the policy.Also, there is an example which updates the policy, which uses
--header 'Content-Type: application/json;charset=UTF-8'I think it doesn't work with
withContainerExpirationPolicy(..). since that request eventually uses--header 'Content-Type: application/x-www-form-urlencoded'. But thecontainer_expiration_policy_attributesis serialized as JSON:{ "cadence" : "1month", "enabled" : true, "keep_n" : 100, "older_than" : "7d", "name_regex" : ".*-development", "name_regex_keep" : ".*-main" }There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The gitlab REST API is very flexible and accept the request to be either a JSON body, a regular HTTP Form Data, query parameters, …
I understand why you need a different method
setProjectContainerExpirationPolicy(..)because here you are sending a project update request where theProjectis serialised as Body.My point was that
ContainerExpirationPolicyAttributesmodel is not really necessary.You could do something like (not tested):
I don't understand why this would not work.
For me
request.toString()withrequestbeing aProjectinstance is the same as yourcontainerExpirationPolicyAttributes.toString()where yourcontainerExpirationPolicyAttributesinstance is of typeContainerExpirationPolicyAttributes.And it removes the need for a
ContainerExpirationPolicyAttributes.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, I now see that there is also
withParam(String name, Map<String, ?> variables, boolean required)method inGitLabApiFormwhich correctly sets form fields for a Map. I can just use that withcontainer_expiration_policy_attributes, that also works.