diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueAccessor.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueAccessor.java index 9aa88429..b2dff399 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueAccessor.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueAccessor.java @@ -42,10 +42,11 @@ import org.springframework.web.client.RestOperations; import org.springframework.web.client.RestTemplate; /** - * Base class for {@link VaultVersionedKeyValueTemplate} and other Vault KV-accessing - * helpers, defining common + * Base class for {@link VaultVersionedKeyValueTemplate} and {@link VaultKeyValueTemplate} + * and other Vault KV-accessing helpers, defining common *

- * Not intended to be used directly. See {@link VaultVersionedKeyValueTemplate}. + * Not intended to be used directly. See {@link VaultVersionedKeyValueTemplate} and + * {@link VaultKeyValueTemplate}. * * @author Mark Paluch * @since 2.1 @@ -151,7 +152,7 @@ public abstract class VaultKeyValueAccessor implements VaultKeyValueOperationsSu } @Nullable - T doRead(String path, ParameterizedTypeReference typeReference) { + private T doRead(String path, ParameterizedTypeReference typeReference) { return doRead((restOperations, httpEntity) -> { return restOperations.exchange(path, HttpMethod.GET, httpEntity, diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueOperations.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueOperations.java index 0cca11e0..839c319b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueOperations.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueOperations.java @@ -23,9 +23,14 @@ import org.springframework.vault.support.VaultResponseSupport; * Interface that specifies a basic set of Vault operations using Vault's Key/Value secret * backend. Paths used in this operations interface are relative and outgoing requests * prepend paths with the according operation-specific prefix. + *

+ * This API supports both, versioned and unversioned key-value backends. Versioned usage + * is limited as updates requiring compare-and-set (CAS) are not possible. Use + * {@link VaultVersionedKeyValueOperations} in such cases instead. * * @author Mark Paluch * @since 2.1 + * @see VaultVersionedKeyValueOperations */ public interface VaultKeyValueOperations extends VaultKeyValueOperationsSupport { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultVersionedKeyValueOperations.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultVersionedKeyValueOperations.java index 0c43a76e..d6a633fb 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultVersionedKeyValueOperations.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultVersionedKeyValueOperations.java @@ -34,6 +34,7 @@ import org.springframework.vault.support.Versioned.Version; * * @author Mark Paluch * @since 2.1 + * @see VaultKeyValueOperations */ public interface VaultVersionedKeyValueOperations extends VaultKeyValueOperationsSupport { diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc index 19444650..f17068ac 100644 --- a/src/main/asciidoc/new-features.adoc +++ b/src/main/asciidoc/new-features.adoc @@ -4,7 +4,7 @@ [[new-features.2-1-0]] === What's new in Spring Vault 2.1 * <> and <> authentication. -* Template API support for versioned Key/Value backends. +* Template API support for versioned and unversioned Key/Value backends. [[new-features.2-0-0]] === What's new in Spring Vault 2.0