Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source
This commit is contained in:
Mark Paluch
2019-06-28 16:31:43 +02:00
parent 42c60254f1
commit 92bdb2488c
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySourceRegistrar.java
View File

@@ -103,8 +103,8 @@ class VaultPropertySourceRegistrar implements ImportBeanDefinitionRegistrar,
public void registerBeanDefinitions(AnnotationMetadata annotationMetadata,
BeanDefinitionRegistry registry) {
Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null");
Assert.notNull(registry, "BeanDefinitionRegistry must not be null");
if (!registry.isBeanNameInUse("VaultPropertySourceRegistrar")) {
registry.registerBeanDefinition("VaultPropertySourceRegistrar",

6
spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthentication.java
View File

@@ -105,9 +105,9 @@ public class GcpIamAuthentication extends GcpJwtAuthenticationSupport implements
super(restOperations);
Assert.notNull(options, "GcpIamAuthenticationOptions must not be null!");
Assert.notNull(restOperations, "RestOperations must not be null!");
Assert.notNull(httpTransport, "HttpTransport must not be null!");
Assert.notNull(options, "GcpIamAuthenticationOptions must not be null");
Assert.notNull(restOperations, "RestOperations must not be null");
Assert.notNull(httpTransport, "HttpTransport must not be null");
this.options = options;
this.httpTransport = httpTransport;

2
spring-vault-core/src/main/java/org/springframework/vault/client/VaultResponses.java
View File

@@ -147,7 +147,7 @@ public abstract class VaultResponses {
@SuppressWarnings("unchecked")
public static String getError(String json) {
Assert.notNull(json, "Error JSON must not be null!");
Assert.notNull(json, "Error JSON must not be null");
if (json.contains("\"errors\":")) {

10
spring-vault-core/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java
View File

@@ -263,7 +263,7 @@ public class MappingVaultConverter extends AbstractVaultConverter {
@SuppressWarnings({ "rawtypes", "unchecked" })
private Object readCollectionOrArray(TypeInformation<?> targetType, List sourceValue) {
Assert.notNull(targetType, "Target type must not be null!");
Assert.notNull(targetType, "Target type must not be null");
Class<?> collectionType = targetType.getType();
@@ -301,7 +301,7 @@ public class MappingVaultConverter extends AbstractVaultConverter {
* Reads the given {@link Map} into a {@link Map}. will recursively resolve nested
* {@link Map}s as well.
*
* @param type the {@link Map} {@link TypeInformation} to be used to unmarshall this
* @param type the {@link Map} {@link TypeInformation} to be used to unmarshal this
* {@link Map}.
* @param sourceMap must not be {@literal null}
* @return
@@ -310,7 +310,7 @@ public class MappingVaultConverter extends AbstractVaultConverter {
protected Map<Object, Object> readMap(TypeInformation<?> type,
Map<String, Object> sourceMap) {
Assert.notNull(sourceMap, "Source map must not be null!");
Assert.notNull(sourceMap, "Source map must not be null");
Class<?> mapType = typeMapper.readType(sourceMap, type).getType();
@@ -593,8 +593,8 @@ public class MappingVaultConverter extends AbstractVaultConverter {
protected Map<String, Object> createMap(Map<Object, Object> map,
VaultPersistentProperty property) {
Assert.notNull(map, "Given map must not be null!");
Assert.notNull(property, "PersistentProperty must not be null!");
Assert.notNull(map, "Given map must not be null");
Assert.notNull(property, "PersistentProperty must not be null");
return writeMapInternal(map, new LinkedHashMap<>(), property.getTypeInformation());
}

10
spring-vault-core/src/main/java/org/springframework/vault/repository/convert/SecretDocumentAccessor.java
View File

@@ -48,7 +48,7 @@ class SecretDocumentAccessor {
*/
SecretDocumentAccessor(SecretDocument document) {
Assert.notNull(document, "SecretDocument must not be null!");
Assert.notNull(document, "SecretDocument must not be null");
this.document = document;
this.body = document.getBody();
@@ -64,8 +64,8 @@ class SecretDocumentAccessor {
*/
private SecretDocumentAccessor(SecretDocument document, Map<String, Object> body) {
Assert.notNull(document, "SecretDocument must not be null!");
Assert.notNull(body, "Body must not be null!");
Assert.notNull(document, "SecretDocument must not be null");
Assert.notNull(body, "Body must not be null");
this.document = document;
this.body = body;
@@ -82,7 +82,7 @@ class SecretDocumentAccessor {
*/
void put(VaultPersistentProperty prop, @Nullable Object value) {
Assert.notNull(prop, "VaultPersistentProperty must not be null!");
Assert.notNull(prop, "VaultPersistentProperty must not be null");
String fieldName = prop.getName();
if (prop.isIdProperty()) {
@@ -158,7 +158,7 @@ class SecretDocumentAccessor {
*/
boolean hasValue(VaultPersistentProperty property) {
Assert.notNull(property, "Property must not be null!");
Assert.notNull(property, "Property must not be null");
if (property.isIdProperty()) {
return StringUtils.hasText(this.document.getId());

2
spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultMappingContext.java
View File

@@ -69,7 +69,7 @@ public class VaultMappingContext extends
@Override
public String resolveKeySpace(Class<?> type) {
Assert.notNull(type, "Type must not be null!");
Assert.notNull(type, "Type must not be null");
return StringUtils
.uncapitalize(ClassUtils.getUserClass(type).getSimpleName());
}

2
spring-vault-core/src/main/java/org/springframework/vault/support/Versioned.java
View File

@@ -348,7 +348,7 @@ public class Versioned<T> {
*/
public MetadataBuilder version(Version version) {
Assert.notNull(version, "Version must not be null!");
Assert.notNull(version, "Version must not be null");
this.version = version;
return this;