SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #783 from izeye/patch-1

Browse Source 
Fix error messages
This commit is contained in:
Ryan Baxter
2017-08-31 17:04:58 -04:00
committed by GitHub
parent 921a4bcd17 5381497bdb
commit c97206e55c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ssh/PrivateKeyValidator.java
View File

@@ -32,7 +32,7 @@ import static org.springframework.cloud.config.server.ssh.SshPropertyValidator.i
import static org.springframework.util.StringUtils.hasText; import static org.springframework.util.StringUtils.hasText;
/** /**
* JSR-303 Cross Field validator that ensures that a {@link SshUriProperties} bean for the constraints: * JSR-303 Cross Field validator that ensures that an {@link SshUriProperties} bean for the constraints:
* - Private key is present and can be correctly parsed using {@link com.jcraft.jsch.KeyPair} * - Private key is present and can be correctly parsed using {@link com.jcraft.jsch.KeyPair}
* *
* Beans annotated with {@link PrivateKeyValidator} and {@link Validated} will have the constraints applied. * Beans annotated with {@link PrivateKeyValidator} and {@link Validated} will have the constraints applied.
@@ -67,9 +67,9 @@ public class PrivateKeyValidator implements ConstraintValidator<PrivateKeyIsVali
private boolean isPrivateKeyPresent(SshUri sshUriProperties, ConstraintValidatorContext context) { private boolean isPrivateKeyPresent(SshUri sshUriProperties, ConstraintValidatorContext context) {
if (!hasText(sshUriProperties.getPrivateKey())) { if (!hasText(sshUriProperties.getPrivateKey())) {
context.buildConstraintViolationWithTemplate( context.buildConstraintViolationWithTemplate(
format("Property '%sprivateKey' must be set when '%signoreLocalSettings' is specified", GIT_PROPERTY_PREFIX, GIT_PROPERTY_PREFIX)) format("Property '%sprivateKey' must be set when '%signoreLocalSshSettings' is specified", GIT_PROPERTY_PREFIX, GIT_PROPERTY_PREFIX))
.addConstraintViolation(); .addConstraintViolation();
return false; return false;
} }
return true; return true;
@@ -81,7 +81,7 @@ public class PrivateKeyValidator implements ConstraintValidator<PrivateKeyIsVali
return true; return true;
} catch (JSchException e) { } catch (JSchException e) {
context.buildConstraintViolationWithTemplate( context.buildConstraintViolationWithTemplate(
format("Property '%sprivateKey' contains is not a valid private key", GIT_PROPERTY_PREFIX)) format("Property '%sprivateKey' is not a valid private key", GIT_PROPERTY_PREFIX))
.addConstraintViolation(); .addConstraintViolation();
return false; return false;
} }