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

Remove Lombok usage.

Browse Source 
Closes gh-341.
This commit is contained in:
Mark Paluch
2019-07-03 09:29:26 +02:00
parent dea6bea82f
commit 62bd0d540c
22 changed files with 1110 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultCassandraProperties.java
View File

@@ -18,8 +18,6 @@ package org.springframework.cloud.vault.config.databases;
import javax.validation.constraints.NotEmpty;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.validation.annotation.Validated;
@@ -29,7 +27,6 @@ import org.springframework.validation.annotation.Validated;
* @author Mark Paluch
*/
@ConfigurationProperties("spring.cloud.vault.cassandra")
@Data
@Validated
public class VaultCassandraProperties implements DatabaseSecretProperties {
@@ -61,4 +58,44 @@ public class VaultCassandraProperties implements DatabaseSecretProperties {
@NotEmpty
private String passwordProperty = "spring.data.cassandra.password";
public boolean isEnabled() {
return this.enabled;
}
public String getRole() {
return this.role;
}
public String getBackend() {
return this.backend;
}
public String getUsernameProperty() {
return this.usernameProperty;
}
public String getPasswordProperty() {
return this.passwordProperty;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public void setRole(String role) {
this.role = role;
}
public void setBackend(String backend) {
this.backend = backend;
}
public void setUsernameProperty(String usernameProperty) {
this.usernameProperty = usernameProperty;
}
public void setPasswordProperty(String passwordProperty) {
this.passwordProperty = passwordProperty;
}
}

43
spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultDatabaseProperties.java
View File

@@ -18,8 +18,6 @@ package org.springframework.cloud.vault.config.databases;
import javax.validation.constraints.NotEmpty;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.validation.annotation.Validated;
@@ -30,7 +28,6 @@ import org.springframework.validation.annotation.Validated;
* @since 2.0
*/
@ConfigurationProperties("spring.cloud.vault.database")
@Data
@Validated
public class VaultDatabaseProperties implements DatabaseSecretProperties {
@@ -62,4 +59,44 @@ public class VaultDatabaseProperties implements DatabaseSecretProperties {
@NotEmpty
private String passwordProperty = "spring.datasource.password";
public boolean isEnabled() {
return this.enabled;
}
public String getRole() {
return this.role;
}
public String getBackend() {
return this.backend;
}
public String getUsernameProperty() {
return this.usernameProperty;
}
public String getPasswordProperty() {
return this.passwordProperty;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public void setRole(String role) {
this.role = role;
}
public void setBackend(String backend) {
this.backend = backend;
}
public void setUsernameProperty(String usernameProperty) {
this.usernameProperty = usernameProperty;
}
public void setPasswordProperty(String passwordProperty) {
this.passwordProperty = passwordProperty;
}
}

46
spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultMongoProperties.java
View File

@@ -18,8 +18,6 @@ package org.springframework.cloud.vault.config.databases;
import javax.validation.constraints.NotEmpty;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.validation.annotation.Validated;
@@ -29,7 +27,6 @@ import org.springframework.validation.annotation.Validated;
* @author Mark Paluch
*/
@ConfigurationProperties("spring.cloud.vault.mongodb")
@Data
@Validated
public class VaultMongoProperties implements DatabaseSecretProperties {
@@ -61,4 +58,47 @@ public class VaultMongoProperties implements DatabaseSecretProperties {
@NotEmpty
private String passwordProperty = "spring.data.mongodb.password";
public VaultMongoProperties() {
}
public boolean isEnabled() {
return this.enabled;
}
public String getRole() {
return this.role;
}
public String getBackend() {
return this.backend;
}
public String getUsernameProperty() {
return this.usernameProperty;
}
public String getPasswordProperty() {
return this.passwordProperty;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public void setRole(String role) {
this.role = role;
}
public void setBackend(String backend) {
this.backend = backend;
}
public void setUsernameProperty(String usernameProperty) {
this.usernameProperty = usernameProperty;
}
public void setPasswordProperty(String passwordProperty) {
this.passwordProperty = passwordProperty;
}
}

52
spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultMySqlProperties.java
View File

@@ -18,11 +18,7 @@ package org.springframework.cloud.vault.config.databases;
import javax.validation.constraints.NotEmpty;
import lombok.Data;
import lombok.Getter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
import org.springframework.cloud.vault.config.VaultSecretBackendDescriptor;
import org.springframework.validation.annotation.Validated;
@@ -33,7 +29,6 @@ import org.springframework.validation.annotation.Validated;
* @deprecated since 2.0. Use {@link VaultDatabaseProperties}.
*/
@ConfigurationProperties("spring.cloud.vault.mysql")
@Data
@Validated
@Deprecated
public class VaultMySqlProperties
@@ -42,15 +37,11 @@ public class VaultMySqlProperties
/**
* Enable mysql backend usage.
*/
@Getter(onMethod_ = { @DeprecatedConfigurationProperty(
reason = "Use spring.cloud.vault.database") })
private boolean enabled = false;
/**
* Role name for credentials.
*/
@Getter(onMethod_ = { @DeprecatedConfigurationProperty(
reason = "Use spring.cloud.vault.database") })
private String role;
/**
@@ -71,4 +62,47 @@ public class VaultMySqlProperties
@NotEmpty
private String passwordProperty = "spring.datasource.password";
public VaultMySqlProperties() {
}
public String getBackend() {
return this.backend;
}
public String getUsernameProperty() {
return this.usernameProperty;
}
public String getPasswordProperty() {
return this.passwordProperty;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public void setRole(String role) {
this.role = role;
}
public void setBackend(String backend) {
this.backend = backend;
}
public void setUsernameProperty(String usernameProperty) {
this.usernameProperty = usernameProperty;
}
public void setPasswordProperty(String passwordProperty) {
this.passwordProperty = passwordProperty;
}
public boolean isEnabled() {
return this.enabled;
}
public String getRole() {
return this.role;
}
}

54
spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultPostgreSqlProperties.java
View File

@@ -18,11 +18,7 @@ package org.springframework.cloud.vault.config.databases;
import javax.validation.constraints.NotEmpty;
import lombok.Data;
import lombok.Getter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
import org.springframework.validation.annotation.Validated;
/**
@@ -32,7 +28,6 @@ import org.springframework.validation.annotation.Validated;
* @deprecated since 2.0. Use {@link VaultDatabaseProperties}.
*/
@ConfigurationProperties("spring.cloud.vault.postgresql")
@Data
@Validated
@Deprecated
public class VaultPostgreSqlProperties implements DatabaseSecretProperties {
@@ -41,15 +36,11 @@ public class VaultPostgreSqlProperties implements DatabaseSecretProperties {
* Enable postgresql backend usage.
*/
@Deprecated
@Getter(onMethod_ = { @DeprecatedConfigurationProperty(
reason = "Use spring.cloud.vault.database") })
private boolean enabled = false;
/**
* Role name for credentials.
*/
@Getter(onMethod_ = { @DeprecatedConfigurationProperty(
reason = "Use spring.cloud.vault.database") })
private String role;
/**
@@ -70,4 +61,49 @@ public class VaultPostgreSqlProperties implements DatabaseSecretProperties {
@NotEmpty
private String passwordProperty = "spring.datasource.password";
public VaultPostgreSqlProperties() {
}
public String getBackend() {
return this.backend;
}
public String getUsernameProperty() {
return this.usernameProperty;
}
public String getPasswordProperty() {
return this.passwordProperty;
}
@Deprecated
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public void setRole(String role) {
this.role = role;
}
public void setBackend(String backend) {
this.backend = backend;
}
public void setUsernameProperty(String usernameProperty) {
this.usernameProperty = usernameProperty;
}
public void setPasswordProperty(String passwordProperty) {
this.passwordProperty = passwordProperty;
}
@Deprecated
public boolean isEnabled() {
return this.enabled;
}
public String getRole() {
return this.role;
}
}