propertiesClass, Environment environment) {
Binder binder = Binder.get(environment);
- String environmentConfigurationPropertyName = String.format("spring.cloud.config.server.composite[%d]", index);
- P properties = binder.bind(environmentConfigurationPropertyName, propertiesClass).orElseCreate(propertiesClass);
+ String environmentConfigurationPropertyName = String
+ .format("spring.cloud.config.server.composite[%d]", index);
+ P properties = binder.bind(environmentConfigurationPropertyName, propertiesClass)
+ .orElseCreate(propertiesClass);
properties.setOrder(index + 1);
return properties;
}
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/CompositeUtils.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/CompositeUtils.java
index 1f6879e4..00e23d8a 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/CompositeUtils.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/CompositeUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.composite;
import java.lang.reflect.AnnotatedType;
@@ -34,60 +35,81 @@ import org.springframework.core.type.MethodMetadata;
/**
* @author Dylan Roberts
*/
-public class CompositeUtils {
+public final class CompositeUtils {
- /**
- * Returns list of values of the `type` field from the `spring.cloud.config.server.composite` collection.
- */
- public static List getCompositeTypeList(Environment environment) {
- return Binder.get(environment)
- .bind("spring.cloud.config.server", CompositeConfig.class)
- .get().getComposite().stream()
- .map(map -> (String)map.get("type"))
- .collect(Collectors.toList());
- }
+ private CompositeUtils() {
+ throw new IllegalStateException("Can't instantiate a utility class");
+ }
- static class CompositeConfig {
- List> composite;
+ /**
+ * Returns list of values of the `type` field from the
+ * `spring.cloud.config.server.composite` collection.
+ * @param environment Spring Environment
+ * @return list of matching types
+ */
+ public static List getCompositeTypeList(Environment environment) {
+ return Binder.get(environment)
+ .bind("spring.cloud.config.server", CompositeConfig.class).get()
+ .getComposite().stream().map(map -> (String) map.get("type"))
+ .collect(Collectors.toList());
+ }
- public List> getComposite() {
- return composite;
- }
+ /**
+ * Given a type of EnvironmentRepository (git, svn, native, etc...) returns the name
+ * of the factory bean. See {@link #getCompositeTypeList(Environment)}
+ * @param type type of a repository
+ * @param beanFactory Spring Bean Factory
+ * @return name of the factory bean
+ */
+ public static String getFactoryName(String type,
+ ConfigurableListableBeanFactory beanFactory) {
+ String[] factoryNames = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
+ beanFactory, EnvironmentRepositoryFactory.class, true, false);
+ return Arrays.stream(factoryNames).filter(n -> n.startsWith(type)).findFirst()
+ .orElse(null);
+ }
- public void setComposite(List> composite) {
- this.composite = composite;
- }
- }
+ /**
+ * Given a Factory Name return the generic type parameters of the factory (The actual
+ * repository class, and its properties class).
+ * @param beanFactory Spring Bean Factory
+ * @param factoryName name of the factory
+ * @return generic type params of the factory
+ */
+ public static Type[] getEnvironmentRepositoryFactoryTypeParams(
+ ConfigurableListableBeanFactory beanFactory, String factoryName) {
+ MethodMetadata methodMetadata = (MethodMetadata) beanFactory
+ .getBeanDefinition(factoryName).getSource();
+ Class factoryClass = null;
+ try {
+ factoryClass = Class.forName(methodMetadata.getReturnTypeName());
+ }
+ catch (ClassNotFoundException e) {
+ throw new IllegalStateException(e);
+ }
+ Optional annotatedFactoryType = Arrays
+ .stream(factoryClass.getAnnotatedInterfaces()).filter(i -> {
+ ParameterizedType parameterizedType = (ParameterizedType) i.getType();
+ return parameterizedType.getRawType()
+ .equals(EnvironmentRepositoryFactory.class);
+ }).findFirst();
+ ParameterizedType factoryParameterizedType = (ParameterizedType) annotatedFactoryType
+ .orElse(factoryClass.getAnnotatedSuperclass()).getType();
+ return factoryParameterizedType.getActualTypeArguments();
+ }
- /**
- * Given a type of EnvironmentRepository (git, svn, native, etc...) returns the name of the factory bean.
- * See {@link #getCompositeTypeList(Environment)}
- */
- public static String getFactoryName(String type, ConfigurableListableBeanFactory beanFactory) {
- String[] factoryNames = BeanFactoryUtils
- .beanNamesForTypeIncludingAncestors(beanFactory, EnvironmentRepositoryFactory.class, true, false);
- return Arrays.stream(factoryNames).filter(n -> n.startsWith(type)).findFirst().orElse(null);
- }
+ static class CompositeConfig {
- /**
- * Given a Factory Name return the generic type parameters of the factory (The actual repository class, and its properties class)o
- */
- public static Type[] getEnvironmentRepositoryFactoryTypeParams(ConfigurableListableBeanFactory beanFactory, String factoryName) {
- MethodMetadata methodMetadata = (MethodMetadata) beanFactory.getBeanDefinition(factoryName).getSource();
- Class factoryClass = null;
- try {
- factoryClass = Class.forName(methodMetadata.getReturnTypeName());
- } catch (ClassNotFoundException e) {
- throw new IllegalStateException(e);
- }
- Optional annotatedFactoryType = Arrays.stream(factoryClass.getAnnotatedInterfaces())
- .filter(i -> {
- ParameterizedType parameterizedType = (ParameterizedType) i.getType();
- return parameterizedType.getRawType().equals(EnvironmentRepositoryFactory.class);
- }).findFirst();
- ParameterizedType factoryParameterizedType = (ParameterizedType) annotatedFactoryType
- .orElse(factoryClass.getAnnotatedSuperclass()).getType();
- return factoryParameterizedType.getActualTypeArguments();
- }
+ List> composite;
+
+ public List> getComposite() {
+ return this.composite;
+ }
+
+ public void setComposite(List> composite) {
+ this.composite = composite;
+ }
+
+ }
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/ConditionalOnMissingSearchPathLocator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/ConditionalOnMissingSearchPathLocator.java
index 897c2276..bf858118 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/ConditionalOnMissingSearchPathLocator.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/ConditionalOnMissingSearchPathLocator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.composite;
import java.lang.annotation.Documented;
@@ -31,4 +32,5 @@ import org.springframework.context.annotation.Conditional;
@Documented
@Conditional(OnSearchPathLocatorPresent.class)
public @interface ConditionalOnMissingSearchPathLocator {
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/ConditionalOnSearchPathLocator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/ConditionalOnSearchPathLocator.java
index 621f888c..c4091806 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/ConditionalOnSearchPathLocator.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/ConditionalOnSearchPathLocator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.composite;
import java.lang.annotation.Documented;
@@ -31,4 +32,5 @@ import org.springframework.context.annotation.Conditional;
@Documented
@Conditional(OnSearchPathLocatorPresent.class)
public @interface ConditionalOnSearchPathLocator {
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/OnSearchPathLocatorPresent.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/OnSearchPathLocatorPresent.java
index e1798578..b86a7139 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/OnSearchPathLocatorPresent.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/OnSearchPathLocatorPresent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.composite;
import java.lang.reflect.Type;
@@ -32,29 +33,40 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
* @author Dylan Roberts
*/
public class OnSearchPathLocatorPresent extends SpringBootCondition {
+
@Override
- public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
- ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
- List types = CompositeUtils.getCompositeTypeList(context.getEnvironment());
+ public ConditionOutcome getMatchOutcome(ConditionContext context,
+ AnnotatedTypeMetadata metadata) {
+ ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+ List types = CompositeUtils
+ .getCompositeTypeList(context.getEnvironment());
- // get EnvironmentRepository types from registered factories
- List> repositoryTypes = new ArrayList<>();
- for (String type : types) {
- String factoryName = CompositeUtils.getFactoryName(type, beanFactory);
- Type[] actualTypeArguments = CompositeUtils.getEnvironmentRepositoryFactoryTypeParams(beanFactory, factoryName);
- Class repositoryType =
- (Class) actualTypeArguments[0];
- repositoryTypes.add(repositoryType);
- }
+ // get EnvironmentRepository types from registered factories
+ List> repositoryTypes = new ArrayList<>();
+ for (String type : types) {
+ String factoryName = CompositeUtils.getFactoryName(type, beanFactory);
+ Type[] actualTypeArguments = CompositeUtils
+ .getEnvironmentRepositoryFactoryTypeParams(beanFactory, factoryName);
+ Class repositoryType;
+ repositoryType = (Class) actualTypeArguments[0];
+ repositoryTypes.add(repositoryType);
+ }
+
+ boolean required = metadata
+ .isAnnotated(ConditionalOnSearchPathLocator.class.getName());
+ boolean foundSearchPathLocator = repositoryTypes.stream()
+ .anyMatch(SearchPathLocator.class::isAssignableFrom);
+ if (required && !foundSearchPathLocator) {
+ return ConditionOutcome.noMatch(
+ ConditionMessage.forCondition(ConditionalOnSearchPathLocator.class)
+ .notAvailable(SearchPathLocator.class.getTypeName()));
+ }
+ if (!required && foundSearchPathLocator) {
+ return ConditionOutcome.noMatch(ConditionMessage
+ .forCondition(ConditionalOnMissingSearchPathLocator.class)
+ .available(SearchPathLocator.class.getTypeName()));
+ }
+ return ConditionOutcome.match();
+ }
- boolean required = metadata.isAnnotated(ConditionalOnSearchPathLocator.class.getName());
- boolean foundSearchPathLocator = repositoryTypes.stream().anyMatch(SearchPathLocator.class::isAssignableFrom);
- if (required && !foundSearchPathLocator) {
- return ConditionOutcome.noMatch(ConditionMessage.forCondition(ConditionalOnSearchPathLocator.class).notAvailable(SearchPathLocator.class.getTypeName()));
- }
- if (!required && foundSearchPathLocator) {
- return ConditionOutcome.noMatch(ConditionMessage.forCondition(ConditionalOnMissingSearchPathLocator.class).available(SearchPathLocator.class.getTypeName()));
- }
- return ConditionOutcome.match();
- }
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java
index 0b9f2918..aeac6945 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.config;
import java.util.ArrayList;
@@ -42,14 +43,14 @@ public class CompositeConfiguration {
@Primary
@ConditionalOnBean(SearchPathLocator.class)
public SearchPathCompositeEnvironmentRepository searchPathCompositeEnvironmentRepository() {
- return new SearchPathCompositeEnvironmentRepository(environmentRepos);
+ return new SearchPathCompositeEnvironmentRepository(this.environmentRepos);
}
@Bean
@Primary
@ConditionalOnMissingBean(SearchPathLocator.class)
public CompositeEnvironmentRepository compositeEnvironmentRepository() {
- return new CompositeEnvironmentRepository(environmentRepos);
+ return new CompositeEnvironmentRepository(this.environmentRepos);
}
@Autowired
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerAutoConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerAutoConfiguration.java
index 0d36c9e6..7b2bf910 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerAutoConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerAutoConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
*/
package org.springframework.cloud.config.server.config;
@@ -28,8 +27,9 @@ import org.springframework.context.annotation.Import;
@Configuration
@ConditionalOnBean(ConfigServerConfiguration.Marker.class)
@EnableConfigurationProperties(ConfigServerProperties.class)
-@Import({ EnvironmentRepositoryConfiguration.class, CompositeConfiguration.class, ResourceRepositoryConfiguration.class,
- ConfigServerEncryptionConfiguration.class, ConfigServerMvcConfiguration.class })
+@Import({ EnvironmentRepositoryConfiguration.class, CompositeConfiguration.class,
+ ResourceRepositoryConfiguration.class, ConfigServerEncryptionConfiguration.class,
+ ConfigServerMvcConfiguration.class })
public class ConfigServerAutoConfiguration {
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerConfiguration.java
index 49465fcd..ed7bdc30 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
*/
package org.springframework.cloud.config.server.config;
@@ -25,10 +24,14 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
public class ConfigServerConfiguration {
- class Marker {}
@Bean
public Marker enableConfigServerMarker() {
return new Marker();
}
+
+ class Marker {
+
+ }
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerEncryptionConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerEncryptionConfiguration.java
index 7200bb33..c6c96e16 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerEncryptionConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerEncryptionConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class ConfigServerEncryptionConfiguration {
- @Autowired(required=false)
+ @Autowired(required = false)
private TextEncryptorLocator encryptor;
@Autowired
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerHealthIndicator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerHealthIndicator.java
index c462f47a..3959546b 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerHealthIndicator.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerHealthIndicator.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.springframework.cloud.config.server.config;
import java.util.ArrayList;
@@ -11,6 +27,7 @@ import javax.annotation.PostConstruct;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -26,7 +43,7 @@ import org.springframework.util.CollectionUtils;
public class ConfigServerHealthIndicator extends AbstractHealthIndicator {
private static Log logger = LogFactory.getLog(ConfigServerHealthIndicator.class);
-
+
private EnvironmentRepository environmentRepository;
private Map repositories = new LinkedHashMap<>();
@@ -48,16 +65,19 @@ public class ConfigServerHealthIndicator extends AbstractHealthIndicator {
List> details = new ArrayList<>();
for (String name : this.repositories.keySet()) {
Repository repository = this.repositories.get(name);
- String application = (repository.getName() == null)? name : repository.getName();
+ String application = (repository.getName() == null) ? name
+ : repository.getName();
String profiles = repository.getProfiles();
try {
- Environment environment = this.environmentRepository.findOne(application, profiles, repository.getLabel());
+ Environment environment = this.environmentRepository.findOne(application,
+ profiles, repository.getLabel());
HashMap detail = new HashMap<>();
detail.put("name", environment.getName());
detail.put("label", environment.getLabel());
- if (environment.getProfiles() != null && environment.getProfiles().length > 0) {
+ if (environment.getProfiles() != null
+ && environment.getProfiles().length > 0) {
detail.put("profiles", Arrays.asList(environment.getProfiles()));
}
@@ -69,7 +89,8 @@ public class ConfigServerHealthIndicator extends AbstractHealthIndicator {
detail.put("sources", sources);
}
details.add(detail);
- } catch (Exception e) {
+ }
+ catch (Exception e) {
logger.debug("Could not read repository: " + application, e);
HashMap map = new HashMap<>();
map.put("application", application);
@@ -91,12 +112,19 @@ public class ConfigServerHealthIndicator extends AbstractHealthIndicator {
this.repositories = repositories;
}
+ /**
+ * Repository properties.
+ */
public static class Repository {
+
private String name;
+
private String profiles = "default";
+
private String label;
- public Repository() { }
+ public Repository() {
+ }
public String getName() {
return this.name;
@@ -121,5 +149,7 @@ public class ConfigServerHealthIndicator extends AbstractHealthIndicator {
public void setLabel(String label) {
this.label = label;
}
+
}
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerMvcConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerMvcConfiguration.java
index 4990f17b..37d3859c 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerMvcConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerMvcConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,8 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.config;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -30,8 +33,6 @@ import org.springframework.http.MediaType;
import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* @author Dave Syer
* @author Roy Clarkson
@@ -54,8 +55,10 @@ public class ConfigServerMvcConfiguration extends WebMvcConfigurerAdapter {
}
@Bean
- public EnvironmentController environmentController(EnvironmentRepository envRepository, ConfigServerProperties server) {
- EnvironmentController controller = new EnvironmentController(encrypted(envRepository, server), this.objectMapper);
+ public EnvironmentController environmentController(
+ EnvironmentRepository envRepository, ConfigServerProperties server) {
+ EnvironmentController controller = new EnvironmentController(
+ encrypted(envRepository, server), this.objectMapper);
controller.setStripDocumentFromYaml(server.isStripDocumentFromYaml());
controller.setAcceptEmpty(server.isAcceptEmpty());
return controller;
@@ -63,16 +66,19 @@ public class ConfigServerMvcConfiguration extends WebMvcConfigurerAdapter {
@Bean
@ConditionalOnBean(ResourceRepository.class)
- public ResourceController resourceController(ResourceRepository repository, EnvironmentRepository envRepository, ConfigServerProperties server) {
+ public ResourceController resourceController(ResourceRepository repository,
+ EnvironmentRepository envRepository, ConfigServerProperties server) {
ResourceController controller = new ResourceController(repository,
encrypted(envRepository, server));
return controller;
}
- private EnvironmentRepository encrypted(EnvironmentRepository envRepository, ConfigServerProperties server) {
+ private EnvironmentRepository encrypted(EnvironmentRepository envRepository,
+ ConfigServerProperties server) {
EnvironmentEncryptorEnvironmentRepository encrypted = new EnvironmentEncryptorEnvironmentRepository(
envRepository, this.environmentEncryptor);
encrypted.setOverrides(server.getOverrides());
return encrypted;
}
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerProperties.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerProperties.java
index 261c4574..a7b44d68 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerProperties.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.config;
import java.util.LinkedHashMap;
@@ -56,8 +57,9 @@ public class ConfigServerProperties {
* should be returned in "native" form.
*/
private boolean stripDocumentFromYaml = true;
+
/**
- * Flag to indicate that If HTTP 404 needs to be sent if Application is not Found
+ * Flag to indicate that If HTTP 404 needs to be sent if Application is not Found.
*/
private boolean acceptEmpty = true;
@@ -72,7 +74,8 @@ public class ConfigServerProperties {
private String defaultProfile = "default";
/**
- * Decryption configuration for when server handles encrypted properties before sending them to clients.
+ * Decryption configuration for when server handles encrypted properties before
+ * sending them to clients.
*/
private Encrypt encrypt = new Encrypt();
@@ -119,7 +122,7 @@ public class ConfigServerProperties {
public void setStripDocumentFromYaml(boolean stripDocumentFromYaml) {
this.stripDocumentFromYaml = stripDocumentFromYaml;
}
-
+
public boolean isAcceptEmpty() {
return this.acceptEmpty;
}
@@ -127,6 +130,7 @@ public class ConfigServerProperties {
public void setAcceptEmpty(boolean acceptEmpty) {
this.acceptEmpty = acceptEmpty;
}
+
public String getDefaultApplicationName() {
return this.defaultApplicationName;
}
@@ -143,7 +147,11 @@ public class ConfigServerProperties {
this.defaultProfile = defaultProfile;
}
+ /**
+ * Encryption properties.
+ */
public static class Encrypt {
+
/**
* Enable decryption of environment properties before sending to client.
*/
@@ -156,5 +164,7 @@ public class ConfigServerProperties {
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
+
}
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CredhubConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CredhubConfiguration.java
index f1535f5d..43351a74 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CredhubConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CredhubConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java
index 3782064f..c63cc84e 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -73,7 +73,7 @@ public class EncryptionAutoConfiguration {
public EnvironmentEncryptor environmentEncryptor() {
TextEncryptorLocator locator = this.locator;
if (locator == null) {
- locator = new SingleTextEncryptorLocator(encryptor);
+ locator = new SingleTextEncryptorLocator(this.encryptor);
}
return new CipherEnvironmentEncryptor(locator);
}
@@ -120,7 +120,7 @@ class SingleTextEncryptorConfiguration {
@Bean
public SingleTextEncryptorLocator textEncryptorLocator() {
- return new SingleTextEncryptorLocator(encryptor);
+ return new SingleTextEncryptorLocator(this.encryptor);
}
}
@@ -137,8 +137,8 @@ class DefaultTextEncryptorConfiguration {
@Bean
public TextEncryptor defaultTextEncryptor() {
- if (locator != null) {
- return new LocatorTextEncryptor(locator);
+ if (this.locator != null) {
+ return new LocatorTextEncryptor(this.locator);
}
if (StringUtils.hasText(this.key.getKey())) {
return new EncryptorFactory(this.key.getSalt()).create(this.key.getKey());
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
index 4077405a..06ab90d1 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,12 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.config;
-import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Optional;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.http.client.HttpClient;
import org.eclipse.jgit.api.TransportConfigCallback;
import org.tmatesoft.svn.core.SVNException;
@@ -78,12 +80,16 @@ import org.springframework.jdbc.core.JdbcTemplate;
* @author Alberto C. RÃos
*/
@Configuration
-@EnableConfigurationProperties({ SvnKitEnvironmentProperties.class, CredhubEnvironmentProperties.class,
- JdbcEnvironmentProperties.class, NativeEnvironmentProperties.class, VaultEnvironmentProperties.class })
-@Import({ CompositeRepositoryConfiguration.class, JdbcRepositoryConfiguration.class, VaultRepositoryConfiguration.class,
- CredhubConfiguration.class, CredhubRepositoryConfiguration.class, SvnRepositoryConfiguration.class,
- NativeRepositoryConfiguration.class, GitRepositoryConfiguration.class, DefaultRepositoryConfiguration.class })
+@EnableConfigurationProperties({ SvnKitEnvironmentProperties.class,
+ CredhubEnvironmentProperties.class, JdbcEnvironmentProperties.class,
+ NativeEnvironmentProperties.class, VaultEnvironmentProperties.class })
+@Import({ CompositeRepositoryConfiguration.class, JdbcRepositoryConfiguration.class,
+ VaultRepositoryConfiguration.class, CredhubConfiguration.class,
+ CredhubRepositoryConfiguration.class, SvnRepositoryConfiguration.class,
+ NativeRepositoryConfiguration.class, GitRepositoryConfiguration.class,
+ DefaultRepositoryConfiguration.class })
public class EnvironmentRepositoryConfiguration {
+
@Bean
@ConditionalOnProperty(value = "spring.cloud.config.server.health.enabled", matchIfMissing = true)
public ConfigServerHealthIndicator configServerHealthIndicator(
@@ -98,13 +104,14 @@ public class EnvironmentRepositoryConfiguration {
}
@Configuration
- @ConditionalOnProperty(value = "spring.cloud.config.server.consul.watch.enabled")
+ @ConditionalOnProperty("spring.cloud.config.server.consul.watch.enabled")
protected static class ConsulEnvironmentWatchConfiguration {
@Bean
public EnvironmentWatch environmentWatch() {
return new ConsulEnvironmentWatch();
}
+
}
@Configuration
@@ -115,72 +122,83 @@ public class EnvironmentRepositoryConfiguration {
public EnvironmentWatch environmentWatch() {
return new EnvironmentWatch.Default();
}
+
}
- @Configuration
- @ConditionalOnClass(TransportConfigCallback.class)
- static class JGitFactoryConfig {
+ @Configuration
+ @ConditionalOnClass(TransportConfigCallback.class)
+ static class JGitFactoryConfig {
- @Bean
- public MultipleJGitEnvironmentRepositoryFactory gitEnvironmentRepositoryFactory(
- ConfigurableEnvironment environment, ConfigServerProperties server,
- Optional jgitHttpConnectionFactory,
- Optional customTransportConfigCallback) {
- return new MultipleJGitEnvironmentRepositoryFactory(environment, server, jgitHttpConnectionFactory,
- customTransportConfigCallback);
- }
- }
+ @Bean
+ public MultipleJGitEnvironmentRepositoryFactory gitEnvironmentRepositoryFactory(
+ ConfigurableEnvironment environment, ConfigServerProperties server,
+ Optional jgitHttpConnectionFactory,
+ Optional customTransportConfigCallback) {
+ return new MultipleJGitEnvironmentRepositoryFactory(environment, server,
+ jgitHttpConnectionFactory, customTransportConfigCallback);
+ }
- @Configuration
- @ConditionalOnClass({ HttpClient.class, TransportConfigCallback.class })
- static class JGitHttpClientConfig {
+ }
- @Bean
- public ConfigurableHttpConnectionFactory httpClientConnectionFactory() {
- return new HttpClientConfigurableHttpConnectionFactory();
- }
- }
+ @Configuration
+ @ConditionalOnClass({ HttpClient.class, TransportConfigCallback.class })
+ static class JGitHttpClientConfig {
- @Configuration
- @ConditionalOnClass(SVNException.class)
- static class SvnFactoryConfig {
- @Bean
- public SvnEnvironmentRepositoryFactory svnEnvironmentRepositoryFactory(ConfigurableEnvironment environment,
- ConfigServerProperties server) {
- return new SvnEnvironmentRepositoryFactory(environment, server);
- }
- }
+ @Bean
+ public ConfigurableHttpConnectionFactory httpClientConnectionFactory() {
+ return new HttpClientConfigurableHttpConnectionFactory();
+ }
- @Configuration
- static class VaultFactoryConfig {
+ }
- @Bean
- public VaultEnvironmentRepositoryFactory vaultEnvironmentRepositoryFactory(
- ObjectProvider request, EnvironmentWatch watch,
- Optional vaultRestTemplateFactory) {
- return new VaultEnvironmentRepositoryFactory(request, watch, vaultRestTemplateFactory);
- }
- }
+ @Configuration
+ @ConditionalOnClass(SVNException.class)
+ static class SvnFactoryConfig {
- @Configuration
- @ConditionalOnClass(HttpClient.class)
- static class VaultHttpClientConfig {
+ @Bean
+ public SvnEnvironmentRepositoryFactory svnEnvironmentRepositoryFactory(
+ ConfigurableEnvironment environment, ConfigServerProperties server) {
+ return new SvnEnvironmentRepositoryFactory(environment, server);
+ }
- @Bean
- public VaultEnvironmentRepositoryFactory.VaultRestTemplateFactory vaultRestTemplateFactory() {
- return new HttpClientVaultRestTemplateFactory();
- }
- }
+ }
- @Configuration
- @ConditionalOnClass(JdbcTemplate.class)
- static class JdbcFactoryConfig {
- @Bean
- @ConditionalOnBean(JdbcTemplate.class)
- public JdbcEnvironmentRepositoryFactory jdbcEnvironmentRepositoryFactory(JdbcTemplate jdbc) {
- return new JdbcEnvironmentRepositoryFactory(jdbc);
- }
- }
+ @Configuration
+ static class VaultFactoryConfig {
+
+ @Bean
+ public VaultEnvironmentRepositoryFactory vaultEnvironmentRepositoryFactory(
+ ObjectProvider request, EnvironmentWatch watch,
+ Optional vaultRestTemplateFactory) {
+ return new VaultEnvironmentRepositoryFactory(request, watch,
+ vaultRestTemplateFactory);
+ }
+
+ }
+
+ @Configuration
+ @ConditionalOnClass(HttpClient.class)
+ static class VaultHttpClientConfig {
+
+ @Bean
+ public VaultEnvironmentRepositoryFactory.VaultRestTemplateFactory vaultRestTemplateFactory() {
+ return new HttpClientVaultRestTemplateFactory();
+ }
+
+ }
+
+ @Configuration
+ @ConditionalOnClass(JdbcTemplate.class)
+ static class JdbcFactoryConfig {
+
+ @Bean
+ @ConditionalOnBean(JdbcTemplate.class)
+ public JdbcEnvironmentRepositoryFactory jdbcEnvironmentRepositoryFactory(
+ JdbcTemplate jdbc) {
+ return new JdbcEnvironmentRepositoryFactory(jdbc);
+ }
+
+ }
@Configuration
@ConditionalOnClass(CredHubOperations.class)
@@ -189,24 +207,29 @@ public class EnvironmentRepositoryConfiguration {
@Bean
public CredhubEnvironmentRepositoryFactory credhubEnvironmentRepositoryFactory(
Optional credHubOperations) {
- return new CredhubEnvironmentRepositoryFactory(credHubOperations.orElse(null));
+ return new CredhubEnvironmentRepositoryFactory(
+ credHubOperations.orElse(null));
}
+
}
- @Configuration
- static class NativeFactoryConfig {
- @Bean
- public NativeEnvironmentRepositoryFactory nativeEnvironmentRepositoryFactory(ConfigurableEnvironment environment,
- ConfigServerProperties properties) {
- return new NativeEnvironmentRepositoryFactory(environment, properties);
- }
- }
+ @Configuration
+ static class NativeFactoryConfig {
+
+ @Bean
+ public NativeEnvironmentRepositoryFactory nativeEnvironmentRepositoryFactory(
+ ConfigurableEnvironment environment, ConfigServerProperties properties) {
+ return new NativeEnvironmentRepositoryFactory(environment, properties);
+ }
+
+ }
}
@Configuration
@ConditionalOnMissingBean(value = EnvironmentRepository.class, search = SearchStrategy.CURRENT)
class DefaultRepositoryConfiguration {
+
@Autowired
private ConfigurableEnvironment environment;
@@ -218,10 +241,11 @@ class DefaultRepositoryConfiguration {
@Bean
public MultipleJGitEnvironmentRepository defaultEnvironmentRepository(
- MultipleJGitEnvironmentRepositoryFactory gitEnvironmentRepositoryFactory,
+ MultipleJGitEnvironmentRepositoryFactory gitEnvironmentRepositoryFactory,
MultipleJGitEnvironmentProperties environmentProperties) throws Exception {
return gitEnvironmentRepositoryFactory.build(environmentProperties);
}
+
}
@Configuration
@@ -230,15 +254,18 @@ class DefaultRepositoryConfiguration {
class NativeRepositoryConfiguration {
@Bean
- public NativeEnvironmentRepository nativeEnvironmentRepository(NativeEnvironmentRepositoryFactory factory,
+ public NativeEnvironmentRepository nativeEnvironmentRepository(
+ NativeEnvironmentRepositoryFactory factory,
NativeEnvironmentProperties environmentProperties) {
- return factory.build(environmentProperties);
+ return factory.build(environmentProperties);
}
+
}
@Configuration
@Profile("git")
class GitRepositoryConfiguration extends DefaultRepositoryConfiguration {
+
}
@Configuration
@@ -246,10 +273,12 @@ class GitRepositoryConfiguration extends DefaultRepositoryConfiguration {
class SvnRepositoryConfiguration {
@Bean
- public SvnKitEnvironmentRepository svnKitEnvironmentRepository(SvnKitEnvironmentProperties environmentProperties,
- SvnEnvironmentRepositoryFactory factory) {
+ public SvnKitEnvironmentRepository svnKitEnvironmentRepository(
+ SvnKitEnvironmentProperties environmentProperties,
+ SvnEnvironmentRepositoryFactory factory) {
return factory.build(environmentProperties);
}
+
}
@Configuration
@@ -257,11 +286,12 @@ class SvnRepositoryConfiguration {
class VaultRepositoryConfiguration {
@Bean
- public VaultEnvironmentRepository vaultEnvironmentRepository(VaultEnvironmentRepositoryFactory factory,
- VaultEnvironmentProperties environmentProperties)
- throws Exception {
+ public VaultEnvironmentRepository vaultEnvironmentRepository(
+ VaultEnvironmentRepositoryFactory factory,
+ VaultEnvironmentProperties environmentProperties) throws Exception {
return factory.build(environmentProperties);
}
+
}
@Configuration
@@ -269,10 +299,12 @@ class VaultRepositoryConfiguration {
class CredhubRepositoryConfiguration {
@Bean
- public CredhubEnvironmentRepository credhubEnvironmentRepository(CredhubEnvironmentRepositoryFactory factory,
- CredhubEnvironmentProperties environmentProperties) {
+ public CredhubEnvironmentRepository credhubEnvironmentRepository(
+ CredhubEnvironmentRepositoryFactory factory,
+ CredhubEnvironmentProperties environmentProperties) {
return factory.build(environmentProperties);
}
+
}
@Configuration
@@ -282,10 +314,12 @@ class JdbcRepositoryConfiguration {
@Bean
@ConditionalOnBean(JdbcTemplate.class)
- public JdbcEnvironmentRepository jdbcEnvironmentRepository(JdbcEnvironmentRepositoryFactory factory,
- JdbcEnvironmentProperties environmentProperties) {
+ public JdbcEnvironmentRepository jdbcEnvironmentRepository(
+ JdbcEnvironmentRepositoryFactory factory,
+ JdbcEnvironmentProperties environmentProperties) {
return factory.build(environmentProperties);
}
+
}
@Configuration
@@ -313,4 +347,5 @@ class CompositeRepositoryConfiguration {
List environmentRepositories) throws Exception {
return new CompositeEnvironmentRepository(environmentRepositories);
}
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ResourceRepositoryConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ResourceRepositoryConfiguration.java
index 4498c772..6c96d352 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ResourceRepositoryConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ResourceRepositoryConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.config;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -38,4 +39,5 @@ public class ResourceRepositoryConfiguration {
public ResourceRepository resourceRepository(SearchPathLocator service) {
return new GenericResourceRepository(service);
}
-}
\ No newline at end of file
+
+}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/diagnostics/GitUriFailureAnalyzer.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/diagnostics/GitUriFailureAnalyzer.java
index 1fc04280..8d63fe84 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/diagnostics/GitUriFailureAnalyzer.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/diagnostics/GitUriFailureAnalyzer.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.springframework.cloud.config.server.diagnostics;
import org.springframework.boot.diagnostics.AbstractFailureAnalyzer;
@@ -7,16 +23,25 @@ import org.springframework.cloud.config.server.environment.JGitEnvironmentReposi
/**
* @author Ryan Baxter
*/
-public class GitUriFailureAnalyzer extends AbstractFailureAnalyzer {
+public class GitUriFailureAnalyzer
+ extends AbstractFailureAnalyzer {
+ /**
+ * Description of the failure.
+ */
public static final String DESCRIPTION = "Invalid config server configuration.";
- public static final String ACTION = "If you are using the git profile, you need to set a Git URI in your " +
- "configuration. If you are using a native profile and have spring.cloud.config.server.bootstrap=true, " +
- "you need to use a composite configuration.";
+
+ /**
+ * Action to take for git failure.
+ */
+ public static final String ACTION = "If you are using the git profile, you need to set a Git URI in your "
+ + "configuration. If you are using a native profile and have spring.cloud.config.server.bootstrap=true, "
+ + "you need to use a composite configuration.";
@Override
- protected FailureAnalysis analyze(Throwable rootFailure, IllegalStateException cause) {
- if(JGitEnvironmentRepository.MESSAGE.equalsIgnoreCase(cause.getMessage())) {
+ protected FailureAnalysis analyze(Throwable rootFailure,
+ IllegalStateException cause) {
+ if (JGitEnvironmentRepository.MESSAGE.equalsIgnoreCase(cause.getMessage())) {
return new FailureAnalysis(DESCRIPTION, ACTION, cause);
}
return null;
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherEnvironmentEncryptor.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherEnvironmentEncryptor.java
index 0e5b40fa..b6ce5357 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherEnvironmentEncryptor.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherEnvironmentEncryptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.config.environment.Environment;
import org.springframework.cloud.config.environment.PropertySource;
@@ -64,24 +65,28 @@ public class CipherEnvironmentEncryptor implements EnvironmentEncryptor {
for (Map.Entry entry : new LinkedHashSet<>(map.entrySet())) {
Object key = entry.getKey();
String name = key.toString();
- if(entry.getValue() != null && entry.getValue().toString().startsWith("{cipher}")){
+ if (entry.getValue() != null
+ && entry.getValue().toString().startsWith("{cipher}")) {
String value = entry.getValue().toString();
map.remove(key);
try {
value = value.substring("{cipher}".length());
- value = encryptor.locate(
- this.helper.getEncryptorKeys(name, StringUtils
- .arrayToCommaDelimitedString(environment
- .getProfiles()), value)).decrypt(this.helper.stripPrefix(value));
+ value = encryptor
+ .locate(this.helper.getEncryptorKeys(name,
+ StringUtils.arrayToCommaDelimitedString(
+ environment.getProfiles()),
+ value))
+ .decrypt(this.helper.stripPrefix(value));
}
catch (Exception e) {
value = "";
name = "invalid." + name;
- String message = "Cannot decrypt key: " + key + " (" + e.getClass()
- + ": " + e.getMessage() + ")";
+ String message = "Cannot decrypt key: " + key + " ("
+ + e.getClass() + ": " + e.getMessage() + ")";
if (logger.isDebugEnabled()) {
logger.debug(message, e);
- } else if (logger.isWarnEnabled()) {
+ }
+ else if (logger.isWarnEnabled()) {
logger.warn(message);
}
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EncryptionController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EncryptionController.java
index 1241cdd9..01281a29 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EncryptionController.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EncryptionController.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.encryption;
import java.io.UnsupportedEncodingException;
@@ -38,7 +39,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -125,8 +125,7 @@ public class EncryptionController {
@RequestBody String data, @RequestHeader("Content-Type") MediaType type) {
checkEncryptorInstalled(name, profiles);
String input = stripFormData(data, type, false);
- Map keys = this.helper.getEncryptorKeys(name, profiles,
- input);
+ Map keys = this.helper.getEncryptorKeys(name, profiles, input);
String textToEncrypt = this.helper.stripPrefix(input);
String encrypted = this.helper.addPrefix(keys,
this.encryptor.locate(keys).encrypt(textToEncrypt));
@@ -154,7 +153,7 @@ public class EncryptionController {
logger.info("Decrypted cipher data");
return decrypted;
}
- catch (IllegalArgumentException|IllegalStateException e) {
+ catch (IllegalArgumentException | IllegalStateException e) {
logger.error("Cannot decrypt key:" + name + ", value:" + data, e);
throw new InvalidCipherException();
}
@@ -217,7 +216,7 @@ public class EncryptionController {
body.put("description", "No key was installed for encryption service");
return new ResponseEntity<>(body, HttpStatus.NOT_FOUND);
}
-
+
@ExceptionHandler(EncryptionTooWeakException.class)
public ResponseEntity> encryptionTooWeak() {
Map body = new HashMap<>();
@@ -238,16 +237,20 @@ public class EncryptionController {
@SuppressWarnings("serial")
class KeyNotInstalledException extends RuntimeException {
+
}
@SuppressWarnings("serial")
class KeyNotAvailableException extends RuntimeException {
+
}
@SuppressWarnings("serial")
class EncryptionTooWeakException extends RuntimeException {
+
}
@SuppressWarnings("serial")
class InvalidCipherException extends RuntimeException {
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EnvironmentEncryptor.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EnvironmentEncryptor.java
index 623f5b9b..2bd6c920 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EnvironmentEncryptor.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EnvironmentEncryptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,5 +26,7 @@ import org.springframework.cloud.config.environment.Environment;
*
*/
public interface EnvironmentEncryptor {
+
Environment decrypt(Environment environment);
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EnvironmentPrefixHelper.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EnvironmentPrefixHelper.java
index dca6c40c..d5f3e287 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EnvironmentPrefixHelper.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EnvironmentPrefixHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -57,8 +57,13 @@ class EnvironmentPrefixHelper {
* Extract keys for looking up a {@link TextEncryptor} from the input text in the form
* of a prefix of zero or many {name:value} pairs. The name and profiles
* properties are always added to the keys (replacing any provided in the inputs).
+ * @param name application name
+ * @param profiles list of profiles
+ * @param text text to cipher
+ * @return encryptor keys
*/
- public Map getEncryptorKeys(String name, String profiles, String text) {
+ public Map getEncryptorKeys(String name, String profiles,
+ String text) {
Map keys = new LinkedHashMap();
@@ -98,6 +103,9 @@ class EnvironmentPrefixHelper {
* {name:value} pairs. The "name" and "profiles" keys are special in that
* they are stripped since that information is always available when deriving the keys
* in {@link #getEncryptorKeys(String, String, String)}.
+ * @param keys name, value pairs
+ * @param input input to append
+ * @return prefixed input
*/
public String addPrefix(Map keys, String input) {
keys.remove(NAME);
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/KeyStoreTextEncryptorLocator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/KeyStoreTextEncryptorLocator.java
index 5192dea5..6edf5643 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/KeyStoreTextEncryptorLocator.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/KeyStoreTextEncryptorLocator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -48,7 +48,9 @@ public class KeyStoreTextEncryptorLocator implements TextEncryptorLocator {
private SecretLocator secretLocator = new PassthruSecretLocator();
private RsaAlgorithm rsaAlgorithm = RsaAlgorithm.DEFAULT;
+
private boolean strong = false;
+
private String salt = "deadbeef";
public KeyStoreTextEncryptorLocator(KeyStoreKeyFactory keys, String defaultSecret,
@@ -81,8 +83,9 @@ public class KeyStoreTextEncryptorLocator implements TextEncryptorLocator {
public TextEncryptor locate(Map keys) {
String alias = keys.containsKey(KEY) ? keys.get(KEY) : this.defaultAlias;
String secret = keys.containsKey(SECRET) ? keys.get(SECRET) : this.defaultSecret;
- return new RsaSecretEncryptor(this.keys.getKeyPair(alias,
- this.secretLocator.locate(secret)), this.rsaAlgorithm, this.salt, this.strong);
+ return new RsaSecretEncryptor(
+ this.keys.getKeyPair(alias, this.secretLocator.locate(secret)),
+ this.rsaAlgorithm, this.salt, this.strong);
}
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/LocatorTextEncryptor.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/LocatorTextEncryptor.java
index 053c0b4d..b4ad7755 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/LocatorTextEncryptor.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/LocatorTextEncryptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,20 +36,20 @@ public class LocatorTextEncryptor implements TextEncryptor {
@Override
public String encrypt(String text) {
- Map keys = helper.getEncryptorKeys("configserver", "default",
+ Map keys = this.helper.getEncryptorKeys("configserver", "default",
text);
- return getLocator().locate(keys).encrypt(helper.stripPrefix(text));
+ return getLocator().locate(keys).encrypt(this.helper.stripPrefix(text));
}
private TextEncryptorLocator getLocator() {
- return locator;
+ return this.locator;
}
@Override
public String decrypt(String encryptedText) {
- Map keys = helper.getEncryptorKeys("configserver", "default",
+ Map keys = this.helper.getEncryptorKeys("configserver", "default",
encryptedText);
- return getLocator().locate(keys).decrypt(helper.stripPrefix(encryptedText));
+ return getLocator().locate(keys).decrypt(this.helper.stripPrefix(encryptedText));
}
-}
\ No newline at end of file
+}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/PassthruSecretLocator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/PassthruSecretLocator.java
index af2a24d3..028f8de8 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/PassthruSecretLocator.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/PassthruSecretLocator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ public class PassthruSecretLocator implements SecretLocator {
@Override
public char[] locate(String secret) {
- return secret==null ? new char[0] : secret.toCharArray();
+ return secret == null ? new char[0] : secret.toCharArray();
}
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/SecretLocator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/SecretLocator.java
index 9e543fa3..3c19ec7e 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/SecretLocator.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/SecretLocator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/SingleTextEncryptorLocator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/SingleTextEncryptorLocator.java
index 210bf344..f60d631e 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/SingleTextEncryptorLocator.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/SingleTextEncryptorLocator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/TextEncryptorLocator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/TextEncryptorLocator.java
index b4b2134a..d69bb105 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/TextEncryptorLocator.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/TextEncryptorLocator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,6 +27,6 @@ import org.springframework.security.crypto.encrypt.TextEncryptor;
*/
public interface TextEncryptorLocator {
- TextEncryptor locate(Map keys);
+ TextEncryptor locate(Map keys);
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AbstractScmEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AbstractScmEnvironmentRepository.java
index 7c2cf7ae..8ede428b 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AbstractScmEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AbstractScmEnvironmentRepository.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.environment;
import org.springframework.cloud.config.environment.Environment;
@@ -29,21 +30,24 @@ public abstract class AbstractScmEnvironmentRepository extends AbstractScmAccess
implements EnvironmentRepository, SearchPathLocator, Ordered {
private EnvironmentCleaner cleaner = new EnvironmentCleaner();
+
private int order = Ordered.LOWEST_PRECEDENCE;
public AbstractScmEnvironmentRepository(ConfigurableEnvironment environment) {
super(environment);
}
- public AbstractScmEnvironmentRepository(ConfigurableEnvironment environment, AbstractScmAccessorProperties properties) {
+ public AbstractScmEnvironmentRepository(ConfigurableEnvironment environment,
+ AbstractScmAccessorProperties properties) {
super(environment, properties);
this.order = properties.getOrder();
}
@Override
- public synchronized Environment findOne(String application, String profile, String label) {
- NativeEnvironmentRepository delegate = new NativeEnvironmentRepository(getEnvironment(),
- new NativeEnvironmentProperties());
+ public synchronized Environment findOne(String application, String profile,
+ String label) {
+ NativeEnvironmentRepository delegate = new NativeEnvironmentRepository(
+ getEnvironment(), new NativeEnvironmentProperties());
Locations locations = getLocations(application, profile, label);
delegate.setSearchLocations(locations.getLocations());
Environment result = delegate.findOne(application, profile, "");
@@ -55,10 +59,11 @@ public abstract class AbstractScmEnvironmentRepository extends AbstractScmAccess
@Override
public int getOrder() {
- return order;
+ return this.order;
}
public void setOrder(int order) {
this.order = order;
}
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepository.java
index c81c5668..ea23705a 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepository.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.environment;
import java.util.Collections;
@@ -22,7 +23,9 @@ import org.springframework.cloud.config.environment.Environment;
import org.springframework.core.OrderComparator;
/**
- * An {@link EnvironmentRepository} composed of multiple ordered {@link EnvironmentRepository}s.
+ * An {@link EnvironmentRepository} composed of multiple ordered
+ * {@link EnvironmentRepository}s.
+ *
* @author Ryan Baxter
*/
public class CompositeEnvironmentRepository implements EnvironmentRepository {
@@ -31,27 +34,34 @@ public class CompositeEnvironmentRepository implements EnvironmentRepository {
/**
* Creates a new {@link CompositeEnvironmentRepository}.
- * @param environmentRepositories The list of {@link EnvironmentRepository}s to create the composite from.
+ * @param environmentRepositories The list of {@link EnvironmentRepository}s to create
+ * the composite from.
*/
- public CompositeEnvironmentRepository(List environmentRepositories) {
- //Sort the environment repositories by the priority
+ public CompositeEnvironmentRepository(
+ List environmentRepositories) {
+ // Sort the environment repositories by the priority
Collections.sort(environmentRepositories, OrderComparator.INSTANCE);
this.environmentRepositories = environmentRepositories;
}
@Override
public Environment findOne(String application, String profile, String label) {
- Environment env = new Environment(application, new String[]{profile}, label, null, null);
- if(environmentRepositories.size() == 1) {
- Environment envRepo = environmentRepositories.get(0).findOne(application, profile, label);
+ Environment env = new Environment(application, new String[] { profile }, label,
+ null, null);
+ if (this.environmentRepositories.size() == 1) {
+ Environment envRepo = this.environmentRepositories.get(0).findOne(application,
+ profile, label);
env.addAll(envRepo.getPropertySources());
env.setVersion(envRepo.getVersion());
env.setState(envRepo.getState());
- } else {
- for (EnvironmentRepository repo : environmentRepositories) {
- env.addAll(repo.findOne(application, profile, label).getPropertySources());
+ }
+ else {
+ for (EnvironmentRepository repo : this.environmentRepositories) {
+ env.addAll(
+ repo.findOne(application, profile, label).getPropertySources());
}
}
return env;
}
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactory.java
index 2b162c4f..7880090d 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactory.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.cloud.config.server.environment;
import org.eclipse.jgit.transport.http.HttpConnectionFactory;
@@ -21,5 +22,8 @@ import org.eclipse.jgit.transport.http.HttpConnectionFactory;
* @author Dylan Roberts
*/
public interface ConfigurableHttpConnectionFactory extends HttpConnectionFactory {
- void addConfiguration(MultipleJGitEnvironmentProperties environmentProperties) throws Exception;
+
+ void addConfiguration(MultipleJGitEnvironmentProperties environmentProperties)
+ throws Exception;
+
}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ConsulEnvironmentWatch.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ConsulEnvironmentWatch.java
index cafb973b..e88d3508 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ConsulEnvironmentWatch.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ConsulEnvironmentWatch.java
@@ -1,11 +1,29 @@
+/*
+ * Copyright 2018-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.springframework.cloud.config.server.environment;
import java.util.ArrayList;
import java.util.List;
+
import javax.validation.constraints.NotNull;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity;
@@ -23,15 +41,25 @@ import org.springframework.web.client.RestTemplate;
@ConfigurationProperties("spring.cloud.config.server.consul.watch")
public class ConsulEnvironmentWatch implements EnvironmentWatch {
+ /**
+ * Consul index header name.
+ */
public static final String CONSUL_INDEX = "X-Consul-Index";
+
+ /**
+ * Consul token header name.
+ */
public static final String CONSUL_TOKEN = "X-Consul-Token";
- private static Log LOG = LogFactory.getLog(ConsulEnvironmentWatch.class);
+ /**
+ * Response types.
+ */
+ public static final ParameterizedTypeReference> RESPONSE_TYPE = new ParameterizedTypeReference>() {
+ };
private static final String WATCH_URL = "{scheme}://{host}:{port}/v1/kv/{path}?keys&recurse&wait={wait}&index={index}";
- public static final ParameterizedTypeReference> RESPONSE_TYPE = new ParameterizedTypeReference>() {
- };
+ private static Log LOG = LogFactory.getLog(ConsulEnvironmentWatch.class);
private RestTemplate restTemplate = new RestTemplate();
@@ -66,12 +94,12 @@ public class ConsulEnvironmentWatch implements EnvironmentWatch {
params.add(String.valueOf(this.port));
params.add(this.path);
params.add(this.wait);
- params.add (StringUtils.hasText(state) ? state : "");
+ params.add(StringUtils.hasText(state) ? state : "");
try {
HttpHeaders headers = new HttpHeaders();
- if (StringUtils.hasText(token)) {
- headers.add(CONSUL_TOKEN, token);
+ if (StringUtils.hasText(this.token)) {
+ headers.add(CONSUL_TOKEN, this.token);
}
HttpEntity