stklcode/jvaultconnector
1
0
Fork 0
Code Issues Actions Releases 35 Wiki Activity

Code style

Browse Source 
A number of style corrections in main source files.
Trimmed lines to 120 characters, added some spaces and line breaks.
Removed unused imports
This commit is contained in:
Stefan Kalscheuer
2017-08-02 17:34:38 +02:00
parent 259747afae
commit 42094101a3
14 changed files with 98 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/stklcode/jvault/connector/model/AppRole.java
View File

@@ -17,7 +17,6 @@
package de.stklcode.jvault.connector.model;
import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.util.List;

1
src/main/java/de/stklcode/jvault/connector/model/AppRoleSecret.java
View File

@@ -18,7 +18,6 @@ package de.stklcode.jvault.connector.model;
import com.fasterxml.jackson.annotation.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

10
src/main/java/de/stklcode/jvault/connector/model/Token.java
View File

@@ -80,8 +80,14 @@ public final class Token {
* @param meta Metadata (optional)
* @param renewable Is the token renewable (optional)
*/
public Token(final String id, final String displayName, final Boolean noParent, final Boolean noDefaultPolicy,
final Integer ttl, final Integer numUses, final List<String> policies, final Map<String, String> meta,
public Token(final String id,
final String displayName,
final Boolean noParent,
final Boolean noDefaultPolicy,
final Integer ttl,
final Integer numUses,
final List<String> policies,
final Map<String, String> meta,
final Boolean renewable) {
this.id = id;
this.displayName = displayName;

2
src/main/java/de/stklcode/jvault/connector/model/TokenBuilder.java
View File

@@ -16,8 +16,6 @@
package de.stklcode.jvault.connector.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.*;
/**

11
src/main/java/de/stklcode/jvault/connector/model/response/AppRoleResponse.java
View File

@@ -24,13 +24,12 @@ import de.stklcode.jvault.connector.model.AppRole;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
/**
* Vault response for AppRole lookup.
*
* @author Stefan Kalscheuer
* @since 0.4.0
* @author Stefan Kalscheuer
* @since 0.4.0
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public final class AppRoleResponse extends VaultDataResponse {
@@ -42,7 +41,9 @@ public final class AppRoleResponse extends VaultDataResponse {
try {
/* null empty strings on list objects */
Map<String, Object> filteredData = new HashMap<>();
data.forEach((k,v) -> { if (!(v instanceof String && ((String) v).isEmpty())) filteredData.put(k,v); });
data.forEach((k, v) -> {
if (!(v instanceof String && ((String) v).isEmpty())) filteredData.put(k, v);
});
this.role = mapper.readValue(mapper.writeValueAsString(filteredData), AppRole.class);
} catch (IOException e) {
e.printStackTrace();
@@ -56,4 +57,4 @@ public final class AppRoleResponse extends VaultDataResponse {
public AppRole getRole() {
return role;
}
}
}

11
src/main/java/de/stklcode/jvault/connector/model/response/AppRoleSecretResponse.java
View File

@@ -19,7 +19,6 @@ package de.stklcode.jvault.connector.model.response;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.stklcode.jvault.connector.exception.InvalidResponseException;
import de.stklcode.jvault.connector.model.AppRole;
import de.stklcode.jvault.connector.model.AppRoleSecret;
import java.io.IOException;
@@ -29,8 +28,8 @@ import java.util.Map;
/**
* Vault response for AppRole lookup.
*
* @author Stefan Kalscheuer
* @since 0.4.0
* @author Stefan Kalscheuer
* @since 0.4.0
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public final class AppRoleSecretResponse extends VaultDataResponse {
@@ -42,7 +41,9 @@ public final class AppRoleSecretResponse extends VaultDataResponse {
try {
/* null empty strings on list objects */
Map<String, Object> filteredData = new HashMap<>();
data.forEach((k,v) -> { if (!(v instanceof String && ((String) v).isEmpty())) filteredData.put(k,v); });
data.forEach((k, v) -> {
if (!(v instanceof String && ((String) v).isEmpty())) filteredData.put(k, v);
});
this.secret = mapper.readValue(mapper.writeValueAsString(filteredData), AppRoleSecret.class);
} catch (IOException e) {
e.printStackTrace();
@@ -56,4 +57,4 @@ public final class AppRoleSecretResponse extends VaultDataResponse {
public AppRoleSecret getSecret() {
return secret;
}
}
}

4
src/main/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponse.java
View File

@@ -47,7 +47,9 @@ public final class AuthMethodsResponse extends VaultDataResponse {
ObjectMapper mapper = new ObjectMapper();
for (String path : data.keySet()) {
try {
this.supportedMethods.put(path, mapper.readValue(mapper.writeValueAsString(data.get(path)), AuthMethod.class));
this.supportedMethods.put(
path, mapper.readValue(mapper.writeValueAsString(data.get(path)),
AuthMethod.class));
} catch (IOException e) {
throw new InvalidResponseException();
}

7
src/main/java/de/stklcode/jvault/connector/model/response/CredentialsResponse.java
View File

@@ -17,13 +17,6 @@
package de.stklcode.jvault.connector.model.response;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.stklcode.jvault.connector.exception.InvalidResponseException;
import de.stklcode.jvault.connector.model.response.embedded.TokenData;
import java.io.IOException;
import java.util.Map;
/**
* Vault response from credentials lookup. Simple wrapper for data objects containing username and password fields.

4
src/main/java/de/stklcode/jvault/connector/model/response/ErrorResponse.java
View File

@@ -35,7 +35,7 @@ public final class ErrorResponse implements VaultResponse {
/**
* @return List of errors
*/
public List<String > getErrors() {
public List<String> getErrors() {
return errors;
}
}
}

2
src/main/java/de/stklcode/jvault/connector/model/response/HelpResponse.java
View File

@@ -36,4 +36,4 @@ public final class HelpResponse implements VaultResponse {
public String getHelp() {
return help;
}
}
}

2
src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthData.java
View File

@@ -89,4 +89,4 @@ public final class AuthData {
public boolean isRenewable() {
return renewable;
}
}
}