diff --git a/CHANGELOG.md b/CHANGELOG.md index 66ebeb3..04a923c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,18 @@ * Use pre-sized map objects for fixed-size payloads * Remove Apache HTTP Client dependency in favor of Java 11 HTTP + +## 0.9.4 (2021-06-06) + +### Deprecations +* `AppRole.Builder#wit0hTokenPeriod()` is deprecated in favor of `#withTokenPeriod()` (#49) + +### Improvements +* Minor dependency updates + ### Test * Tested against Vault 1.7.2 - ## 0.9.3 (2021-04-02) ### Improvements diff --git a/README.md b/README.md index fa03207..4b0fe34 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject de.stklcode.jvault jvault-connector - 0.9.3 + 0.9.4 ``` diff --git a/pom.xml b/pom.xml index 8203e93..81aec77 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ org.mockito mockito-core - 3.10.0 + 3.11.0 test diff --git a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java index 3af63a2..f0674b9 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java +++ b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java @@ -703,21 +703,34 @@ public final class AppRole { * @return self * @since 0.9 */ - public Builder wit0hTokenPeriod(final Integer tokenPeriod) { + public Builder withTokenPeriod(final Integer tokenPeriod) { this.tokenPeriod = tokenPeriod; return this; } + /** + * Set renewal period for generated token in seconds. + * + * @param tokenPeriod period in seconds + * @return self + * @since 0.9 + * @deprecated Use {@link #withTokenPeriod(Integer)} instead. + */ + @Deprecated + public Builder wit0hTokenPeriod(final Integer tokenPeriod) { + return withTokenPeriod(tokenPeriod); + } + /** * Set renewal period for generated token in seconds. * * @param period period in seconds * @return self - * @deprecated Use {@link #wit0hTokenPeriod(Integer)} instead. + * @deprecated Use {@link #withTokenPeriod(Integer)} instead. */ @Deprecated public Builder withPeriod(final Integer period) { - return wit0hTokenPeriod(period); + return withTokenPeriod(period); } /** diff --git a/src/main/java/de/stklcode/jvault/connector/model/AppRoleBuilder.java b/src/main/java/de/stklcode/jvault/connector/model/AppRoleBuilder.java index cb14478..e09e056 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/AppRoleBuilder.java +++ b/src/main/java/de/stklcode/jvault/connector/model/AppRoleBuilder.java @@ -308,21 +308,34 @@ public final class AppRoleBuilder { * @return self * @since 0.9 */ - public AppRoleBuilder wit0hTokenPeriod(final Integer tokenPeriod) { + public AppRoleBuilder withTokenPeriod(final Integer tokenPeriod) { this.tokenPeriod = tokenPeriod; return this; } + /** + * Set renewal period for generated token in seconds. + * + * @param tokenPeriod period in seconds + * @return self + * @since 0.9 + * @deprecated Use {@link #withTokenPeriod(Integer)} instead. + */ + @Deprecated + public AppRoleBuilder wit0hTokenPeriod(final Integer tokenPeriod) { + return withTokenPeriod(tokenPeriod); + } + /** * Set renewal period for generated token in seconds. * * @param period period in seconds * @return self - * @deprecated Use {@link #wit0hTokenPeriod(Integer)} instead. + * @deprecated Use {@link #withTokenPeriod(Integer)} instead. */ @Deprecated public AppRoleBuilder withPeriod(final Integer period) { - return wit0hTokenPeriod(period); + return withTokenPeriod(period); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 10f6f01..aa6e9fe 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -771,7 +771,7 @@ class HTTPVaultConnectorTest { /* Update role model with custom flags */ AppRole role2 = AppRole.builder(roleName) - .wit0hTokenPeriod(321) + .withTokenPeriod(321) .build(); /* Create role */ diff --git a/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java b/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java index 6c4b7c7..45e1bce 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java @@ -138,7 +138,7 @@ class AppRoleBuilderTest { .withTokenExplicitMaxTtl(TOKEN_EXPLICIT_MAX_TTL) .withTokenNoDefaultPolicy(TOKEN_NO_DEFAULT_POLICY) .withTokenNumUses(TOKEN_NUM_USES) - .wit0hTokenPeriod(TOKEN_PERIOD) + .withTokenPeriod(TOKEN_PERIOD) .withTokenType(TOKEN_TYPE) .build(); assertThat(role.getName(), is(NAME)); @@ -183,7 +183,7 @@ class AppRoleBuilderTest { .withTokenExplicitMaxTtl(TOKEN_EXPLICIT_MAX_TTL) .withTokenNoDefaultPolicy(TOKEN_NO_DEFAULT_POLICY) .withTokenNumUses(TOKEN_NUM_USES) - .wit0hTokenPeriod(TOKEN_PERIOD) + .withTokenPeriod(TOKEN_PERIOD) .withTokenType(TOKEN_TYPE) .build(); assertThat(role.getName(), is(NAME));