From 2d302b88b3d30f7ee8f9cc64f1a77a8c05f61e93 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Wed, 24 Oct 2018 14:36:05 -0500 Subject: [PATCH] Move credential-specific classes to the appropriate package. --- .../core/certificate/CredHubCertificateOperations.java | 2 +- .../credhub/core/certificate/CredHubCertificateTemplate.java | 4 ++-- .../credhub/support/{ => certificate}/CertificateSummary.java | 2 +- .../support/{ => certificate}/CertificateSummaryData.java | 2 +- .../core/certificate/CredHubCertificateTemplateUnitTests.java | 4 ++-- .../credhub/support/CertificateSummaryDataTests.java | 1 + .../credhub/integration/CertificateIntegrationTests.java | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) rename spring-credhub-core/src/main/java/org/springframework/credhub/support/{ => certificate}/CertificateSummary.java (97%) rename spring-credhub-core/src/main/java/org/springframework/credhub/support/{ => certificate}/CertificateSummaryData.java (97%) diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/core/certificate/CredHubCertificateOperations.java b/spring-credhub-core/src/main/java/org/springframework/credhub/core/certificate/CredHubCertificateOperations.java index 5b0ae57..e37e8e2 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/core/certificate/CredHubCertificateOperations.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/core/certificate/CredHubCertificateOperations.java @@ -16,7 +16,7 @@ package org.springframework.credhub.core.certificate; -import org.springframework.credhub.support.CertificateSummary; +import org.springframework.credhub.support.certificate.CertificateSummary; import org.springframework.credhub.support.CredentialName; import org.springframework.credhub.support.certificate.CertificateCredentialDetails; diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/core/certificate/CredHubCertificateTemplate.java b/spring-credhub-core/src/main/java/org/springframework/credhub/core/certificate/CredHubCertificateTemplate.java index 65c10aa..aca4053 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/core/certificate/CredHubCertificateTemplate.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/core/certificate/CredHubCertificateTemplate.java @@ -20,8 +20,8 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.credhub.core.CredHubOperations; import org.springframework.credhub.core.ExceptionUtils; import org.springframework.credhub.core.RestOperationsCallback; -import org.springframework.credhub.support.CertificateSummary; -import org.springframework.credhub.support.CertificateSummaryData; +import org.springframework.credhub.support.certificate.CertificateSummary; +import org.springframework.credhub.support.certificate.CertificateSummaryData; import org.springframework.credhub.support.CredentialName; import org.springframework.credhub.support.certificate.CertificateCredentialDetails; import org.springframework.http.HttpEntity; diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateSummary.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/certificate/CertificateSummary.java similarity index 97% rename from spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateSummary.java rename to spring-credhub-core/src/main/java/org/springframework/credhub/support/certificate/CertificateSummary.java index c9ab1fd..2d16107 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateSummary.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/certificate/CertificateSummary.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.credhub.support; +package org.springframework.credhub.support.certificate; import java.util.Objects; diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateSummaryData.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/certificate/CertificateSummaryData.java similarity index 97% rename from spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateSummaryData.java rename to spring-credhub-core/src/main/java/org/springframework/credhub/support/certificate/CertificateSummaryData.java index d6eb346..85c884e 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CertificateSummaryData.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/certificate/CertificateSummaryData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.credhub.support; +package org.springframework.credhub.support.certificate; import java.util.Arrays; import java.util.List; diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/core/certificate/CredHubCertificateTemplateUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/core/certificate/CredHubCertificateTemplateUnitTests.java index 67577f6..cdce257 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/core/certificate/CredHubCertificateTemplateUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/core/certificate/CredHubCertificateTemplateUnitTests.java @@ -23,8 +23,8 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.core.ParameterizedTypeReference; import org.springframework.credhub.core.CredHubTemplate; -import org.springframework.credhub.support.CertificateSummary; -import org.springframework.credhub.support.CertificateSummaryData; +import org.springframework.credhub.support.certificate.CertificateSummary; +import org.springframework.credhub.support.certificate.CertificateSummaryData; import org.springframework.credhub.support.CredentialType; import org.springframework.credhub.support.SimpleCredentialName; import org.springframework.credhub.support.certificate.CertificateCredential; diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/CertificateSummaryDataTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/CertificateSummaryDataTests.java index 21ee3dd..c6e37b2 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/CertificateSummaryDataTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/CertificateSummaryDataTests.java @@ -17,6 +17,7 @@ package org.springframework.credhub.support; import org.junit.Test; +import org.springframework.credhub.support.certificate.CertificateSummaryData; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CertificateIntegrationTests.java b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CertificateIntegrationTests.java index 26e686f..98d5f46 100644 --- a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CertificateIntegrationTests.java +++ b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CertificateIntegrationTests.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.springframework.credhub.core.CredHubException; import org.springframework.credhub.core.certificate.CredHubCertificateOperations; import org.springframework.credhub.core.credential.CredHubCredentialOperations; -import org.springframework.credhub.support.CertificateSummary; +import org.springframework.credhub.support.certificate.CertificateSummary; import org.springframework.credhub.support.CredentialDetails; import org.springframework.credhub.support.CredentialSummary; import org.springframework.credhub.support.CredentialType;