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

Clean up imports and move common parameters into constants

Browse Source
This commit is contained in:
Stefan Kalscheuer 2019-03-17 15:11:58 +01:00
parent 7909a6772d
commit 1aade2882b
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,11 +17,9 @@
package de.stklcode.jvault.connector.model.response; package de.stklcode.jvault.connector.model.response;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import de.stklcode.jvault.connector.exception.InvalidResponseException; import de.stklcode.jvault.connector.exception.InvalidResponseException;
import de.stklcode.jvault.connector.model.response.embedded.SecretMetadata; import de.stklcode.jvault.connector.model.response.embedded.SecretMetadata;
import de.stklcode.jvault.connector.model.response.embedded.VersionMetadata;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

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

@ -33,19 +33,22 @@ import java.util.Map;
*/ */
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public class SecretResponse extends VaultDataResponse { public class SecretResponse extends VaultDataResponse {
private static final String KEY_DATA = "data";
private static final String KEY_METADATA = "metadata";
private Map<String, Object> data; private Map<String, Object> data;
private VersionMetadata metadata; private VersionMetadata metadata;
@Override @Override
public final void setData(final Map<String, Object> data) throws InvalidResponseException { public final void setData(final Map<String, Object> data) throws InvalidResponseException {
if (data.size() == 2 if (data.size() == 2
&& data.containsKey("data") && data.get("data") instanceof Map && data.containsKey(KEY_DATA) && data.get(KEY_DATA) instanceof Map
&& data.containsKey("metadata") && data.get("metadata") instanceof Map) { && data.containsKey(KEY_METADATA) && data.get(KEY_METADATA) instanceof Map) {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
try { try {
// This is apparently a KV v2 value. // This is apparently a KV v2 value.
this.data = (Map<String, Object>) data.get("data"); this.data = (Map<String, Object>) data.get(KEY_DATA);
this.metadata = mapper.readValue(mapper.writeValueAsString(data.get("metadata")), VersionMetadata.class); this.metadata = mapper.readValue(mapper.writeValueAsString(data.get(KEY_METADATA)), VersionMetadata.class);
} catch (ClassCastException | IOException e) { } catch (ClassCastException | IOException e) {
throw new InvalidResponseException("Failed deserializing response", e); throw new InvalidResponseException("Failed deserializing response", e);
} }

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

@ -22,8 +22,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException; import java.time.format.DateTimeParseException;
import java.util.List;
import java.util.Map;
/** /**
* Embedded metadata for a single Key-Value v2 version. * Embedded metadata for a single Key-Value v2 version.