Spring/spring-credhub
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some linting errors

Browse Source
This commit is contained in:
Gareth Clay
2022-11-28 15:42:16 +00:00
parent 83e0b21058
commit 06616b0ec8
6 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.editorconfig Normal file
View File

@@ -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

2
.springjavaformatconfig
View File

@@ -1 +1 @@
java-baseline=8
java-baseline=11

1
spring-credhub-core/src/main/java/org/springframework/credhub/core/credential/CredHubCredentialOperations.java
View File

@@ -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<CredentialPath> getAllPaths();
/**

13
spring-credhub-core/src/main/java/org/springframework/credhub/support/CredHubRequest.java
View File

@@ -59,6 +59,7 @@ public class CredHubRequest<T> {
* @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<T> {
* @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<T> {
/**
* 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<T> {
* @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<T> {
* @deprecated as of CredHub 2.0, use {@link CredHubPermissionOperations} to
* assign permissions to a credential after it is created
*/
@Deprecated
public B permissions(Collection<? extends Permission> permissions) {
this.targetObj.getAdditionalPermissions().addAll(permissions);
return this.thisObj;
@@ -271,6 +273,7 @@ public class CredHubRequest<T> {
* @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;

4
spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java
View File

@@ -41,6 +41,10 @@ public class CredentialRequest<T> extends CredHubRequest<T> {
return this.details;
}
/**
* Set the value of the credential.
* @param value the value of the credential
*/
protected void setValue(T value) {
this.details = value;
}

21
spring-credhub-core/src/test/java/org/springframework/credhub/core/credential/CredHubTemplateDetailUnitTestsBase.java
View File

@@ -126,7 +126,7 @@ public abstract class CredHubTemplateDetailUnitTestsBase<T, P> extends CredHubCr
}
void verifyRegenerate(ResponseEntity<CredentialDetails<T>> expectedResponse) {
Map<String, Object> request = new HashMap<String, Object>() {
Map<String, Object> request = new HashMap<>() {
{
put(CredHubCredentialTemplate.NAME_REQUEST_FIELD, NAME.getName());
}
@@ -151,11 +151,9 @@ public abstract class CredHubTemplateDetailUnitTestsBase<T, P> extends CredHubCr
}
}
@SuppressWarnings("deprecation")
void verifyGetById(ResponseEntity<CredentialDetails<T>> 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<T, P> extends CredHubCr
}
}
@SuppressWarnings("deprecation")
void verifyGetByName(ResponseEntity<CredentialDetailsData<T>> 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<T, P> extends CredHubCr
}
}
@SuppressWarnings("deprecation")
void verifyGetByNameWithHistory(ResponseEntity<CredentialDetailsData<T>> 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<T, P> extends CredHubCr
}
}
@SuppressWarnings("deprecation")
void verifyGetByNameWithVersions(ResponseEntity<CredentialDetailsData<T>> 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)) {