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

Adapt NonNullFields annotation.

Browse Source 
Closes gh-145.
This commit is contained in:
Mark Paluch
2017-09-22 17:11:09 +02:00
parent 85f66286ab
commit 3fd53ba938
14 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-vault-core/src/main/java/org/springframework/vault/annotation/package-info.java
View File

@@ -1,8 +1,7 @@
/**
* Annotation support for the Spring Vault.
*/
@NonNullApi
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault.annotation;
import org.springframework.lang.NonNullApi;

5
spring-vault-core/src/main/java/org/springframework/vault/authentication/package-info.java
View File

@@ -1,7 +1,6 @@
/**
* Support for authentication and session management.
*/
@NonNullApi
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault.authentication;
import org.springframework.lang.NonNullApi;

5
spring-vault-core/src/main/java/org/springframework/vault/client/package-info.java
View File

@@ -1,7 +1,6 @@
/**
* Spring Vault Client abstraction.
*/
@NonNullApi
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault.client;
import org.springframework.lang.NonNullApi;

3
spring-vault-core/src/main/java/org/springframework/vault/config/AbstractVaultConfiguration.java
View File

@@ -24,6 +24,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.lang.Nullable;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.util.Assert;
import org.springframework.vault.authentication.ClientAuthentication;
@@ -48,7 +49,7 @@ import org.springframework.web.client.RestOperations;
@Configuration
public abstract class AbstractVaultConfiguration implements ApplicationContextAware {
private ApplicationContext applicationContext;
private @Nullable ApplicationContext applicationContext;
/**
* @return Vault endpoint coordinates for HTTP/HTTPS communication, must not be

7
spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java
View File

@@ -22,6 +22,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.Resource;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.vault.authentication.AppIdAuthentication;
@@ -137,8 +138,8 @@ import org.springframework.web.client.RestOperations;
public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration implements
ApplicationContextAware {
private RestOperations cachedRestOperations;
private ApplicationContext applicationContext;
private @Nullable RestOperations cachedRestOperations;
private @Nullable ApplicationContext applicationContext;
@Override
public RestOperations restOperations() {
@@ -324,10 +325,12 @@ public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration im
return new CubbyholeAuthentication(options, restOperations());
}
@Nullable
private String getProperty(String key) {
return getEnvironment().getProperty(key);
}
@Nullable
private Resource getResource(String key) {
String value = getProperty(key);

2
spring-vault-core/src/main/java/org/springframework/vault/config/package-info.java
View File

@@ -1,5 +1,7 @@
/**
* Spring configuration for Vault.
*/
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault.config;

5
spring-vault-core/src/main/java/org/springframework/vault/core/env/package-info.java vendored
View File

@@ -1,7 +1,6 @@
/**
* Spring Vault's environment abstraction consisting property source support.
*/
@NonNullApi
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault.core.env;
import org.springframework.lang.NonNullApi;

5
spring-vault-core/src/main/java/org/springframework/vault/core/lease/domain/package-info.java
View File

@@ -1,7 +1,6 @@
/**
* Lease domain classes.
*/
@NonNullApi
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault.core.lease.domain;
import org.springframework.lang.NonNullApi;

5
spring-vault-core/src/main/java/org/springframework/vault/core/lease/event/package-info.java
View File

@@ -1,7 +1,6 @@
/**
* Support classes for lease application events.
*/
@NonNullApi
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault.core.lease.event;
import org.springframework.lang.NonNullApi;

5
spring-vault-core/src/main/java/org/springframework/vault/core/lease/package-info.java
View File

@@ -1,7 +1,6 @@
/**
* The core package implementing lease renewal and secret rotation.
*/
@NonNullApi
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault.core.lease;
import org.springframework.lang.NonNullApi;

5
spring-vault-core/src/main/java/org/springframework/vault/core/package-info.java
View File

@@ -1,7 +1,6 @@
/**
* Vault core support.
*/
@NonNullApi
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault.core;
import org.springframework.lang.NonNullApi;

5
spring-vault-core/src/main/java/org/springframework/vault/core/util/package-info.java
View File

@@ -1,8 +1,7 @@
/**
* Property transformer classes for Spring Vault core support.
*/
@NonNullApi
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault.core.util;
import org.springframework.lang.NonNullApi;

5
spring-vault-core/src/main/java/org/springframework/vault/package-info.java
View File

@@ -1,7 +1,6 @@
/**
* Spring support for <a href="https://vaultproject.io">Hashicorp Vault</a>.
*/
@NonNullApi
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault;
import org.springframework.lang.NonNullApi;

5
spring-vault-core/src/main/java/org/springframework/vault/support/package-info.java
View File

@@ -1,8 +1,7 @@
/**
* Classes supporting the Vault packages, such as value objects.
*/
@NonNullApi
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.vault.support;
import org.springframework.lang.NonNullApi;