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

Merge branch '2.1.x' into 2.2.x

Browse Source
This commit is contained in:
Spencer Gibb
2020-01-27 12:41:28 -05:00
parent 748d2a5891 44c4b0e401
commit feb75d442d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/BasePropertyPathNotificationExtractor.java
View File

@@ -17,7 +17,7 @@
package org.springframework.cloud.config.monitor;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
@@ -35,7 +35,7 @@ public abstract class BasePropertyPathNotificationExtractor
Map<String, Object> request) {
if (requestBelongsToGitRepoManager(headers)) {
if (request.get("commits") instanceof Collection) {
Set<String> paths = new HashSet<>();
Set<String> paths = new LinkedHashSet<>();
@SuppressWarnings("unchecked")
Collection<Map<String, Object>> commits = (Collection<Map<String, Object>>) request
.get("commits");

2
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
View File

@@ -152,7 +152,7 @@ public class EnvironmentRepositoryConfiguration {
protected static class DefaultConfigTokenProvider {
@Bean
public ConfigTokenProvider configTokenProvider(
public ConfigTokenProvider defaultConfigTokenProvider(
ObjectProvider<HttpServletRequest> httpRequest) {
return new HttpRequestConfigTokenProvider(httpRequest);
}

2
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/VaultConfiguration.java
View File

@@ -46,7 +46,7 @@ public class VaultConfiguration {
@Bean
@ConditionalOnProperty(VAULT_TOKEN_PROPERTY_NAME)
public ConfigTokenProvider configTokenProvider(Environment environment) {
public ConfigTokenProvider vaultConfigTokenProvider(Environment environment) {
return new EnvironmentConfigTokenProvider(environment, VAULT_TOKEN_PROPERTY_NAME);
}