diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..8a4461c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,5 @@ +[*.java] +ij_java_class_count_to_use_import_on_demand = 100 +ij_java_imports_layout = javax.**,|,java.**,|,*,|,org.springframework.**,|,$* +ij_java_layout_static_imports_separately = true +ij_java_names_count_to_use_import_on_demand = 100 diff --git a/.springjavaformatconfig b/.springjavaformatconfig index 1264378..0c304f5 100644 --- a/.springjavaformatconfig +++ b/.springjavaformatconfig @@ -1 +1 @@ -java-baseline=8 \ No newline at end of file +java-baseline=11 diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/core/credential/CredHubCredentialOperations.java b/spring-credhub-core/src/main/java/org/springframework/credhub/core/credential/CredHubCredentialOperations.java index 8a5eccf..ca30f6f 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/core/credential/CredHubCredentialOperations.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/core/credential/CredHubCredentialOperations.java @@ -127,6 +127,7 @@ public interface CredHubCredentialOperations { * @return a collection of paths * @deprecated as of CredHub 2.0 this operation is not supported */ + @Deprecated List getAllPaths(); /** diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredHubRequest.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredHubRequest.java index aa26c1d..f26f4c6 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredHubRequest.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredHubRequest.java @@ -59,6 +59,7 @@ public class CredHubRequest { * @return the {@literal boolean} overwrite value * @deprecated as of CredHub 1.6, use {@link #mode} */ + @Deprecated public Boolean isOverwrite() { return this.overwrite; } @@ -215,6 +216,7 @@ public class CredHubRequest { * @return the builder * @deprecated as of CredHub 1.6, use {@link #mode(WriteMode)} */ + @Deprecated public B overwrite(boolean overwrite) { this.targetObj.setOverwrite(overwrite); return this.thisObj; @@ -222,11 +224,9 @@ public class CredHubRequest { /** * Sets a value indicating the action CredHub should take when a credential being - * written or generated already exists. - * - * As of CredHub 2.0, this value must not be set on write requests (write requests - * always overwrite the credential that already exists) but may be set on generate - * requests. + * written or generated already exists. As of CredHub 2.0, this value must not be + * set on write requests (write requests always overwrite the credential that + * already exists) but may be set on generate requests. * @param mode the {@link WriteMode} to use when a credential exists * @return the builder */ @@ -243,6 +243,7 @@ public class CredHubRequest { * @deprecated as of CredHub 2.0, use {@link CredHubPermissionOperations} to * assign permissions to a credential after it is created */ + @Deprecated public B permission(Permission permission) { this.targetObj.getAdditionalPermissions().add(permission); return this.thisObj; @@ -257,6 +258,7 @@ public class CredHubRequest { * @deprecated as of CredHub 2.0, use {@link CredHubPermissionOperations} to * assign permissions to a credential after it is created */ + @Deprecated public B permissions(Collection permissions) { this.targetObj.getAdditionalPermissions().addAll(permissions); return this.thisObj; @@ -271,6 +273,7 @@ public class CredHubRequest { * @deprecated as of CredHub 2.0, use {@link CredHubPermissionOperations} to * assign permissions to a credential after it is created */ + @Deprecated public B permissions(Permission... permissions) { this.targetObj.getAdditionalPermissions().addAll(Arrays.asList(permissions)); return this.thisObj; diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java index 56ebd1f..b6e00a1 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java @@ -41,6 +41,10 @@ public class CredentialRequest extends CredHubRequest { return this.details; } + /** + * Set the value of the credential. + * @param value the value of the credential + */ protected void setValue(T value) { this.details = value; } diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/core/credential/CredHubTemplateDetailUnitTestsBase.java b/spring-credhub-core/src/test/java/org/springframework/credhub/core/credential/CredHubTemplateDetailUnitTestsBase.java index c276eac..7b8ac04 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/core/credential/CredHubTemplateDetailUnitTestsBase.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/core/credential/CredHubTemplateDetailUnitTestsBase.java @@ -126,7 +126,7 @@ public abstract class CredHubTemplateDetailUnitTestsBase extends CredHubCr } void verifyRegenerate(ResponseEntity> expectedResponse) { - Map request = new HashMap() { + Map request = new HashMap<>() { { put(CredHubCredentialTemplate.NAME_REQUEST_FIELD, NAME.getName()); } @@ -151,11 +151,9 @@ public abstract class CredHubTemplateDetailUnitTestsBase extends CredHubCr } } - @SuppressWarnings("deprecation") void verifyGetById(ResponseEntity> expectedResponse) { - given(this.restTemplate.exchange(eq(CredHubCredentialTemplate.ID_URL_PATH), eq(HttpMethod.GET), - isNull(HttpEntity.class), isA(ParameterizedTypeReference.class), eq(CREDENTIAL_ID))) - .willReturn(expectedResponse); + given(this.restTemplate.exchange(eq(CredHubCredentialTemplate.ID_URL_PATH), eq(HttpMethod.GET), isNull(), + isA(ParameterizedTypeReference.class), eq(CREDENTIAL_ID))).willReturn(expectedResponse); if (!expectedResponse.getStatusCode().equals(HttpStatus.OK)) { try { @@ -173,11 +171,9 @@ public abstract class CredHubTemplateDetailUnitTestsBase extends CredHubCr } } - @SuppressWarnings("deprecation") void verifyGetByName(ResponseEntity> expectedResponse) { given(this.restTemplate.exchange(eq(CredHubCredentialTemplate.NAME_URL_QUERY_CURRENT), eq(HttpMethod.GET), - isNull(HttpEntity.class), isA(ParameterizedTypeReference.class), eq(NAME.getName()))) - .willReturn(expectedResponse); + isNull(), isA(ParameterizedTypeReference.class), eq(NAME.getName()))).willReturn(expectedResponse); if (!expectedResponse.getStatusCode().equals(HttpStatus.OK)) { try { @@ -195,11 +191,9 @@ public abstract class CredHubTemplateDetailUnitTestsBase extends CredHubCr } } - @SuppressWarnings("deprecation") void verifyGetByNameWithHistory(ResponseEntity> expectedResponse) { - given(this.restTemplate.exchange(eq(CredHubCredentialTemplate.NAME_URL_QUERY), eq(HttpMethod.GET), - isNull(HttpEntity.class), isA(ParameterizedTypeReference.class), eq(NAME.getName()))) - .willReturn(expectedResponse); + given(this.restTemplate.exchange(eq(CredHubCredentialTemplate.NAME_URL_QUERY), eq(HttpMethod.GET), isNull(), + isA(ParameterizedTypeReference.class), eq(NAME.getName()))).willReturn(expectedResponse); if (!expectedResponse.getStatusCode().equals(HttpStatus.OK)) { try { @@ -217,10 +211,9 @@ public abstract class CredHubTemplateDetailUnitTestsBase extends CredHubCr } } - @SuppressWarnings("deprecation") void verifyGetByNameWithVersions(ResponseEntity> expectedResponse) { given(this.restTemplate.exchange(eq(CredHubCredentialTemplate.NAME_URL_QUERY_VERSIONS), eq(HttpMethod.GET), - isNull(HttpEntity.class), isA(ParameterizedTypeReference.class), eq(NAME.getName()), eq(5))) + isNull(), isA(ParameterizedTypeReference.class), eq(NAME.getName()), eq(5))) .willReturn(expectedResponse); if (!expectedResponse.getStatusCode().equals(HttpStatus.OK)) {