diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/core/CredHubOperations.java b/spring-credhub-core/src/main/java/org/springframework/credhub/core/CredHubOperations.java index eb9b4b5..bc5b9d1 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/core/CredHubOperations.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/core/CredHubOperations.java @@ -22,7 +22,7 @@ import org.springframework.credhub.support.CredentialDetails; import org.springframework.credhub.support.CredentialName; import org.springframework.credhub.support.CredentialSummary; import org.springframework.credhub.support.VcapServicesData; -import org.springframework.credhub.support.WriteRequest; +import org.springframework.credhub.support.CredentialRequest; import org.springframework.web.client.RestTemplate; /** @@ -36,10 +36,10 @@ public interface CredHubOperations { * Write a new credential to CredHub, or overwrite an existing credential with a new * value. * - * @param writeRequest the credential to write to CredHub; must not be {@literal null} + * @param credentialRequest the credential to write to CredHub; must not be {@literal null} * @return the details of the written credential */ - CredentialDetails write(final WriteRequest writeRequest); + CredentialDetails write(final CredentialRequest credentialRequest); /** * Retrieve a credential using its ID, as returned in a write request. diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/core/CredHubTemplate.java b/spring-credhub-core/src/main/java/org/springframework/credhub/core/CredHubTemplate.java index 11b3d6a..8491590 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/core/CredHubTemplate.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/core/CredHubTemplate.java @@ -27,7 +27,7 @@ import org.springframework.credhub.support.CredentialName; import org.springframework.credhub.support.CredentialSummary; import org.springframework.credhub.support.CredentialSummaryData; import org.springframework.credhub.support.VcapServicesData; -import org.springframework.credhub.support.WriteRequest; +import org.springframework.credhub.support.CredentialRequest; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -92,10 +92,10 @@ public class CredHubTemplate implements CredHubOperations { @Override @SuppressWarnings("unchecked") - public CredentialDetails write(final WriteRequest writeRequest) { - Assert.notNull(writeRequest, "writeRequest must not be null"); + public CredentialDetails write(final CredentialRequest credentialRequest) { + Assert.notNull(credentialRequest, "credentialRequest must not be null"); - Class credentialType = (Class) writeRequest.getValue().getClass(); + Class credentialType = (Class) credentialRequest.getValue().getClass(); final ParameterizedTypeReference> ref = getDetailsReference(credentialType); return doWithRest(new RestOperationsCallback>() { @@ -103,7 +103,7 @@ public class CredHubTemplate implements CredHubOperations { public CredentialDetails doWithRestOperations(RestOperations restOperations) { ResponseEntity> response = restOperations.exchange(BASE_URL_PATH, PUT, - new HttpEntity>(writeRequest), ref); + new HttpEntity>(credentialRequest), ref); throwExceptionOnError(response); diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/AdditionalPermission.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/AdditionalPermission.java index 8746407..31c7430 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/AdditionalPermission.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/AdditionalPermission.java @@ -28,7 +28,7 @@ import java.util.List; * or retrieve the credential. * * Objects of this type are constructed by the application and passed - * as part of a {@link WriteRequest}. + * as part of a {@link CredentialRequest}. * * @author Scott Frederick */ diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateWriteRequest.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateCredentialRequest.java similarity index 66% rename from spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateWriteRequest.java rename to spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateCredentialRequest.java index 25b71c2..7df8707 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateWriteRequest.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateCredentialRequest.java @@ -25,29 +25,29 @@ import static org.springframework.credhub.support.ValueType.CERTIFICATE; * * @author Scott Frederick */ -public class CertificateWriteRequest extends WriteRequest { +public class CertificateCredentialRequest extends CredentialRequest { /** * Create a builder that provides a fluent API for providing the values required - * to construct a {@link CertificateWriteRequest}. + * to construct a {@link CertificateCredentialRequest}. * * @return a builder */ - public static CertificateWriteRequestBuilder builder() { - return new CertificateWriteRequestBuilder(); + public static CertificateCredentialRequestBuilder builder() { + return new CertificateCredentialRequestBuilder(); } /** - * A builder that provides a fluent API for constructing {@link CertificateWriteRequest}s. + * A builder that provides a fluent API for constructing {@link CertificateCredentialRequest}s. */ - public static class CertificateWriteRequestBuilder - extends WriteRequestBuilder { + public static class CertificateCredentialRequestBuilder + extends CredentialRequestBuilder { @Override - protected CertificateWriteRequest createTarget() { - return new CertificateWriteRequest(); + protected CertificateCredentialRequest createTarget() { + return new CertificateCredentialRequest(); } @Override - protected CertificateWriteRequestBuilder createBuilder() { + protected CertificateCredentialRequestBuilder createBuilder() { return this; } @@ -57,7 +57,7 @@ public class CertificateWriteRequest extends WriteRequest * @param value the credential value; must not be {@literal null} * @return the builder */ - public CertificateWriteRequestBuilder value(CertificateCredential value) { + public CertificateCredentialRequestBuilder value(CertificateCredential value) { Assert.notNull(value, "value must not be null"); targetObj.setType(CERTIFICATE); targetObj.setValue(value); diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/WriteRequest.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java similarity index 91% rename from spring-credhub-core/src/main/java/org/springframework/credhub/support/WriteRequest.java rename to spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java index c8af582..ddbad2f 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/WriteRequest.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java @@ -32,7 +32,7 @@ import org.springframework.util.Assert; * * @author Scott Frederick */ -public class WriteRequest { +public class CredentialRequest { private boolean overwrite; private CredentialName name; private ValueType valueType; @@ -40,9 +40,9 @@ public class WriteRequest { private List additionalPermissions; /** - * Initialize a {@link WriteRequest}. + * Initialize a {@link CredentialRequest}. */ - WriteRequest() { + CredentialRequest() { additionalPermissions = new ArrayList(); } @@ -113,10 +113,10 @@ public class WriteRequest { public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof WriteRequest)) + if (!(o instanceof CredentialRequest)) return false; - WriteRequest that = (WriteRequest) o; + CredentialRequest that = (CredentialRequest) o; if (overwrite != that.overwrite) return false; @@ -141,7 +141,7 @@ public class WriteRequest { @Override public String toString() { - return "WriteRequest{" + return "CredentialRequest{" + "overwrite=" + overwrite + ", name=" + name + ", valueType=" + valueType @@ -151,17 +151,17 @@ public class WriteRequest { } /** - * A builder that provides a fluent API for constructing {@link WriteRequest}s. + * A builder that provides a fluent API for constructing {@link CredentialRequest}s. */ @SuppressWarnings("unchecked") - static abstract class WriteRequestBuilder, B extends WriteRequestBuilder> { + static abstract class CredentialRequestBuilder, B extends CredentialRequestBuilder> { private final B thisObj; protected final R targetObj; /** - * Create a {@link WriteRequestBuilder}. Intended for internal use. + * Create a {@link CredentialRequestBuilder}. Intended for internal use. */ - WriteRequestBuilder() { + CredentialRequestBuilder() { this.thisObj = createBuilder(); this.targetObj = createTarget(); } @@ -254,9 +254,9 @@ public class WriteRequest { } /** - * Create a {@link WriteRequest} from the provided values. + * Create a {@link CredentialRequest} from the provided values. * - * @return a {@link WriteRequest} + * @return a {@link CredentialRequest} */ public R build() { return targetObj; diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/JsonWriteRequest.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/JsonCredentialRequest.java similarity index 68% rename from spring-credhub-core/src/main/java/org/springframework/credhub/support/JsonWriteRequest.java rename to spring-credhub-core/src/main/java/org/springframework/credhub/support/JsonCredentialRequest.java index 036e404..505801a 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/JsonWriteRequest.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/JsonCredentialRequest.java @@ -27,30 +27,30 @@ import static org.springframework.credhub.support.ValueType.JSON; * * @author Scott Frederick */ -public class JsonWriteRequest extends WriteRequest { +public class JsonCredentialRequest extends CredentialRequest { /** * Create a builder that provides a fluent API for providing the values required - * to construct a {@link JsonWriteRequest}. + * to construct a {@link JsonCredentialRequest}. * * @return a builder */ - public static JsonWriteRequestBuilder builder() { - return new JsonWriteRequestBuilder(); + public static JsonCredentialRequestBuilder builder() { + return new JsonCredentialRequestBuilder(); } /** - * A builder that provides a fluent API for constructing {@link JsonWriteRequest}s. + * A builder that provides a fluent API for constructing {@link JsonCredentialRequest}s. */ - public static class JsonWriteRequestBuilder extends - WriteRequestBuilder { + public static class JsonCredentialRequestBuilder extends + CredentialRequestBuilder { @Override - protected JsonWriteRequest createTarget() { - return new JsonWriteRequest(); + protected JsonCredentialRequest createTarget() { + return new JsonCredentialRequest(); } @Override - protected JsonWriteRequestBuilder createBuilder() { + protected JsonCredentialRequestBuilder createBuilder() { return this; } @@ -60,14 +60,14 @@ public class JsonWriteRequest extends WriteRequest { * @param value the credential value; must not be {@literal null} * @return the builder */ - public JsonWriteRequestBuilder value(JsonCredential value) { + public JsonCredentialRequestBuilder value(JsonCredential value) { Assert.notNull(value, "value must not be null"); targetObj.setType(JSON); targetObj.setValue(value); return this; } - public JsonWriteRequestBuilder value(Map value) { + public JsonCredentialRequestBuilder value(Map value) { value(new JsonCredential(value)); return this; } diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/PasswordWriteRequest.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/PasswordCredentialRequest.java similarity index 70% rename from spring-credhub-core/src/main/java/org/springframework/credhub/support/PasswordWriteRequest.java rename to spring-credhub-core/src/main/java/org/springframework/credhub/support/PasswordCredentialRequest.java index e3f326a..f0b7be7 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/PasswordWriteRequest.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/PasswordCredentialRequest.java @@ -25,29 +25,29 @@ import static org.springframework.credhub.support.ValueType.PASSWORD; * * @author Scott Frederick */ -public class PasswordWriteRequest extends WriteRequest { +public class PasswordCredentialRequest extends CredentialRequest { /** * Create a builder that provides a fluent API for providing the values required - * to construct a {@link PasswordWriteRequest}. + * to construct a {@link PasswordCredentialRequest}. * * @return a builder */ - public static PasswordWriteRequestBuilder builder() { - return new PasswordWriteRequestBuilder(); + public static PasswordCredentialRequestBuilder builder() { + return new PasswordCredentialRequestBuilder(); } /** - * A builder that provides a fluent API for constructing {@link PasswordWriteRequest}s. + * A builder that provides a fluent API for constructing {@link PasswordCredentialRequest}s. */ - public static class PasswordWriteRequestBuilder - extends WriteRequestBuilder { + public static class PasswordCredentialRequestBuilder + extends CredentialRequestBuilder { @Override - protected PasswordWriteRequest createTarget() { - return new PasswordWriteRequest(); + protected PasswordCredentialRequest createTarget() { + return new PasswordCredentialRequest(); } @Override - protected PasswordWriteRequestBuilder createBuilder() { + protected PasswordCredentialRequestBuilder createBuilder() { return this; } @@ -57,7 +57,7 @@ public class PasswordWriteRequest extends WriteRequest { * @param value the credential value; must not be {@literal null} * @return the builder */ - public PasswordWriteRequestBuilder value(PasswordCredential value) { + public PasswordCredentialRequestBuilder value(PasswordCredential value) { Assert.notNull(value, "value must not be null"); targetObj.setType(PASSWORD); targetObj.setValue(value); @@ -70,7 +70,7 @@ public class PasswordWriteRequest extends WriteRequest { * @param value the credential value; must not be {@literal null} * @return the builder */ - public PasswordWriteRequestBuilder value(String value) { + public PasswordCredentialRequestBuilder value(String value) { Assert.notNull(value, "value must not be null"); targetObj.setType(PASSWORD); targetObj.setValue(new PasswordCredential(value)); diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/RsaWriteRequest.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/RsaCredentialRequest.java similarity index 70% rename from spring-credhub-core/src/main/java/org/springframework/credhub/support/RsaWriteRequest.java rename to spring-credhub-core/src/main/java/org/springframework/credhub/support/RsaCredentialRequest.java index cf6f6ad..9c24119 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/RsaWriteRequest.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/RsaCredentialRequest.java @@ -25,29 +25,29 @@ import static org.springframework.credhub.support.ValueType.RSA; * * @author Scott Frederick */ -public class RsaWriteRequest extends WriteRequest { +public class RsaCredentialRequest extends CredentialRequest { /** * Create a builder that provides a fluent API for providing the values required - * to construct a {@link RsaWriteRequest}. + * to construct a {@link RsaCredentialRequest}. * * @return a builder */ - public static RsaWriteRequestBuilder builder() { - return new RsaWriteRequestBuilder(); + public static RsaCredentialRequestBuilder builder() { + return new RsaCredentialRequestBuilder(); } /** - * A builder that provides a fluent API for constructing {@link RsaWriteRequest}s. + * A builder that provides a fluent API for constructing {@link RsaCredentialRequest}s. */ - public static class RsaWriteRequestBuilder - extends WriteRequestBuilder { + public static class RsaCredentialRequestBuilder + extends CredentialRequestBuilder { @Override - protected RsaWriteRequest createTarget() { - return new RsaWriteRequest(); + protected RsaCredentialRequest createTarget() { + return new RsaCredentialRequest(); } @Override - protected RsaWriteRequestBuilder createBuilder() { + protected RsaCredentialRequestBuilder createBuilder() { return this; } @@ -57,7 +57,7 @@ public class RsaWriteRequest extends WriteRequest { * @param value the credential value; must not be {@literal null} * @return the builder */ - public RsaWriteRequestBuilder value(RsaCredential value) { + public RsaCredentialRequestBuilder value(RsaCredential value) { Assert.notNull(value, "value must not be null"); targetObj.setType(RSA); targetObj.setValue(value); diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/SshWriteRequest.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/SshCredentialRequest.java similarity index 70% rename from spring-credhub-core/src/main/java/org/springframework/credhub/support/SshWriteRequest.java rename to spring-credhub-core/src/main/java/org/springframework/credhub/support/SshCredentialRequest.java index 59a2554..29bd776 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/SshWriteRequest.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/SshCredentialRequest.java @@ -25,29 +25,29 @@ import static org.springframework.credhub.support.ValueType.SSH; * * @author Scott Frederick */ -public class SshWriteRequest extends WriteRequest { +public class SshCredentialRequest extends CredentialRequest { /** * Create a builder that provides a fluent API for providing the values required - * to construct a {@link SshWriteRequest}. + * to construct a {@link SshCredentialRequest}. * * @return a builder */ - public static SshWriteRequestBuilder builder() { - return new SshWriteRequestBuilder(); + public static SshCredentialRequestBuilder builder() { + return new SshCredentialRequestBuilder(); } /** - * A builder that provides a fluent API for constructing {@link SshWriteRequest}s. + * A builder that provides a fluent API for constructing {@link SshCredentialRequest}s. */ - public static class SshWriteRequestBuilder - extends WriteRequestBuilder { + public static class SshCredentialRequestBuilder + extends CredentialRequestBuilder { @Override - protected SshWriteRequest createTarget() { - return new SshWriteRequest(); + protected SshCredentialRequest createTarget() { + return new SshCredentialRequest(); } @Override - protected SshWriteRequestBuilder createBuilder() { + protected SshCredentialRequestBuilder createBuilder() { return this; } @@ -57,7 +57,7 @@ public class SshWriteRequest extends WriteRequest { * @param value the credential value; must not be {@literal null} * @return the builder */ - public SshWriteRequestBuilder value(SshCredential value) { + public SshCredentialRequestBuilder value(SshCredential value) { Assert.notNull(value, "value must not be null"); targetObj.setType(SSH); targetObj.setValue(value); diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/UserWriteRequest.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/UserCredentialRequest.java similarity index 69% rename from spring-credhub-core/src/main/java/org/springframework/credhub/support/UserWriteRequest.java rename to spring-credhub-core/src/main/java/org/springframework/credhub/support/UserCredentialRequest.java index cb9f917..fa5c6b3 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/UserWriteRequest.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/UserCredentialRequest.java @@ -25,29 +25,29 @@ import static org.springframework.credhub.support.ValueType.USER; * * @author Scott Frederick */ -public class UserWriteRequest extends WriteRequest { +public class UserCredentialRequest extends CredentialRequest { /** * Create a builder that provides a fluent API for providing the values required - * to construct a {@link UserWriteRequest}. + * to construct a {@link UserCredentialRequest}. * * @return a builder */ - public static UserWriteRequestBuilder builder() { - return new UserWriteRequestBuilder(); + public static UserCredentialRequestBuilder builder() { + return new UserCredentialRequestBuilder(); } /** - * A builder that provides a fluent API for constructing {@link UserWriteRequest}s. + * A builder that provides a fluent API for constructing {@link UserCredentialRequest}s. */ - public static class UserWriteRequestBuilder - extends WriteRequestBuilder { + public static class UserCredentialRequestBuilder + extends CredentialRequestBuilder { @Override - protected UserWriteRequest createTarget() { - return new UserWriteRequest(); + protected UserCredentialRequest createTarget() { + return new UserCredentialRequest(); } @Override - protected UserWriteRequestBuilder createBuilder() { + protected UserCredentialRequestBuilder createBuilder() { return this; } @@ -57,7 +57,7 @@ public class UserWriteRequest extends WriteRequest { * @param value the credential value; must not be {@literal null} * @return the builder */ - public UserWriteRequestBuilder value(UserCredential value) { + public UserCredentialRequestBuilder value(UserCredential value) { Assert.notNull(value, "value must not be null"); targetObj.setType(USER); targetObj.setValue(value); diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/ValueWriteRequest.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/ValueCredentialRequest.java similarity index 67% rename from spring-credhub-core/src/main/java/org/springframework/credhub/support/ValueWriteRequest.java rename to spring-credhub-core/src/main/java/org/springframework/credhub/support/ValueCredentialRequest.java index b5b2903..ba6bfe8 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/ValueWriteRequest.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/ValueCredentialRequest.java @@ -25,41 +25,39 @@ import static org.springframework.credhub.support.ValueType.VALUE; * * @author Scott Frederick */ -public class ValueWriteRequest extends WriteRequest { +public class ValueCredentialRequest extends CredentialRequest { /** * Create a builder that provides a fluent API for providing the values required - * to construct a {@link ValueWriteRequest}. + * to construct a {@link ValueCredentialRequest}. * * @return a builder */ - public static ValueWriteRequestBuilder builder() { - return new ValueWriteRequestBuilder(); + public static ValueCredentialRequestBuilder builder() { + return new ValueCredentialRequestBuilder(); } /** - * A builder that provides a fluent API for constructing {@link ValueWriteRequest}s. + * A builder that provides a fluent API for constructing {@link ValueCredentialRequest}s. */ - public static class ValueWriteRequestBuilder - extends WriteRequestBuilder { + public static class ValueCredentialRequestBuilder + extends CredentialRequestBuilder { @Override - protected ValueWriteRequest createTarget() { - return new ValueWriteRequest(); + protected ValueCredentialRequest createTarget() { + return new ValueCredentialRequest(); } @Override - protected ValueWriteRequestBuilder createBuilder() { + protected ValueCredentialRequestBuilder createBuilder() { return this; } /** - * Set the value of a {@literal value} credential. A {@literal value} credential - * consists of a single string value. The type of the credential is set to - * {@link ValueType#VALUE}. + * Set the value of a {@literal value} credential. * * @param value the credential value; must not be {@literal null} * @return the builder */ - public ValueWriteRequestBuilder value(ValueCredential value) { + public ValueCredentialRequestBuilder value(ValueCredential value) { Assert.notNull(value, "value must not be null"); targetObj.setType(VALUE); targetObj.setValue(value); @@ -72,7 +70,7 @@ public class ValueWriteRequest extends WriteRequest { * @param value the credential value; must not be {@literal null} * @return the builder */ - public ValueWriteRequestBuilder value(String value) { + public ValueCredentialRequestBuilder value(String value) { Assert.notNull(value, "value must not be null"); targetObj.setType(VALUE); targetObj.setValue(new ValueCredential(value)); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailCertificateUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailCertificateUnitTests.java index 82e0922..6608028 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailCertificateUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailCertificateUnitTests.java @@ -24,12 +24,12 @@ import org.junit.experimental.theories.Theories; import org.junit.experimental.theories.Theory; import org.junit.runner.RunWith; -import org.springframework.credhub.support.CertificateWriteRequest; +import org.springframework.credhub.support.CertificateCredentialRequest; import org.springframework.credhub.support.CredentialDetails; import org.springframework.credhub.support.CredentialDetailsData; import org.springframework.credhub.support.CertificateCredential; import org.springframework.credhub.support.ValueType; -import org.springframework.credhub.support.WriteRequest; +import org.springframework.credhub.support.CredentialRequest; import org.springframework.http.ResponseEntity; @RunWith(Theories.class) @@ -49,8 +49,8 @@ public class CredHubTemplateDetailCertificateUnitTests } @Override - public WriteRequest getRequest() { - return CertificateWriteRequest.builder() + public CredentialRequest getRequest() { + return CertificateCredentialRequest.builder() .name(NAME) .value(CREDENTIAL) .build(); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailJsonUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailJsonUnitTests.java index 89d2c3b..7934757 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailJsonUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailJsonUnitTests.java @@ -25,9 +25,9 @@ import org.junit.runner.RunWith; import org.springframework.credhub.support.CredentialDetails; import org.springframework.credhub.support.CredentialDetailsData; import org.springframework.credhub.support.JsonCredential; -import org.springframework.credhub.support.JsonWriteRequest; +import org.springframework.credhub.support.JsonCredentialRequest; import org.springframework.credhub.support.ValueType; -import org.springframework.credhub.support.WriteRequest; +import org.springframework.credhub.support.CredentialRequest; import org.springframework.http.ResponseEntity; import java.util.List; @@ -53,8 +53,8 @@ public class CredHubTemplateDetailJsonUnitTests } @Override - public WriteRequest getRequest() { - return JsonWriteRequest.builder() + public CredentialRequest getRequest() { + return JsonCredentialRequest.builder() .name(NAME) .value(CREDENTIAL) .build(); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailPasswordUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailPasswordUnitTests.java index 3cedf2f..95d0aa1 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailPasswordUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailPasswordUnitTests.java @@ -25,9 +25,9 @@ import org.junit.runner.RunWith; import org.springframework.credhub.support.CredentialDetails; import org.springframework.credhub.support.CredentialDetailsData; import org.springframework.credhub.support.PasswordCredential; -import org.springframework.credhub.support.PasswordWriteRequest; +import org.springframework.credhub.support.PasswordCredentialRequest; import org.springframework.credhub.support.ValueType; -import org.springframework.credhub.support.WriteRequest; +import org.springframework.credhub.support.CredentialRequest; import org.springframework.http.ResponseEntity; import java.util.List; @@ -48,8 +48,8 @@ public class CredHubTemplateDetailPasswordUnitTests } @Override - public WriteRequest getRequest() { - return PasswordWriteRequest.builder() + public CredentialRequest getRequest() { + return PasswordCredentialRequest.builder() .name(NAME) .value(CREDENTIAL) .build(); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailRsaUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailRsaUnitTests.java index deaa1b0..c16e421 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailRsaUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailRsaUnitTests.java @@ -27,9 +27,9 @@ import org.junit.runner.RunWith; import org.springframework.credhub.support.CredentialDetails; import org.springframework.credhub.support.CredentialDetailsData; import org.springframework.credhub.support.RsaCredential; -import org.springframework.credhub.support.RsaWriteRequest; +import org.springframework.credhub.support.RsaCredentialRequest; import org.springframework.credhub.support.ValueType; -import org.springframework.credhub.support.WriteRequest; +import org.springframework.credhub.support.CredentialRequest; import org.springframework.http.ResponseEntity; @RunWith(Theories.class) @@ -48,8 +48,8 @@ public class CredHubTemplateDetailRsaUnitTests } @Override - public WriteRequest getRequest() { - return RsaWriteRequest.builder() + public CredentialRequest getRequest() { + return RsaCredentialRequest.builder() .name(NAME) .value(CREDENTIAL) .build(); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailSshUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailSshUnitTests.java index 2ed92ea..316269a 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailSshUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailSshUnitTests.java @@ -27,9 +27,9 @@ import org.junit.runner.RunWith; import org.springframework.credhub.support.CredentialDetails; import org.springframework.credhub.support.CredentialDetailsData; import org.springframework.credhub.support.SshCredential; -import org.springframework.credhub.support.SshWriteRequest; +import org.springframework.credhub.support.SshCredentialRequest; import org.springframework.credhub.support.ValueType; -import org.springframework.credhub.support.WriteRequest; +import org.springframework.credhub.support.CredentialRequest; import org.springframework.http.ResponseEntity; @RunWith(Theories.class) @@ -48,8 +48,8 @@ public class CredHubTemplateDetailSshUnitTests } @Override - public WriteRequest getRequest() { - return SshWriteRequest.builder() + public CredentialRequest getRequest() { + return SshCredentialRequest.builder() .name(NAME) .value(CREDENTIAL) .build(); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailUnitTestsBase.java b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailUnitTestsBase.java index 8e260f1..7510781 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailUnitTestsBase.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailUnitTestsBase.java @@ -23,7 +23,7 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.credhub.support.CredentialDetails; import org.springframework.credhub.support.CredentialDetailsData; import org.springframework.credhub.support.ValueType; -import org.springframework.credhub.support.WriteRequest; +import org.springframework.credhub.support.CredentialRequest; import org.springframework.http.HttpEntity; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -46,7 +46,7 @@ import static org.springframework.http.HttpStatus.UNAUTHORIZED; public abstract class CredHubTemplateDetailUnitTestsBase extends CredHubTemplateUnitTestsBase { private static final String CREDENTIAL_ID = "1111-1111-1111-1111"; - public abstract WriteRequest getRequest(); + public abstract CredentialRequest getRequest(); public abstract Class getType(); static List>> buildDetailResponses(ValueType type, T credential) { @@ -71,13 +71,13 @@ public abstract class CredHubTemplateDetailUnitTestsBase extends CredHubTempl } void verifyWrite(ResponseEntity> expectedResponse) { - WriteRequest request = getRequest(); + CredentialRequest request = getRequest(); final ParameterizedTypeReference> ref = getDetailsReference(getType()); when(restTemplate.exchange(BASE_URL_PATH, PUT, - new HttpEntity>(request), ref)) + new HttpEntity>(request), ref)) .thenReturn(expectedResponse); if (!expectedResponse.getStatusCode().equals(HttpStatus.OK)) { diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailUserUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailUserUnitTests.java index f639105..b00842a 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailUserUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailUserUnitTests.java @@ -27,9 +27,9 @@ import org.junit.runner.RunWith; import org.springframework.credhub.support.CredentialDetails; import org.springframework.credhub.support.CredentialDetailsData; import org.springframework.credhub.support.UserCredential; -import org.springframework.credhub.support.UserWriteRequest; +import org.springframework.credhub.support.UserCredentialRequest; import org.springframework.credhub.support.ValueType; -import org.springframework.credhub.support.WriteRequest; +import org.springframework.credhub.support.CredentialRequest; import org.springframework.http.ResponseEntity; @RunWith(Theories.class) @@ -48,8 +48,8 @@ public class CredHubTemplateDetailUserUnitTests } @Override - public WriteRequest getRequest() { - return UserWriteRequest.builder() + public CredentialRequest getRequest() { + return UserCredentialRequest.builder() .name(NAME) .value(CREDENTIAL) .build(); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailValueUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailValueUnitTests.java index 84d1f7a..6745bd7 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailValueUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubTemplateDetailValueUnitTests.java @@ -26,8 +26,8 @@ import org.springframework.credhub.support.CredentialDetails; import org.springframework.credhub.support.CredentialDetailsData; import org.springframework.credhub.support.ValueCredential; import org.springframework.credhub.support.ValueType; -import org.springframework.credhub.support.ValueWriteRequest; -import org.springframework.credhub.support.WriteRequest; +import org.springframework.credhub.support.ValueCredentialRequest; +import org.springframework.credhub.support.CredentialRequest; import org.springframework.http.ResponseEntity; import java.util.List; @@ -49,8 +49,8 @@ public class CredHubTemplateDetailValueUnitTests } @Override - public WriteRequest getRequest() { - return ValueWriteRequest.builder() + public CredentialRequest getRequest() { + return ValueCredentialRequest.builder() .name(NAME) .value(CREDENTIAL) .build(); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/CertificateWriteRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/CertificateCredentialRequestUnitTests.java similarity index 95% rename from spring-credhub-core/src/test/java/org/springframework/credhub/support/CertificateWriteRequestUnitTests.java rename to spring-credhub-core/src/test/java/org/springframework/credhub/support/CertificateCredentialRequestUnitTests.java index 001f139..eebaccf 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/CertificateWriteRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/CertificateCredentialRequestUnitTests.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertThat; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasNoJsonPath; -public class CertificateWriteRequestUnitTests extends WriteRequestUnitTestsBase { +public class CertificateCredentialRequestUnitTests extends CredentialRequestUnitTestsBase { @Before public void setUp() { buildRequest(new CertificateCredential("cert", "ca", "private-key")); @@ -88,7 +88,7 @@ public class CertificateWriteRequestUnitTests extends WriteRequestUnitTestsBase } private void buildRequest(CertificateCredential value) { - requestBuilder = CertificateWriteRequest.builder() + requestBuilder = CertificateCredentialRequest.builder() .name(new SimpleCredentialName("example", "credential")) .overwrite(true) .value(value); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/WriteRequestUnitTestsBase.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialRequestUnitTestsBase.java similarity index 89% rename from spring-credhub-core/src/test/java/org/springframework/credhub/support/WriteRequestUnitTestsBase.java rename to spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialRequestUnitTestsBase.java index 578d52f..cb4ec50 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/WriteRequestUnitTestsBase.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialRequestUnitTestsBase.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.springframework.credhub.core.JsonUtils; -import org.springframework.credhub.support.WriteRequest.WriteRequestBuilder; +import org.springframework.credhub.support.CredentialRequest.CredentialRequestBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; @@ -32,18 +32,18 @@ import static org.springframework.credhub.support.AdditionalPermission.Operation import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.isJson; -public abstract class WriteRequestUnitTestsBase { +public abstract class CredentialRequestUnitTestsBase { private ObjectMapper mapper; - protected WriteRequestBuilder requestBuilder; + protected CredentialRequestBuilder requestBuilder; @Before - public void setUpWriteRequestUnitTestsBase() { + public void setUpCredentialRequestUnitTests() { mapper = JsonUtils.buildObjectMapper(); } @Test public void typeIsSerializable() { - assertTrue(mapper.canSerialize(WriteRequest.class)); + assertTrue(mapper.canSerialize(CredentialRequest.class)); } @Test @@ -91,7 +91,7 @@ public abstract class WriteRequestUnitTestsBase { equalTo("read")))); } - String serializeToJson(T requestBuilder) + String serializeToJson(T requestBuilder) throws JsonProcessingException { String jsonValue = mapper.writeValueAsString(requestBuilder.build()); assertThat(jsonValue, isJson()); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/JsonWriteRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/JsonCredentialRequestUnitTests.java similarity index 92% rename from spring-credhub-core/src/test/java/org/springframework/credhub/support/JsonWriteRequestUnitTests.java rename to spring-credhub-core/src/test/java/org/springframework/credhub/support/JsonCredentialRequestUnitTests.java index 3463eeb..b692c26 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/JsonWriteRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/JsonCredentialRequestUnitTests.java @@ -25,11 +25,11 @@ import static org.junit.Assert.assertThat; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasNoJsonPath; -public class JsonWriteRequestUnitTests extends WriteRequestUnitTestsBase { +public class JsonCredentialRequestUnitTests extends CredentialRequestUnitTestsBase { @Before public void setUp() { - requestBuilder = JsonWriteRequest.builder() + requestBuilder = JsonCredentialRequest.builder() .name(new SimpleCredentialName("example", "credential")) .value(new JsonCredential() { { diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/PasswordWriteRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/PasswordCredentialRequestUnitTests.java similarity index 91% rename from spring-credhub-core/src/test/java/org/springframework/credhub/support/PasswordWriteRequestUnitTests.java rename to spring-credhub-core/src/test/java/org/springframework/credhub/support/PasswordCredentialRequestUnitTests.java index 493f1a4..22cd357 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/PasswordWriteRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/PasswordCredentialRequestUnitTests.java @@ -27,11 +27,11 @@ import static org.junit.Assert.assertThat; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasNoJsonPath; -public class PasswordWriteRequestUnitTests extends WriteRequestUnitTestsBase { +public class PasswordCredentialRequestUnitTests extends CredentialRequestUnitTestsBase { @Before public void setUp() { - requestBuilder = PasswordWriteRequest.builder() + requestBuilder = PasswordCredentialRequest.builder() .name(new SimpleCredentialName("example", "credential")) .overwrite(true) .value(new PasswordCredential("secret")); @@ -52,7 +52,7 @@ public class PasswordWriteRequestUnitTests extends WriteRequestUnitTestsBase { @Test public void serializeWithStringValue() throws Exception { - requestBuilder = PasswordWriteRequest.builder() + requestBuilder = PasswordCredentialRequest.builder() .name(new SimpleCredentialName("example", "credential")) .overwrite(true) .value("secret"); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/RsaWriteRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/RsaCredentialRequestUnitTests.java similarity index 95% rename from spring-credhub-core/src/test/java/org/springframework/credhub/support/RsaWriteRequestUnitTests.java rename to spring-credhub-core/src/test/java/org/springframework/credhub/support/RsaCredentialRequestUnitTests.java index a48c1a8..e3bef9b 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/RsaWriteRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/RsaCredentialRequestUnitTests.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertThat; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasNoJsonPath; -public class RsaWriteRequestUnitTests extends WriteRequestUnitTestsBase { +public class RsaCredentialRequestUnitTests extends CredentialRequestUnitTestsBase { @Before public void setUp() { buildRequest(new RsaCredential("public-key", "private-key")); @@ -85,7 +85,7 @@ public class RsaWriteRequestUnitTests extends WriteRequestUnitTestsBase { } private void buildRequest(RsaCredential value) { - requestBuilder = RsaWriteRequest.builder() + requestBuilder = RsaCredentialRequest.builder() .name(new SimpleCredentialName("example", "credential")) .overwrite(true) .value(value); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/SshWriteRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/SshCredentialRequestUnitTests.java similarity index 95% rename from spring-credhub-core/src/test/java/org/springframework/credhub/support/SshWriteRequestUnitTests.java rename to spring-credhub-core/src/test/java/org/springframework/credhub/support/SshCredentialRequestUnitTests.java index 8d08d92..76a6693 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/SshWriteRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/SshCredentialRequestUnitTests.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertThat; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasNoJsonPath; -public class SshWriteRequestUnitTests extends WriteRequestUnitTestsBase { +public class SshCredentialRequestUnitTests extends CredentialRequestUnitTestsBase { @Before public void setUp() { buildRequest(new SshCredential("public-key", "private-key")); @@ -85,7 +85,7 @@ public class SshWriteRequestUnitTests extends WriteRequestUnitTestsBase { } private void buildRequest(SshCredential value) { - requestBuilder = SshWriteRequest.builder() + requestBuilder = SshCredentialRequest.builder() .name(new SimpleCredentialName("example", "credential")) .overwrite(true) .value(value); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/UserWriteRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/UserCredentialRequestUnitTests.java similarity index 88% rename from spring-credhub-core/src/test/java/org/springframework/credhub/support/UserWriteRequestUnitTests.java rename to spring-credhub-core/src/test/java/org/springframework/credhub/support/UserCredentialRequestUnitTests.java index e6dea91..98a8dae 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/UserWriteRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/UserCredentialRequestUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.credhub.support; import org.junit.Before; import org.junit.Test; -import org.springframework.credhub.support.UserWriteRequest.UserWriteRequestBuilder; +import org.springframework.credhub.support.UserCredentialRequest.UserCredentialRequestBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; @@ -26,10 +26,10 @@ import static org.junit.Assert.assertThat; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasNoJsonPath; -public class UserWriteRequestUnitTests extends WriteRequestUnitTestsBase { +public class UserCredentialRequestUnitTests extends CredentialRequestUnitTestsBase { @Before public void setUp() { - requestBuilder = UserWriteRequest.builder() + requestBuilder = UserCredentialRequest.builder() .name(new SimpleCredentialName("example", "credential")) .overwrite(true) .value(new UserCredential("myname", "secret")); @@ -51,7 +51,7 @@ public class UserWriteRequestUnitTests extends WriteRequestUnitTestsBase { @Test public void serializeWithPassword() throws Exception { - UserWriteRequestBuilder builder = UserWriteRequest.builder() + UserCredentialRequestBuilder builder = UserCredentialRequest.builder() .name(new SimpleCredentialName("example", "credential")) .overwrite(true) .value(new UserCredential("secret")); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/ValueWriteRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/ValueCredentialRequestUnitTests.java similarity index 91% rename from spring-credhub-core/src/test/java/org/springframework/credhub/support/ValueWriteRequestUnitTests.java rename to spring-credhub-core/src/test/java/org/springframework/credhub/support/ValueCredentialRequestUnitTests.java index 9590647..c88edcd 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/ValueWriteRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/ValueCredentialRequestUnitTests.java @@ -25,11 +25,11 @@ import static org.junit.Assert.assertThat; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasNoJsonPath; -public class ValueWriteRequestUnitTests extends WriteRequestUnitTestsBase { +public class ValueCredentialRequestUnitTests extends CredentialRequestUnitTestsBase { @Before public void setUp() { - requestBuilder = ValueWriteRequest.builder() + requestBuilder = ValueCredentialRequest.builder() .name(new SimpleCredentialName("example", "credential")) .overwrite(true) .value(new ValueCredential("somevalue")); @@ -50,7 +50,7 @@ public class ValueWriteRequestUnitTests extends WriteRequestUnitTestsBase { @Test public void serializeWithStringValue() throws Exception { - requestBuilder = ValueWriteRequest.builder() + requestBuilder = ValueCredentialRequest.builder() .name(new SimpleCredentialName("example", "credential")) .overwrite(true) .value("somevalue"); diff --git a/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java b/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java index 0824c11..358346d 100644 --- a/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java +++ b/spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java @@ -30,8 +30,8 @@ import org.springframework.credhub.support.CredentialDetails; import org.springframework.credhub.support.CredentialName; import org.springframework.credhub.support.CredentialSummary; import org.springframework.credhub.support.JsonCredential; -import org.springframework.credhub.support.JsonWriteRequest; -import org.springframework.credhub.support.JsonWriteRequest.JsonWriteRequestBuilder; +import org.springframework.credhub.support.JsonCredentialRequest; +import org.springframework.credhub.support.JsonCredentialRequest.JsonCredentialRequestBuilder; import org.springframework.credhub.support.SimpleCredentialName; import org.springframework.credhub.support.VcapServicesData; import org.springframework.util.StringUtils; @@ -76,7 +76,7 @@ public class CredHubDemoController { private CredentialDetails writeCredentials(Map value, Results results) { try { - JsonWriteRequestBuilder requestBuilder = JsonWriteRequest.builder() + JsonCredentialRequestBuilder requestBuilder = JsonCredentialRequest.builder() .overwrite(true) .name(new SimpleCredentialName("spring-credhub", "demo", "credentials_json")) .value(value); @@ -86,7 +86,7 @@ public class CredHubDemoController { AdditionalPermission.builder().app(appId).operation(READ).build()); } - JsonWriteRequest request = requestBuilder.build(); + JsonCredentialRequest request = requestBuilder.build(); CredentialDetails credentialDetails = credHubTemplate.write(request); saveResults(results, "Successfully wrote credentials: ", credentialDetails);