remove deprecated get...TimeString() methods from model classes (#75)
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
### Removal
|
### Removal
|
||||||
* Drop support fpr deprecated `App-ID` auth backend (#61) (#74)
|
* Drop support fpr deprecated `App-ID` auth backend (#61) (#74)
|
||||||
|
* Remove deprecated `get...TimeString()` on model classes (#75)
|
||||||
|
|
||||||
|
|
||||||
## 1.2.0 (2023-12-11)
|
## 1.2.0 (2023-12-11)
|
||||||
|
@@ -57,19 +57,6 @@ public final class SecretMetadata implements Serializable {
|
|||||||
@JsonProperty("versions")
|
@JsonProperty("versions")
|
||||||
private Map<Integer, VersionMetadata> versions;
|
private Map<Integer, VersionMetadata> versions;
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Time of secret creation as raw string representation.
|
|
||||||
* @deprecated Method left for backwards compatibility only. Use {@link #getCreatedTime()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "1.2", forRemoval = true)
|
|
||||||
public String getCreatedTimeString() {
|
|
||||||
if (createdTime != null) {
|
|
||||||
return TIME_FORMAT.format(createdTime);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Time of secret creation.
|
* @return Time of secret creation.
|
||||||
*/
|
*/
|
||||||
@@ -98,19 +85,6 @@ public final class SecretMetadata implements Serializable {
|
|||||||
return oldestVersion;
|
return oldestVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Time of secret update as raw string representation.
|
|
||||||
* @deprecated Method left for backwards compatibility only. Use {@link #getUpdatedTime()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "1.2", forRemoval = true)
|
|
||||||
public String getUpdatedTimeString() {
|
|
||||||
if (updatedTime != null) {
|
|
||||||
return TIME_FORMAT.format(updatedTime);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Time of secret update.
|
* @return Time of secret update.
|
||||||
*/
|
*/
|
||||||
|
@@ -127,20 +127,6 @@ public final class TokenData implements Serializable {
|
|||||||
return entityId;
|
return entityId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Expire time as raw string value
|
|
||||||
* @since 0.9
|
|
||||||
* @deprecated Method left for backwards compatibility only. Use {@link #getExpireTime()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "1.2", forRemoval = true)
|
|
||||||
public String getExpireTimeString() {
|
|
||||||
if (expireTime != null) {
|
|
||||||
return TIME_FORMAT.format(expireTime);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Expire time (parsed)
|
* @return Expire time (parsed)
|
||||||
* @since 0.9
|
* @since 0.9
|
||||||
@@ -164,20 +150,6 @@ public final class TokenData implements Serializable {
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Issue time as raw string value
|
|
||||||
* @since 0.9
|
|
||||||
* @deprecated Method left for backwards compatibility only. Use {@link #getIssueTime()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "1.2", forRemoval = true)
|
|
||||||
public String getIssueTimeString() {
|
|
||||||
if (issueTime != null) {
|
|
||||||
return TIME_FORMAT.format(issueTime);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Expire time (parsed)
|
* @return Expire time (parsed)
|
||||||
* @since 0.9
|
* @since 0.9
|
||||||
|
@@ -50,19 +50,6 @@ public final class VersionMetadata implements Serializable {
|
|||||||
@JsonProperty("version")
|
@JsonProperty("version")
|
||||||
private Integer version;
|
private Integer version;
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Time of secret creation as raw string representation.
|
|
||||||
* @deprecated Method left for backwards compatibility only. Use {@link #getCreatedTime()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "1.2", forRemoval = true)
|
|
||||||
public String getCreatedTimeString() {
|
|
||||||
if (createdTime != null) {
|
|
||||||
return TIME_FORMAT.format(createdTime);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Time of secret creation.
|
* @return Time of secret creation.
|
||||||
*/
|
*/
|
||||||
@@ -70,19 +57,6 @@ public final class VersionMetadata implements Serializable {
|
|||||||
return createdTime;
|
return createdTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Time for secret deletion as raw string representation.
|
|
||||||
* @deprecated Method left for backwards compatibility only. Use {@link #getDeletionTime()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "1.2", forRemoval = true)
|
|
||||||
public String getDeletionTimeString() {
|
|
||||||
if (deletionTime != null) {
|
|
||||||
return TIME_FORMAT.format(deletionTime);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Time for secret deletion.
|
* @return Time for secret deletion.
|
||||||
*/
|
*/
|
||||||
|
@@ -107,9 +107,7 @@ class MetaSecretResponseTest extends AbstractModelTest<MetaSecretResponse> {
|
|||||||
);
|
);
|
||||||
assertSecretData(res);
|
assertSecretData(res);
|
||||||
assertNotNull(res.getMetadata(), "SecretResponse does not contain metadata");
|
assertNotNull(res.getMetadata(), "SecretResponse does not contain metadata");
|
||||||
assertEquals(SECRET_META_CREATED, res.getMetadata().getCreatedTimeString(), "Incorrect creation date string");
|
|
||||||
assertNotNull(res.getMetadata().getCreatedTime(), "Creation date parsing failed");
|
assertNotNull(res.getMetadata().getCreatedTime(), "Creation date parsing failed");
|
||||||
assertNull(res.getMetadata().getDeletionTimeString(), "Incorrect deletion date string");
|
|
||||||
assertNull(res.getMetadata().getDeletionTime(), "Incorrect deletion date");
|
assertNull(res.getMetadata().getDeletionTime(), "Incorrect deletion date");
|
||||||
assertFalse(res.getMetadata().isDestroyed(), "Secret destroyed when not expected");
|
assertFalse(res.getMetadata().isDestroyed(), "Secret destroyed when not expected");
|
||||||
assertEquals(1, res.getMetadata().getVersion(), "Incorrect secret version");
|
assertEquals(1, res.getMetadata().getVersion(), "Incorrect secret version");
|
||||||
@@ -121,9 +119,7 @@ class MetaSecretResponseTest extends AbstractModelTest<MetaSecretResponse> {
|
|||||||
);
|
);
|
||||||
assertSecretData(res);
|
assertSecretData(res);
|
||||||
assertNotNull(res.getMetadata(), "SecretResponse does not contain metadata");
|
assertNotNull(res.getMetadata(), "SecretResponse does not contain metadata");
|
||||||
assertEquals(SECRET_META_CREATED, res.getMetadata().getCreatedTimeString(), "Incorrect creation date string");
|
|
||||||
assertNotNull(res.getMetadata().getCreatedTime(), "Creation date parsing failed");
|
assertNotNull(res.getMetadata().getCreatedTime(), "Creation date parsing failed");
|
||||||
assertEquals(SECRET_META_DELETED, res.getMetadata().getDeletionTimeString(), "Incorrect deletion date string");
|
|
||||||
assertNotNull(res.getMetadata().getDeletionTime(), "Incorrect deletion date");
|
assertNotNull(res.getMetadata().getDeletionTime(), "Incorrect deletion date");
|
||||||
assertTrue(res.getMetadata().isDestroyed(), "Secret destroyed when not expected");
|
assertTrue(res.getMetadata().isDestroyed(), "Secret destroyed when not expected");
|
||||||
assertEquals(2, res.getMetadata().getVersion(), "Incorrect secret version");
|
assertEquals(2, res.getMetadata().getVersion(), "Incorrect secret version");
|
||||||
|
@@ -88,18 +88,14 @@ class MetadataResponseTest extends AbstractModelTest<MetadataResponse> {
|
|||||||
);
|
);
|
||||||
assertNotNull(res, "Parsed response is NULL");
|
assertNotNull(res, "Parsed response is NULL");
|
||||||
assertNotNull(res.getMetadata(), "Parsed metadata is NULL");
|
assertNotNull(res.getMetadata(), "Parsed metadata is NULL");
|
||||||
assertEquals(V1_TIME, res.getMetadata().getCreatedTimeString(), "Incorrect created time");
|
|
||||||
assertNotNull(res.getMetadata().getCreatedTime(), "Parting created time failed");
|
assertNotNull(res.getMetadata().getCreatedTime(), "Parting created time failed");
|
||||||
assertEquals(CURRENT_VERSION, res.getMetadata().getCurrentVersion(), "Incorrect current version");
|
assertEquals(CURRENT_VERSION, res.getMetadata().getCurrentVersion(), "Incorrect current version");
|
||||||
assertEquals(MAX_VERSIONS, res.getMetadata().getMaxVersions(), "Incorrect max versions");
|
assertEquals(MAX_VERSIONS, res.getMetadata().getMaxVersions(), "Incorrect max versions");
|
||||||
assertEquals(OLDEST_VERSION, res.getMetadata().getOldestVersion(), "Incorrect oldest version");
|
assertEquals(OLDEST_VERSION, res.getMetadata().getOldestVersion(), "Incorrect oldest version");
|
||||||
assertEquals(V3_TIME, res.getMetadata().getUpdatedTimeString(), "Incorrect updated time");
|
|
||||||
assertNotNull(res.getMetadata().getUpdatedTime(), "Parting updated time failed");
|
assertNotNull(res.getMetadata().getUpdatedTime(), "Parting updated time failed");
|
||||||
assertEquals(3, res.getMetadata().getVersions().size(), "Incorrect number of versions");
|
assertEquals(3, res.getMetadata().getVersions().size(), "Incorrect number of versions");
|
||||||
assertEquals(V2_TIME, res.getMetadata().getVersions().get(1).getDeletionTimeString(), "Incorrect version 1 delete time");
|
|
||||||
assertNotNull(res.getMetadata().getVersions().get(1).getDeletionTime(), "Parsing version delete time failed");
|
assertNotNull(res.getMetadata().getVersions().get(1).getDeletionTime(), "Parsing version delete time failed");
|
||||||
assertTrue(res.getMetadata().getVersions().get(1).isDestroyed(), "Incorrect version 1 destroyed state");
|
assertTrue(res.getMetadata().getVersions().get(1).isDestroyed(), "Incorrect version 1 destroyed state");
|
||||||
assertEquals(V2_TIME, res.getMetadata().getVersions().get(2).getCreatedTimeString(), "Incorrect version 2 created time");
|
|
||||||
assertNotNull(res.getMetadata().getVersions().get(2).getCreatedTime(), "Parsing version created failed");
|
assertNotNull(res.getMetadata().getVersions().get(2).getCreatedTime(), "Parsing version created failed");
|
||||||
assertFalse(res.getMetadata().getVersions().get(3).isDestroyed(), "Incorrect version 3 destroyed state");
|
assertFalse(res.getMetadata().getVersions().get(3).isDestroyed(), "Incorrect version 3 destroyed state");
|
||||||
}
|
}
|
||||||
|
@@ -67,8 +67,6 @@ class SecretVersionResponseTest extends AbstractModelTest<SecretVersionResponse>
|
|||||||
);
|
);
|
||||||
assertNotNull(res, "Parsed response is NULL");
|
assertNotNull(res, "Parsed response is NULL");
|
||||||
assertNotNull(res.getMetadata(), "Parsed metadata is NULL");
|
assertNotNull(res.getMetadata(), "Parsed metadata is NULL");
|
||||||
assertEquals(CREATION_TIME, res.getMetadata().getCreatedTimeString(), "Incorrect created time");
|
|
||||||
assertEquals(DELETION_TIME, res.getMetadata().getDeletionTimeString(), "Incorrect deletion time");
|
|
||||||
assertFalse(res.getMetadata().isDestroyed(), "Incorrect destroyed state");
|
assertFalse(res.getMetadata().isDestroyed(), "Incorrect destroyed state");
|
||||||
assertEquals(VERSION, res.getMetadata().getVersion(), "Incorrect version");
|
assertEquals(VERSION, res.getMetadata().getVersion(), "Incorrect version");
|
||||||
}
|
}
|
||||||
|
@@ -133,11 +133,9 @@ class TokenResponseTest extends AbstractModelTest<TokenResponse> {
|
|||||||
assertEquals(TOKEN_TTL, data.getCreationTtl(), "Incorrect token creation TTL");
|
assertEquals(TOKEN_TTL, data.getCreationTtl(), "Incorrect token creation TTL");
|
||||||
assertEquals(TOKEN_DISPLAY_NAME, data.getName(), "Incorrect token display name");
|
assertEquals(TOKEN_DISPLAY_NAME, data.getName(), "Incorrect token display name");
|
||||||
assertEquals(TOKEN_ENTITY_ID, data.getEntityId(), "Incorrect token entity ID");
|
assertEquals(TOKEN_ENTITY_ID, data.getEntityId(), "Incorrect token entity ID");
|
||||||
assertEquals(TOKEN_EXPIRE_TIME, data.getExpireTimeString(), "Incorrect token expire time");
|
|
||||||
assertEquals(ZonedDateTime.parse(TOKEN_EXPIRE_TIME), data.getExpireTime(), "Incorrect parsed token expire time");
|
assertEquals(ZonedDateTime.parse(TOKEN_EXPIRE_TIME), data.getExpireTime(), "Incorrect parsed token expire time");
|
||||||
assertEquals(TOKEN_EXPLICIT_MAX_TTL, data.getExplicitMaxTtl(), "Incorrect token explicit max TTL");
|
assertEquals(TOKEN_EXPLICIT_MAX_TTL, data.getExplicitMaxTtl(), "Incorrect token explicit max TTL");
|
||||||
assertEquals(TOKEN_ID, data.getId(), "Incorrect token ID");
|
assertEquals(TOKEN_ID, data.getId(), "Incorrect token ID");
|
||||||
assertEquals(TOKEN_ISSUE_TIME, data.getIssueTimeString(), "Incorrect token issue time");
|
|
||||||
assertEquals(ZonedDateTime.parse(TOKEN_ISSUE_TIME), data.getIssueTime(), "Incorrect parsed token issue time");
|
assertEquals(ZonedDateTime.parse(TOKEN_ISSUE_TIME), data.getIssueTime(), "Incorrect parsed token issue time");
|
||||||
assertEquals(Map.of(TOKEN_META_KEY, TOKEN_META_VALUE), data.getMeta(), "Incorrect token metadata");
|
assertEquals(Map.of(TOKEN_META_KEY, TOKEN_META_VALUE), data.getMeta(), "Incorrect token metadata");
|
||||||
assertEquals(TOKEN_NUM_USES, data.getNumUses(), "Incorrect token number of uses");
|
assertEquals(TOKEN_NUM_USES, data.getNumUses(), "Incorrect token number of uses");
|
||||||
|
Reference in New Issue
Block a user