From 882d6a5aef72dfe04aa0080698cbf5f6602e36b3 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 20 Mar 2018 22:40:19 -0400 Subject: [PATCH] Moves boolean properties to is* rather than get* to follow java bean properties. --- .../config/server/environment/JGitEnvironmentProperties.java | 4 ++-- .../config/server/environment/JGitEnvironmentRepository.java | 4 ++-- .../cloud/config/server/support/AbstractScmAccessor.java | 2 +- .../config/server/support/AbstractScmAccessorProperties.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentProperties.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentProperties.java index b5ca9fae..07411da4 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentProperties.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentProperties.java @@ -33,7 +33,7 @@ public class JGitEnvironmentProperties extends AbstractScmAccessorProperties { setDefaultLabel(DEFAULT_LABEL); } - public boolean getCloneOnStart() { + public boolean isCloneOnStart() { return cloneOnStart; } @@ -41,7 +41,7 @@ public class JGitEnvironmentProperties extends AbstractScmAccessorProperties { this.cloneOnStart = cloneOnStart; } - public boolean getForcePull() { + public boolean isForcePull() { return forcePull; } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java index 45823f5f..a33f6a66 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java @@ -124,9 +124,9 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository public JGitEnvironmentRepository(ConfigurableEnvironment environment, JGitEnvironmentProperties properties) { super(environment, properties); - this.cloneOnStart = properties.getCloneOnStart(); + this.cloneOnStart = properties.isCloneOnStart(); this.defaultLabel = properties.getDefaultLabel(); - this.forcePull = properties.getForcePull(); + this.forcePull = properties.isForcePull(); this.timeout = properties.getTimeout(); this.deleteUntrackedBranches = properties.isDeleteUntrackedBranches(); } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AbstractScmAccessor.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AbstractScmAccessor.java index 871bb6b3..018500ff 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AbstractScmAccessor.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AbstractScmAccessor.java @@ -92,7 +92,7 @@ public abstract class AbstractScmAccessor implements ResourceLoaderAware { this.passphrase = properties.getPassphrase(); this.password = properties.getPassword(); this.searchPaths = properties.getSearchPaths(); - this.strictHostKeyChecking = properties.getStrictHostKeyChecking(); + this.strictHostKeyChecking = properties.isStrictHostKeyChecking(); this.uri = properties.getUri(); this.username = properties.getUsername(); } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AbstractScmAccessorProperties.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AbstractScmAccessorProperties.java index 582aac91..0e050ed8 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AbstractScmAccessorProperties.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AbstractScmAccessorProperties.java @@ -83,7 +83,7 @@ public class AbstractScmAccessorProperties implements EnvironmentRepositoryPrope this.passphrase = passphrase; } - public boolean getStrictHostKeyChecking() { + public boolean isStrictHostKeyChecking() { return strictHostKeyChecking; }