Skip to content

Commit

Permalink
Polish
Browse files Browse the repository at this point in the history
  • Loading branch information
izeye authored and snicoll committed Sep 12, 2019
1 parent 99960b0 commit 5b41c3b
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 22 deletions.
2 changes: 1 addition & 1 deletion SUPPORT.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ reproduces the problem.
== Stack Overflow
The Spring Boot community monitors the
https://stackoverflow.com/tags/spring-boot[`spring-boot`] tag on Stack Overflow. Before
asking a question, please familiar yourself with Stack Overflow's
asking a question, please familiarize yourself with Stack Overflow's
https://stackoverflow.com/help/how-to-ask[advice on how to ask a good question].

== Gitter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapter;

/**
* Adapter to convert {@link KairosProperties} to an {@link KairosConfig}.
* Adapter to convert {@link KairosProperties} to a {@link KairosConfig}.
*
* @author Stephane Nicoll
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ protected AppOpticsPropertiesConfigAdapter createConfigAdapter(AppOpticsProperti
}

@Test
void whenPropertiesUrisIsSetAdapterUriReturnsIt() {
void whenPropertiesUriIsSetAdapterUriReturnsIt() {
AppOpticsProperties properties = createProperties();
properties.setUri("https://appoptics.example.com/v1/measurements");
assertThat(createConfigAdapter(properties).uri()).isEqualTo("https://appoptics.example.com/v1/measurements");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,16 @@ static class CustomConfigConfiguration {
@Bean
DynatraceConfig customConfig() {
return (key) -> {
if ("dynatrace.uri".equals(key)) {
switch (key) {
case "dynatrace.uri":
return "https://dynatrace.example.com";
}
if ("dynatrace.apiToken".equals(key)) {
case "dynatrace.apiToken":
return "abcde";
}
if ("dynatrace.deviceId".equals(key)) {
case "dynatrace.deviceId":
return "test";
default:
return null;
}
return null;
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ protected KairosPropertiesConfigAdapter createConfigAdapter(KairosProperties pro
}

@Test
void whenPropertiesUrisIsSetAdapterUriReturnsIt() {
void whenPropertiesUriIsSetAdapterUriReturnsIt() {
KairosProperties properties = createProperties();
properties.setUri("https://kairos.example.com:8080/api/v1/datapoints");
assertThat(createConfigAdapter(properties).uri())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ static class ReactiveSessionRepositoryConfiguration {
}

/**
* Customization log for {@link SpringSessionRememberMeServices} that is only
* instantiated when Spring Security is on the classpath.
* Customization for {@link SpringSessionRememberMeServices} that is only instantiated
* when Spring Security is on the classpath.
*/
static class RememberMeServicesCookieSerializerCustomizer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ OpenEntityManagerInViewFilter openEntityManagerInViewFilter() {
static class TestFilterRegistrationConfiguration {

@Bean
FilterRegistrationBean<OpenEntityManagerInViewFilter> OpenEntityManagerInViewFilterFilterRegistrationBean() {
FilterRegistrationBean<OpenEntityManagerInViewFilter> openEntityManagerInViewFilterFilterRegistrationBean() {
return new FilterRegistrationBean<>();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ In order to document default values for properties in the class above, you could
{"properties": [
{
"name": "acme.messaging.addresses",
"defaultValue": ["a, b"]
"defaultValue": ["a", "b"]
},
{
"name": "acme.messaging.container-type",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ The following `HealthIndicators` are auto-configured by Spring Boot when appropr
| Checks that an Elasticsearch cluster is up.

| {spring-boot-actuator-module-code}/hazelcast/HazelcastHealthIndicator.java[`HazelcastHealthIndicator`]
| Checks that an Hazelcast server is up.
| Checks that a Hazelcast server is up.

| {spring-boot-actuator-module-code}/influx/InfluxDbHealthIndicator.java[`InfluxDbHealthIndicator`]
| Checks that an InfluxDB server is up.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3984,7 +3984,7 @@ You can configure the uri and credentials to use by setting the `spring.data.neo
spring.data.neo4j.password=secret
----

You can take full control over the session creation by either adding a `org.neo4j.ogm.config.Configuration` bean or a `org.neo4j.ogm.session.SessionFactory` bean.
You can take full control over the session creation by adding either an `org.neo4j.ogm.config.Configuration` bean or an `org.neo4j.ogm.session.SessionFactory` bean.



Expand Down
2 changes: 1 addition & 1 deletion spring-boot-project/spring-boot-starters/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ do as they were designed before this was clarified.
| https://orika-mapper.github.io/orika-docs/[Orika]
| https://github.com/akihyro/orika-spring-boot-starter

| https://pebbletemplates.io/[Pebbles Templates]
| https://pebbletemplates.io/[Pebble Templates]
| https://github.com/PebbleTemplates/pebble

| https://picocli.info/[picocli]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,12 @@ public void classpath(Object... classpath) {
classpath);
}

@Override
public void setClasspath(Object classpath) {
this.classpath = getProject().files(classpath);
}

@Override
public void setClasspath(FileCollection classpath) {
this.classpath = getProject().files(classpath);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public Binder(Iterable<ConfigurationPropertySource> sources, PlaceholdersResolve
* @param propertyEditorInitializer initializer used to configure the property editors
* that can convert values (or {@code null} if no initialization is required). Often
* used to call {@link ConfigurableListableBeanFactory#copyRegisteredEditorsTo}.
* @param defaultBindHandler the default bind handler to use if non is specified when
* @param defaultBindHandler the default bind handler to use if none is specified when
* binding
* @since 2.2.0
*/
Expand Down Expand Up @@ -469,7 +469,7 @@ public static Binder get(Environment environment) {
* Create a new {@link Binder} instance from the specified environment.
* @param environment the environment source (must have attached
* {@link ConfigurationPropertySources})
* @param defaultBindHandler the default bind handler to use if non is specified when
* @param defaultBindHandler the default bind handler to use if none is specified when
* binding
* @return a {@link Binder} instance
* @since 2.2.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ void bindToJavaBeanShouldTriggerOnSuccess() {
}

@Test
void bindWhenHasCustomDefultHandlerShouldTriggerOnSuccess() {
void bindWhenHasCustomDefaultHandlerShouldTriggerOnSuccess() {
this.sources.add(new MockConfigurationPropertySource("foo.value", "bar", "line1"));
BindHandler handler = mock(BindHandler.class, Answers.CALLS_REAL_METHODS);
Binder binder = new Binder(this.sources, null, null, null, handler);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ void propertySourceOrderingWhenMultipleServletSpecificPropertySources() {
assertThat(this.environment.getPropertySources()).containsSequence(custom, json, servlet, jndi);
}

private void testServletPropertySource(String servletContextPropertySourceName) {
this.environment.getPropertySources().addFirst(getPropertySource(servletContextPropertySourceName, "servlet"));
private void testServletPropertySource(String servletPropertySourceName) {
this.environment.getPropertySources().addFirst(getPropertySource(servletPropertySourceName, "servlet"));
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment,
"SPRING_APPLICATION_JSON={\"foo\":\"bar\"}");
this.processor.postProcessEnvironment(this.environment, null);
Expand Down

0 comments on commit 5b41c3b

Please sign in to comment.