Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Model getters have same annotations as fields (breaks native) #6086

Merged
merged 3 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Fix #6038: Support for Gradle configuration cache
* Fix #6059: Swallow rejected execution from internal usage of the informer executor
* Fix #6068: KubernetesMockServer provides incomplete Configuration while creating test Config for KubernetesClient
* Fix #6085: model getters have same annotations as fields (breaks native)

#### Improvements
* Fix #6008: removing the optional dependency on bouncy castle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public ACMEAuthorization(List<ACMEChallenge> challenges, String identifier, Stri
}

@JsonProperty("challenges")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<ACMEChallenge> getChallenges() {
return challenges;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public void setLabels(Map<String, String> labels) {
}

@JsonProperty("parentRefs")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<ParentReference> getParentRefs() {
return parentRefs;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ public void setAffinity(Affinity affinity) {
}

@JsonProperty("imagePullSecrets")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<io.fabric8.kubernetes.api.model.LocalObjectReference> getImagePullSecrets() {
return imagePullSecrets;
}
Expand Down Expand Up @@ -161,6 +162,7 @@ public void setServiceAccountName(java.lang.String serviceAccountName) {
}

@JsonProperty("tolerations")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<Toleration> getTolerations() {
return tolerations;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ public ACMEIssuer(String caBundle, Boolean disableAccountKeyGeneration, String e
}

@JsonProperty("caBundle")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String getCaBundle() {
return caBundle;
}
Expand Down Expand Up @@ -216,6 +217,7 @@ public void setSkipTLSVerify(Boolean skipTLSVerify) {
}

@JsonProperty("solvers")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<ACMEChallengeSolver> getSolvers() {
return solvers;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public CertificateDNSNameSelector(List<java.lang.String> dnsNames, List<java.lan
}

@JsonProperty("dnsNames")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<java.lang.String> getDnsNames() {
return dnsNames;
}
Expand All @@ -108,6 +109,7 @@ public void setDnsNames(List<java.lang.String> dnsNames) {
}

@JsonProperty("dnsZones")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<java.lang.String> getDnsZones() {
return dnsZones;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ public void setCommonName(String commonName) {
}

@JsonProperty("dnsNames")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getDnsNames() {
return dnsNames;
}
Expand All @@ -139,6 +140,7 @@ public void setDuration(Duration duration) {
}

@JsonProperty("ipAddresses")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getIpAddresses() {
return ipAddresses;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public OrderStatus(List<ACMEAuthorization> authorizations, String certificate, S
}

@JsonProperty("authorizations")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<ACMEAuthorization> getAuthorizations() {
return authorizations;
}
Expand All @@ -123,6 +124,7 @@ public void setAuthorizations(List<ACMEAuthorization> authorizations) {
}

@JsonProperty("certificate")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String getCertificate() {
return certificate;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public CAIssuer(List<String> crlDistributionPoints, List<String> issuingCertific
}

@JsonProperty("crlDistributionPoints")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getCrlDistributionPoints() {
return crlDistributionPoints;
}
Expand All @@ -112,6 +113,7 @@ public void setCrlDistributionPoints(List<String> crlDistributionPoints) {
}

@JsonProperty("issuingCertificateURLs")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getIssuingCertificateURLs() {
return issuingCertificateURLs;
}
Expand All @@ -122,6 +124,7 @@ public void setIssuingCertificateURLs(List<String> issuingCertificateURLs) {
}

@JsonProperty("ocspServers")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getOcspServers() {
return ocspServers;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public CertificateRequestStatus(String ca, String certificate, List<CertificateR
}

@JsonProperty("ca")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String getCa() {
return ca;
}
Expand All @@ -112,6 +113,7 @@ public void setCa(String ca) {
}

@JsonProperty("certificate")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String getCertificate() {
return certificate;
}
Expand All @@ -122,6 +124,7 @@ public void setCertificate(String certificate) {
}

@JsonProperty("conditions")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<CertificateRequestCondition> getConditions() {
return conditions;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ public CertificateSpec(List<CertificateAdditionalOutputFormat> additionalOutputF
}

@JsonProperty("additionalOutputFormats")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<CertificateAdditionalOutputFormat> getAdditionalOutputFormats() {
return additionalOutputFormats;
}
Expand All @@ -194,6 +195,7 @@ public void setCommonName(String commonName) {
}

@JsonProperty("dnsNames")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getDnsNames() {
return dnsNames;
}
Expand All @@ -214,6 +216,7 @@ public void setDuration(Duration duration) {
}

@JsonProperty("emailAddresses")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getEmailAddresses() {
return emailAddresses;
}
Expand All @@ -234,6 +237,7 @@ public void setEncodeUsagesInRequest(Boolean encodeUsagesInRequest) {
}

@JsonProperty("ipAddresses")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getIpAddresses() {
return ipAddresses;
}
Expand Down Expand Up @@ -294,6 +298,7 @@ public void setNameConstraints(NameConstraints nameConstraints) {
}

@JsonProperty("otherNames")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<OtherName> getOtherNames() {
return otherNames;
}
Expand Down Expand Up @@ -364,6 +369,7 @@ public void setSubject(X509Subject subject) {
}

@JsonProperty("uris")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getUris() {
return uris;
}
Expand All @@ -374,6 +380,7 @@ public void setUris(List<String> uris) {
}

@JsonProperty("usages")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getUsages() {
return usages;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public CertificateStatus(List<CertificateCondition> conditions, Integer failedIs
}

@JsonProperty("conditions")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<CertificateCondition> getConditions() {
return conditions;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ public void setAcme(ACMEIssuerStatus acme) {
}

@JsonProperty("conditions")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<IssuerCondition> getConditions() {
return conditions;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ public NameConstraintItem(List<String> dnsDomains, List<String> emailAddresses,
}

@JsonProperty("dnsDomains")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getDnsDomains() {
return dnsDomains;
}
Expand All @@ -113,6 +114,7 @@ public void setDnsDomains(List<String> dnsDomains) {
}

@JsonProperty("emailAddresses")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getEmailAddresses() {
return emailAddresses;
}
Expand All @@ -123,6 +125,7 @@ public void setEmailAddresses(List<String> emailAddresses) {
}

@JsonProperty("ipRanges")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getIpRanges() {
return ipRanges;
}
Expand All @@ -133,6 +136,7 @@ public void setIpRanges(List<String> ipRanges) {
}

@JsonProperty("uriDomains")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getUriDomains() {
return uriDomains;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public SelfSignedIssuer(List<String> crlDistributionPoints) {
}

@JsonProperty("crlDistributionPoints")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getCrlDistributionPoints() {
return crlDistributionPoints;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ public void setAuth(VaultAuth auth) {
}

@JsonProperty("caBundle")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String getCaBundle() {
return caBundle;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public VenafiTPP(String caBundle, io.fabric8.certmanager.api.model.meta.v1.Local
}

@JsonProperty("caBundle")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String getCaBundle() {
return caBundle;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ public X509Subject(List<String> countries, List<String> localities, List<String>
}

@JsonProperty("countries")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getCountries() {
return countries;
}
Expand All @@ -132,6 +133,7 @@ public void setCountries(List<String> countries) {
}

@JsonProperty("localities")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getLocalities() {
return localities;
}
Expand All @@ -142,6 +144,7 @@ public void setLocalities(List<String> localities) {
}

@JsonProperty("organizationalUnits")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getOrganizationalUnits() {
return organizationalUnits;
}
Expand All @@ -152,6 +155,7 @@ public void setOrganizationalUnits(List<String> organizationalUnits) {
}

@JsonProperty("organizations")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getOrganizations() {
return organizations;
}
Expand All @@ -162,6 +166,7 @@ public void setOrganizations(List<String> organizations) {
}

@JsonProperty("postalCodes")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getPostalCodes() {
return postalCodes;
}
Expand All @@ -172,6 +177,7 @@ public void setPostalCodes(List<String> postalCodes) {
}

@JsonProperty("provinces")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getProvinces() {
return provinces;
}
Expand All @@ -192,6 +198,7 @@ public void setSerialNumber(String serialNumber) {
}

@JsonProperty("streetAddresses")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getStreetAddresses() {
return streetAddresses;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public ACMEAuthorization(List<ACMEChallenge> challenges, String identifier, Stri
}

@JsonProperty("challenges")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<ACMEChallenge> getChallenges() {
return challenges;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ public void setServiceAccountName(java.lang.String serviceAccountName) {
}

@JsonProperty("tolerations")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<Toleration> getTolerations() {
return tolerations;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ public void setSkipTLSVerify(Boolean skipTLSVerify) {
}

@JsonProperty("solvers")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<ACMEChallengeSolver> getSolvers() {
return solvers;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public CertificateDNSNameSelector(List<java.lang.String> dnsNames, List<java.lan
}

@JsonProperty("dnsNames")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<java.lang.String> getDnsNames() {
return dnsNames;
}
Expand All @@ -108,6 +109,7 @@ public void setDnsNames(List<java.lang.String> dnsNames) {
}

@JsonProperty("dnsZones")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<java.lang.String> getDnsZones() {
return dnsZones;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ public void setCsr(String csr) {
}

@JsonProperty("dnsNames")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getDnsNames() {
return dnsNames;
}
Expand All @@ -149,6 +150,7 @@ public void setDuration(Duration duration) {
}

@JsonProperty("ipAddresses")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<String> getIpAddresses() {
return ipAddresses;
}
Expand Down
Loading
Loading