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.

Sign up for GitHub

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

Jump to bottom

Switch to JDK date time library #1418

Merged
merged 4 commits into from Jan 5, 2021
Merged

Switch to JDK date time library #1418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9234148
Convert to JDK time
dsyer Jan 4, 2021
9da67f7
Upgrade kubernetes to 1.20
dsyer Jan 4, 2021
0dcea5c
Put back date format hack
dsyer Jan 4, 2021
510f30d
Restore GSON manual configuration
dsyer Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions ...rib/cert-manager/src/main/java/io/cert/manager/models/V1alpha2IssuerStatusConditions.java
View file
Open in desktop
Expand Up @@ -20,8 +20,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;
import java.time.OffsetDateTime;
import java.util.Objects;
import org.joda.time.DateTime;

/** IssuerCondition contains condition information for an Issuer. */
@ApiModel(description = "IssuerCondition contains condition information for an Issuer.")
Expand All @@ -32,7 +32,7 @@ public class V1alpha2IssuerStatusConditions {
public static final String SERIALIZED_NAME_LAST_TRANSITION_TIME = "lastTransitionTime";

@SerializedName(SERIALIZED_NAME_LAST_TRANSITION_TIME)
private DateTime lastTransitionTime;
private OffsetDateTime lastTransitionTime;

public static final String SERIALIZED_NAME_MESSAGE = "message";

Expand Down Expand Up @@ -102,7 +102,7 @@ public StatusEnum read(final JsonReader jsonReader) throws IOException {
@SerializedName(SERIALIZED_NAME_TYPE)
private String type;

public V1alpha2IssuerStatusConditions lastTransitionTime(DateTime lastTransitionTime) {
public V1alpha2IssuerStatusConditions lastTransitionTime(OffsetDateTime lastTransitionTime) {

this.lastTransitionTime = lastTransitionTime;
return this;
Expand All @@ -117,11 +117,11 @@ public V1alpha2IssuerStatusConditions lastTransitionTime(DateTime lastTransition
@ApiModelProperty(
value =
"LastTransitionTime is the timestamp corresponding to the last status change of this condition.")
public DateTime getLastTransitionTime() {
public OffsetDateTime getLastTransitionTime() {
return lastTransitionTime;
}

public void setLastTransitionTime(DateTime lastTransitionTime) {
public void setLastTransitionTime(OffsetDateTime lastTransitionTime) {
this.lastTransitionTime = lastTransitionTime;
}

Expand Down
10 changes: 5 additions & 5 deletions ...ib/cert-manager/src/main/java/io/cert/manager/models/V1beta1CertificateRequestStatus.java
View file
Open in desktop
Expand Up @@ -15,11 +15,11 @@
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import org.joda.time.DateTime;

/** Status of the CertificateRequest. This is set and managed automatically. */
@ApiModel(description = "Status of the CertificateRequest. This is set and managed automatically.")
Expand All @@ -45,7 +45,7 @@ public class V1beta1CertificateRequestStatus {
public static final String SERIALIZED_NAME_FAILURE_TIME = "failureTime";

@SerializedName(SERIALIZED_NAME_FAILURE_TIME)
private DateTime failureTime;
private OffsetDateTime failureTime;

public V1beta1CertificateRequestStatus ca(byte[] ca) {

Expand Down Expand Up @@ -131,7 +131,7 @@ public void setConditions(List<V1beta1CertificateRequestStatusConditions> condit
this.conditions = conditions;
}

public V1beta1CertificateRequestStatus failureTime(DateTime failureTime) {
public V1beta1CertificateRequestStatus failureTime(OffsetDateTime failureTime) {

this.failureTime = failureTime;
return this;
Expand All @@ -147,11 +147,11 @@ public V1beta1CertificateRequestStatus failureTime(DateTime failureTime) {
@ApiModelProperty(
value =
"FailureTime stores the time that this CertificateRequest failed. This is used to influence garbage collection and back-off.")
public DateTime getFailureTime() {
public OffsetDateTime getFailureTime() {
return failureTime;
}

public void setFailureTime(DateTime failureTime) {
public void setFailureTime(OffsetDateTime failureTime) {
this.failureTime = failureTime;
}

Expand Down
11 changes: 6 additions & 5 deletions ...nager/src/main/java/io/cert/manager/models/V1beta1CertificateRequestStatusConditions.java
View file
Open in desktop
Expand Up @@ -20,8 +20,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;
import java.time.OffsetDateTime;
import java.util.Objects;
import org.joda.time.DateTime;

/** CertificateRequestCondition contains condition information for a CertificateRequest. */
@ApiModel(
Expand All @@ -34,7 +34,7 @@ public class V1beta1CertificateRequestStatusConditions {
public static final String SERIALIZED_NAME_LAST_TRANSITION_TIME = "lastTransitionTime";

@SerializedName(SERIALIZED_NAME_LAST_TRANSITION_TIME)
private DateTime lastTransitionTime;
private OffsetDateTime lastTransitionTime;

public static final String SERIALIZED_NAME_MESSAGE = "message";

Expand Down Expand Up @@ -104,7 +104,8 @@ public StatusEnum read(final JsonReader jsonReader) throws IOException {
@SerializedName(SERIALIZED_NAME_TYPE)
private String type;

public V1beta1CertificateRequestStatusConditions lastTransitionTime(DateTime lastTransitionTime) {
public V1beta1CertificateRequestStatusConditions lastTransitionTime(
OffsetDateTime lastTransitionTime) {

this.lastTransitionTime = lastTransitionTime;
return this;
Expand All @@ -119,11 +120,11 @@ public V1beta1CertificateRequestStatusConditions lastTransitionTime(DateTime las
@ApiModelProperty(
value =
"LastTransitionTime is the timestamp corresponding to the last status change of this condition.")
public DateTime getLastTransitionTime() {
public OffsetDateTime getLastTransitionTime() {
return lastTransitionTime;
}

public void setLastTransitionTime(DateTime lastTransitionTime) {
public void setLastTransitionTime(OffsetDateTime lastTransitionTime) {
this.lastTransitionTime = lastTransitionTime;
}

Expand Down
34 changes: 17 additions & 17 deletions ...a-contrib/cert-manager/src/main/java/io/cert/manager/models/V1beta1CertificateStatus.java
View file
Open in desktop
Expand Up @@ -15,10 +15,10 @@
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import org.joda.time.DateTime;

/** Status of the Certificate. This is set and managed automatically. */
@ApiModel(description = "Status of the Certificate. This is set and managed automatically.")
Expand All @@ -34,7 +34,7 @@ public class V1beta1CertificateStatus {
public static final String SERIALIZED_NAME_LAST_FAILURE_TIME = "lastFailureTime";

@SerializedName(SERIALIZED_NAME_LAST_FAILURE_TIME)
private DateTime lastFailureTime;
private OffsetDateTime lastFailureTime;

public static final String SERIALIZED_NAME_NEXT_PRIVATE_KEY_SECRET_NAME =
"nextPrivateKeySecretName";
Expand All @@ -45,17 +45,17 @@ public class V1beta1CertificateStatus {
public static final String SERIALIZED_NAME_NOT_AFTER = "notAfter";

@SerializedName(SERIALIZED_NAME_NOT_AFTER)
private DateTime notAfter;
private OffsetDateTime notAfter;

public static final String SERIALIZED_NAME_NOT_BEFORE = "notBefore";

@SerializedName(SERIALIZED_NAME_NOT_BEFORE)
private DateTime notBefore;
private OffsetDateTime notBefore;

public static final String SERIALIZED_NAME_RENEWAL_TIME = "renewalTime";

@SerializedName(SERIALIZED_NAME_RENEWAL_TIME)
private DateTime renewalTime;
private OffsetDateTime renewalTime;

public static final String SERIALIZED_NAME_REVISION = "revision";

Expand Down Expand Up @@ -95,7 +95,7 @@ public void setConditions(List<V1beta1CertificateStatusConditions> conditions) {
this.conditions = conditions;
}

public V1beta1CertificateStatus lastFailureTime(DateTime lastFailureTime) {
public V1beta1CertificateStatus lastFailureTime(OffsetDateTime lastFailureTime) {

this.lastFailureTime = lastFailureTime;
return this;
Expand All @@ -112,11 +112,11 @@ public V1beta1CertificateStatus lastFailureTime(DateTime lastFailureTime) {
@ApiModelProperty(
value =
"LastFailureTime is the time as recorded by the Certificate controller of the most recent failure to complete a CertificateRequest for this Certificate resource. If set, cert-manager will not re-request another Certificate until 1 hour has elapsed from this time.")
public DateTime getLastFailureTime() {
public OffsetDateTime getLastFailureTime() {
return lastFailureTime;
}

public void setLastFailureTime(DateTime lastFailureTime) {
public void setLastFailureTime(OffsetDateTime lastFailureTime) {
this.lastFailureTime = lastFailureTime;
}

Expand Down Expand Up @@ -146,7 +146,7 @@ public void setNextPrivateKeySecretName(String nextPrivateKeySecretName) {
this.nextPrivateKeySecretName = nextPrivateKeySecretName;
}

public V1beta1CertificateStatus notAfter(DateTime notAfter) {
public V1beta1CertificateStatus notAfter(OffsetDateTime notAfter) {

this.notAfter = notAfter;
return this;
Expand All @@ -162,15 +162,15 @@ public V1beta1CertificateStatus notAfter(DateTime notAfter) {
@ApiModelProperty(
value =
"The expiration time of the certificate stored in the secret named by this resource in `spec.secretName`.")
public DateTime getNotAfter() {
public OffsetDateTime getNotAfter() {
return notAfter;
}

public void setNotAfter(DateTime notAfter) {
public void setNotAfter(OffsetDateTime notAfter) {
this.notAfter = notAfter;
}

public V1beta1CertificateStatus notBefore(DateTime notBefore) {
public V1beta1CertificateStatus notBefore(OffsetDateTime notBefore) {

this.notBefore = notBefore;
return this;
Expand All @@ -186,15 +186,15 @@ public V1beta1CertificateStatus notBefore(DateTime notBefore) {
@ApiModelProperty(
value =
"The time after which the certificate stored in the secret named by this resource in spec.secretName is valid.")
public DateTime getNotBefore() {
public OffsetDateTime getNotBefore() {
return notBefore;
}

public void setNotBefore(DateTime notBefore) {
public void setNotBefore(OffsetDateTime notBefore) {
this.notBefore = notBefore;
}

public V1beta1CertificateStatus renewalTime(DateTime renewalTime) {
public V1beta1CertificateStatus renewalTime(OffsetDateTime renewalTime) {

this.renewalTime = renewalTime;
return this;
Expand All @@ -210,11 +210,11 @@ public V1beta1CertificateStatus renewalTime(DateTime renewalTime) {
@ApiModelProperty(
value =
"RenewalTime is the time at which the certificate will be next renewed. If not set, no upcoming renewal is scheduled.")
public DateTime getRenewalTime() {
public OffsetDateTime getRenewalTime() {
return renewalTime;
}

public void setRenewalTime(DateTime renewalTime) {
public void setRenewalTime(OffsetDateTime renewalTime) {
this.renewalTime = renewalTime;
}

Expand Down
10 changes: 5 additions & 5 deletions ...cert-manager/src/main/java/io/cert/manager/models/V1beta1CertificateStatusConditions.java
View file
Open in desktop
Expand Up @@ -20,8 +20,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;
import java.time.OffsetDateTime;
import java.util.Objects;
import org.joda.time.DateTime;

/** CertificateCondition contains condition information for an Certificate. */
@ApiModel(description = "CertificateCondition contains condition information for an Certificate.")
Expand All @@ -32,7 +32,7 @@ public class V1beta1CertificateStatusConditions {
public static final String SERIALIZED_NAME_LAST_TRANSITION_TIME = "lastTransitionTime";

@SerializedName(SERIALIZED_NAME_LAST_TRANSITION_TIME)
private DateTime lastTransitionTime;
private OffsetDateTime lastTransitionTime;

public static final String SERIALIZED_NAME_MESSAGE = "message";

Expand Down Expand Up @@ -102,7 +102,7 @@ public StatusEnum read(final JsonReader jsonReader) throws IOException {
@SerializedName(SERIALIZED_NAME_TYPE)
private String type;

public V1beta1CertificateStatusConditions lastTransitionTime(DateTime lastTransitionTime) {
public V1beta1CertificateStatusConditions lastTransitionTime(OffsetDateTime lastTransitionTime) {

this.lastTransitionTime = lastTransitionTime;
return this;
Expand All @@ -117,11 +117,11 @@ public V1beta1CertificateStatusConditions lastTransitionTime(DateTime lastTransi
@ApiModelProperty(
value =
"LastTransitionTime is the timestamp corresponding to the last status change of this condition.")
public DateTime getLastTransitionTime() {
public OffsetDateTime getLastTransitionTime() {
return lastTransitionTime;
}

public void setLastTransitionTime(DateTime lastTransitionTime) {
public void setLastTransitionTime(OffsetDateTime lastTransitionTime) {
this.lastTransitionTime = lastTransitionTime;
}

Expand Down
10 changes: 5 additions & 5 deletions ...nt-java-contrib/cert-manager/src/main/java/io/cert/manager/models/V1beta1OrderStatus.java
View file
Open in desktop
Expand Up @@ -19,11 +19,11 @@
import com.google.gson.stream.JsonWriter;
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import org.joda.time.DateTime;

/** V1beta1OrderStatus */
@javax.annotation.Generated(
Expand All @@ -43,7 +43,7 @@ public class V1beta1OrderStatus {
public static final String SERIALIZED_NAME_FAILURE_TIME = "failureTime";

@SerializedName(SERIALIZED_NAME_FAILURE_TIME)
private DateTime failureTime;
private OffsetDateTime failureTime;

public static final String SERIALIZED_NAME_FINALIZE_U_R_L = "finalizeURL";

Expand Down Expand Up @@ -182,7 +182,7 @@ public void setCertificate(byte[] certificate) {
this.certificate = certificate;
}

public V1beta1OrderStatus failureTime(DateTime failureTime) {
public V1beta1OrderStatus failureTime(OffsetDateTime failureTime) {

this.failureTime = failureTime;
return this;
Expand All @@ -198,11 +198,11 @@ public V1beta1OrderStatus failureTime(DateTime failureTime) {
@ApiModelProperty(
value =
"FailureTime stores the time that this order failed. This is used to influence garbage collection and back-off.")
public DateTime getFailureTime() {
public OffsetDateTime getFailureTime() {
return failureTime;
}

public void setFailureTime(DateTime failureTime) {
public void setFailureTime(OffsetDateTime failureTime) {
this.failureTime = failureTime;
}

Expand Down