Skip to content

Commit beaddb2

Browse files
author
Phillip Webb
committed
Polish
1 parent aa3f055 commit beaddb2

File tree

15 files changed

+33
-32
lines changed

15 files changed

+33
-32
lines changed

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ShellPropertiesTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013 the original author or authors.
2+
* Copyright 2013-2014 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,8 +26,6 @@
2626
import org.junit.Assert;
2727
import org.junit.Test;
2828
import org.springframework.beans.MutablePropertyValues;
29-
import org.springframework.boot.actuate.autoconfigure.CrshAutoConfiguration;
30-
import org.springframework.boot.actuate.autoconfigure.ShellProperties;
3129
import org.springframework.boot.actuate.autoconfigure.ShellProperties.CrshShellProperties;
3230
import org.springframework.boot.actuate.autoconfigure.ShellProperties.JaasAuthenticationProperties;
3331
import org.springframework.boot.actuate.autoconfigure.ShellProperties.KeyAuthenticationProperties;

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/CodahaleMetricWriterTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2013 the original author or authors.
2+
* Copyright 2012-2014 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -127,16 +127,16 @@ public boolean isFailed() {
127127
public void run() {
128128
for (int i = 0; i < 10000; i++) {
129129
try {
130-
Metric<Integer> metric1 = new Metric<Integer>(
131-
"timer.test.service", this.index);
130+
Metric<Integer> metric1 = new Metric<Integer>("timer.test.service",
131+
this.index);
132132
this.writer.set(metric1);
133133

134134
Metric<Integer> metric2 = new Metric<Integer>(
135135
"histogram.test.service", this.index);
136136
this.writer.set(metric2);
137137

138-
Metric<Integer> metric3 = new Metric<Integer>(
139-
"gauge.test.service", this.index);
138+
Metric<Integer> metric3 = new Metric<Integer>("gauge.test.service",
139+
this.index);
140140
this.writer.set(metric3);
141141
}
142142
catch (IllegalArgumentException iae) {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2013 the original author or authors.
2+
* Copyright 2012-2014 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -33,8 +33,7 @@
3333

3434
/**
3535
* {@link EnableAutoConfiguration Auto-configuration} that configures the
36-
* {@link ConfigurableEmbeddedServletContainer} from a {@link ServerProperties}
37-
* bean.
36+
* {@link ConfigurableEmbeddedServletContainer} from a {@link ServerProperties} bean.
3837
*
3938
* @author Dave Syer
4039
*/

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
/**
3838
* Tests for {@link JmsTemplateAutoConfiguration}.
39-
*
39+
*
4040
* @author Greg Turnquist
4141
*/
4242
public class JmsTemplateAutoConfigurationTests {

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2013 the original author or authors.
2+
* Copyright 2012-2014 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@
2525
import static org.junit.Assert.assertEquals;
2626

2727
/**
28+
* Tests for {@link MongoAutoConfiguration}.
29+
*
2830
* @author Dave Syer
2931
*/
3032
public class MongoAutoConfigurationTests {

spring-boot-cli/src/it/java/org/springframework/boot/cli/JarCommandIT.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@ public void jarCreation() throws Exception {
7575
assertThat(invocation.getErrorOutput(), equalTo(""));
7676
assertThat(invocation.getStandardOutput(), containsString("Hello World!"));
7777
assertThat(invocation.getStandardOutput(), containsString("/public/public.txt"));
78-
assertThat(invocation.getStandardOutput(), containsString("/resources/resource.txt"));
78+
assertThat(invocation.getStandardOutput(),
79+
containsString("/resources/resource.txt"));
7980
assertThat(invocation.getStandardOutput(), containsString("/static/static.txt"));
80-
assertThat(invocation.getStandardOutput(), containsString("/templates/template.txt"));
81+
assertThat(invocation.getStandardOutput(),
82+
containsString("/templates/template.txt"));
8183
}
8284
}

spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/sample/actuator/log4j/SampleActuatorApplicationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2013 the original author or authors.
2+
* Copyright 2012-2014 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
1616

1717
package sample.actuator.log4j;
1818

19-
import static org.junit.Assert.assertEquals;
20-
2119
import java.util.Map;
2220

2321
import org.junit.Test;
@@ -31,13 +29,15 @@
3129
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
3230
import org.springframework.test.context.web.WebAppConfiguration;
3331

32+
import static org.junit.Assert.assertEquals;
33+
3434
/**
3535
* Basic integration tests for service demo application.
3636
*
3737
* @author Dave Syer
3838
*/
3939
@RunWith(SpringJUnit4ClassRunner.class)
40-
@SpringApplicationConfiguration(classes=SampleActuatorApplication.class)
40+
@SpringApplicationConfiguration(classes = SampleActuatorApplication.class)
4141
@WebAppConfiguration
4242
@IntegrationTest
4343
@DirtiesContext

spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/ui/secure/SampleWebSecureApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public String foo() {
5252

5353
public static void main(String[] args) throws Exception {
5454
// Set user password to "password" for demo purposes only
55-
new SpringApplicationBuilder(SampleWebSecureApplication.class).properties("security.user.password=password").run(
56-
args);
55+
new SpringApplicationBuilder(SampleWebSecureApplication.class).properties(
56+
"security.user.password=password").run(args);
5757
}
5858

5959
@Override

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ private void applyRun(Project project) {
6868
enhanceRunTask(project);
6969
addRunAppTask(project);
7070
if (project.getTasks().withType(JavaExec.class).isEmpty()) {
71-
// Add the ApplicationPlugin so that a JavaExec task is available (run) to enhance
71+
// Add the ApplicationPlugin so that a JavaExec task is available (run) to
72+
// enhance
7273
project.getPlugins().apply(ApplicationPlugin.class);
7374
}
7475
}
@@ -111,7 +112,8 @@ private void addRunAppTask(Project project) {
111112
if (!project.getTasksByName("compileJava", false).isEmpty()) {
112113
if (!project.getTasksByName("compileGroovy", false).isEmpty()) {
113114
runJarTask.dependsOn("compileJava", "compileGroovy");
114-
} else {
115+
}
116+
else {
115117
runJarTask.dependsOn("compileJava");
116118
}
117119
}

spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2013 the original author or authors.
2+
* Copyright 2012-2014 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)