Skip to content

Commit 5ba86a1

Browse files
committed
Polish
1 parent 2ba2cfe commit 5ba86a1

File tree

6 files changed

+28
-24
lines changed

6 files changed

+28
-24
lines changed

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import static org.junit.Assert.assertTrue;
2222

2323
/**
24+
* Tests for {@link SpringBootWebSecurityConfiguration}.
25+
*
2426
* @author Dave Syer
2527
*/
2628
public class SpringBootWebSecurityConfigurationTests {

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@ content into your application; rather pick only the properties that you need.
221221
liquibase.default-schema= # default database schema to use
222222
liquibase.drop-first=false
223223
liquibase.enabled=true
224+
liquibase.url= # specific JDBC url (if not set the default datasource is used)
225+
liquibase.user= # user name for liquibase.url
226+
liquibase.password= # password for liquibase.url
224227
225228
# JMX
226229
spring.jmx.enabled=true # Expose MBeans from Spring

spring-boot-docs/src/main/asciidoc/howto.adoc

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,25 +1394,27 @@ You will get the best results if you put this in a nested class, or a standalone
13941394
order of instantiation). The {github-code}/spring-boot-samples/spring-boot-sample-web-secure[secure web sample]
13951395
is a useful template to follow.
13961396

1397-
If you experience instantiation issues (e.g. using JDBC or JPA for the
1398-
user detail store) it might be worth extracting the
1399-
`AuthenticationManagerBuilder` callback into a
1400-
`GlobalAuthenticationConfigurerAdapter` (in the `init()` method so it
1401-
happens before the authentication manager is needed elsewhere), e.g.
1397+
If you experience instantiation issues (e.g. using JDBC or JPA for the user detail store)
1398+
it might be worth extracting the `AuthenticationManagerBuilder` callback into a
1399+
`GlobalAuthenticationConfigurerAdapter` (in the `init()` method so it happens before the
1400+
authentication manager is needed elsewhere), e.g.
14021401

14031402
[source,java,indent=0,subs="verbatim,quotes,attributes"]
14041403
----
1405-
@Configuration
1406-
public class AuthenticationManagerConfiguration extends
1407-
GlobalAuthenticationConfigurerAdapter {
1408-
@Override
1409-
public void init(AuthenticationManagerBuilder auth) {
1410-
auth.inMemoryAuthentication() // ... etc.
1411-
}
1412-
}
1404+
@Configuration
1405+
public class AuthenticationManagerConfiguration extends
1406+
1407+
GlobalAuthenticationConfigurerAdapter {
1408+
@Override
1409+
public void init(AuthenticationManagerBuilder auth) {
1410+
auth.inMemoryAuthentication() // ... etc.
1411+
}
1412+
1413+
}
14131414
----
14141415

14151416

1417+
14161418
[[howto-enable-https]]
14171419
=== Enable HTTPS when running behind a proxy server
14181420
Ensuring that all your main endpoints are only available over HTTPS is an important

spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ exposed. For example, you could add the following to your `application.propertie
199199

200200
[[production-ready-application-info-automatic-expansion]]
201201
==== Automatically expand info properties at build time
202-
Rather than hardcoding some properties that are also specified in your project's
203-
build configuration, you can automatically expand info properties using the
204-
existing build configuration instead. This is possible in both Maven and Gradle.
202+
Rather than hardcoding some properties that are also specified in your project's build
203+
configuration, you can automatically expand info properties using the existing build
204+
configuration instead. This is possible in both Maven and Gradle.
205205

206206

207207

@@ -246,9 +246,9 @@ the Java plugin's `processResources` task to do so:
246246

247247
[source,groovy,indent=0]
248248
----
249-
processResources {
250-
expand(project.properties)
251-
}
249+
processResources {
250+
expand(project.properties)
251+
}
252252
----
253253

254254
You can then refer to your Gradle project's properties via placeholders, e.g.

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ For example, the following YAML document:
369369
[source,yaml,indent=0]
370370
----
371371
environments:
372-
dev:
372+
dev:`
373373
url: http://dev.bar.com
374374
name: Developer Setup
375375
prod:

spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/run/RunPluginFeatures.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,7 @@ public Object call() throws Exception {
7878
if (project.hasProperty("applicationDefaultJvmArgs")) {
7979
return project.property("applicationDefaultJvmArgs");
8080
}
81-
else {
82-
return Collections.emptyList();
83-
}
84-
81+
return Collections.emptyList();
8582
}
8683
});
8784
}

0 commit comments

Comments
 (0)