Skip to content

Commit 8054426

Browse files
author
Phillip Webb
committed
Format source code
1 parent fa88c48 commit 8054426

File tree

11 files changed

+38
-27
lines changed

11 files changed

+38
-27
lines changed

spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
public class SampleParentContextApplication {
3131

3232
public static void main(String[] args) throws Exception {
33-
new SpringApplicationBuilder(Parent.class).child(SampleParentContextApplication.class).run(args);
33+
new SpringApplicationBuilder(Parent.class).child(
34+
SampleParentContextApplication.class).run(args);
3435
}
3536

3637
@EnableAutoConfiguration

spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/consumer/SampleIntegrationApplicationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
import sample.parent.SampleParentContextApplication;
3535
import sample.parent.producer.ProducerApplication;
36+
3637
import static org.junit.Assert.assertTrue;
3738

3839
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.springframework.boot.dependency.tools.PropertiesFileDependencies;
3232

3333
/**
34-
* Utility to provide access to {@link ManagedDependencies} with support for version
35-
* file overrides.
34+
* Utility to provide access to {@link ManagedDependencies} with support for version file
35+
* overrides.
3636
*
3737
* @author Phillip Webb
3838
*/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ private void libraries(LibraryScope scope, Set<ResolvedArtifact> artifacts,
123123
LibraryCallback callback) throws IOException {
124124
if (artifacts != null) {
125125
for (ResolvedArtifact artifact : artifacts) {
126-
callback.library(new Library(artifact.getFile(), scope, isUnpackRequired(artifact)));
126+
callback.library(new Library(artifact.getFile(), scope,
127+
isUnpackRequired(artifact)));
127128
}
128129
}
129130
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ private void addRepackageTask(Project project) {
5555
+ "archives so that they can be executed from the command "
5656
+ "line using 'java -jar'");
5757
task.setGroup(BasePlugin.BUILD_GROUP);
58-
task.dependsOn(project.getConfigurations().getByName(
59-
Dependency.ARCHIVES_CONFIGURATION).getAllArtifacts().getBuildDependencies());
58+
task.dependsOn(project.getConfigurations()
59+
.getByName(Dependency.ARCHIVES_CONFIGURATION).getAllArtifacts()
60+
.getBuildDependencies());
6061
registerOutput(project, task);
6162
ensureTaskRunsOnAssembly(project, task);
6263
}
@@ -68,7 +69,7 @@ public void execute(Project project) {
6869
project.getTasks().withType(Jar.class,
6970
new RegisterInputsOutputsAction(task));
7071
Object withJar = task.getWithJarTask();
71-
if (withJar!=null) {
72+
if (withJar != null) {
7273
task.dependsOn(withJar);
7374
}
7475
}
@@ -83,8 +84,8 @@ private void ensureTaskRunsOnAssembly(Project project, Task task) {
8384
* Register BootRepackage so that we can use task {@code foo(type: BootRepackage)}.
8485
*/
8586
private void registerRepackageTaskProperty(Project project) {
86-
project.getExtensions().getExtraProperties().set("BootRepackage",
87-
RepackageTask.class);
87+
project.getExtensions().getExtraProperties()
88+
.set("BootRepackage", RepackageTask.class);
8889
}
8990

9091
/**
@@ -135,6 +136,7 @@ private void setupInputOutputs(Jar jarTask, String classifier) {
135136
private void addLibraryDependencies(final RepackageTask task) {
136137
try {
137138
task.getLibraries().doWithLibraries(new LibraryCallback() {
139+
@Override
138140
public void library(Library library) throws IOException {
139141
task.getInputs().file(library.getFile());
140142
}

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ public ProjectLibraries getLibraries() {
9797
}
9898
if (this.customConfiguration != null) {
9999
libraries.setCustomConfigurationName(this.customConfiguration);
100-
} else if (extension.getCustomConfiguration() != null) {
100+
}
101+
else if (extension.getCustomConfiguration() != null) {
101102
libraries.setCustomConfigurationName(extension.getCustomConfiguration());
102103
}
103104
return libraries;
@@ -180,11 +181,13 @@ private void setMainClass(Repackager repackager) {
180181
String mainClass = (String) getProject().property("mainClassName");
181182
if (RepackageTask.this.mainClass != null) {
182183
mainClass = RepackageTask.this.mainClass;
183-
} else if (this.extension.getMainClass() != null) {
184+
}
185+
else if (this.extension.getMainClass() != null) {
184186
mainClass = this.extension.getMainClass();
185-
} else if (getProject().getTasks().getByName("run").hasProperty("main")) {
186-
mainClass = (String) getProject().getTasks().getByName("run").property(
187-
"main");
187+
}
188+
else if (getProject().getTasks().getByName("run").hasProperty("main")) {
189+
mainClass = (String) getProject().getTasks().getByName("run")
190+
.property("main");
188191
}
189192
getLogger().info("Setting mainClass: " + mainClass);
190193
repackager.setMainClass(mainClass);
@@ -205,7 +208,8 @@ protected String findMainMethod(java.util.jar.JarFile source) throws IOException
205208
long startTime = System.currentTimeMillis();
206209
try {
207210
return super.findMainMethod(source);
208-
} finally {
211+
}
212+
finally {
209213
long duration = System.currentTimeMillis() - startTime;
210214
if (duration > FIND_WARNING_TIMEOUT) {
211215
getLogger().warn(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public class BootRunTask extends JavaExec {
3838
@Override
3939
public void exec() {
4040
SourceSet mainSourceSet = SourceSets.findMainSourceSet(getProject());
41-
final File outputDir = (mainSourceSet == null ? null
42-
: mainSourceSet.getOutput().getResourcesDir());
41+
final File outputDir = (mainSourceSet == null ? null : mainSourceSet.getOutput()
42+
.getResourcesDir());
4343
final Set<File> resources = new LinkedHashSet<File>();
4444
if (mainSourceSet != null) {
4545
resources.addAll(mainSourceSet.getResources().getSrcDirs());

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
package org.springframework.boot.gradle.run;
32

43
import java.io.IOException;
@@ -41,8 +40,8 @@ private String findMainClass() {
4140
mainClass = bootExtension.getMainClass();
4241
}
4342

44-
ApplicationPluginConvention application = (ApplicationPluginConvention) project.getConvention().getPlugins().get(
45-
"application");
43+
ApplicationPluginConvention application = (ApplicationPluginConvention) project
44+
.getConvention().getPlugins().get("application");
4645
// Try the Application extension setting
4746
if (mainClass == null && application.getMainClassName() != null) {
4847
mainClass = application.getMainClassName();
@@ -61,9 +60,11 @@ private String findMainClass() {
6160
"Looking for main in: "
6261
+ mainSourceSet.getOutput().getClassesDir());
6362
try {
64-
mainClass = MainClassFinder.findSingleMainClass(mainSourceSet.getOutput().getClassesDir());
63+
mainClass = MainClassFinder.findSingleMainClass(mainSourceSet
64+
.getOutput().getClassesDir());
6565
project.getLogger().info("Computed main class: " + mainClass);
66-
} catch (IOException ex) {
66+
}
67+
catch (IOException ex) {
6768
throw new IllegalStateException("Cannot find main class", ex);
6869
}
6970
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private void mainClassNameFinder(Project project) {
4848
project.getTasks().all(new Action<Task>() {
4949
@Override
5050
public void execute(Task task) {
51-
if(task instanceof JavaExec || task instanceof CreateStartScripts) {
51+
if (task instanceof JavaExec || task instanceof CreateStartScripts) {
5252
task.dependsOn(FIND_MAIN_CLASS_TASK_NAME);
5353
}
5454
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static SourceSet findMainSourceSet(Project project) {
4242
private static Iterable<SourceSet> getJavaSourceSets(Project project) {
4343
JavaPluginConvention plugin = project.getConvention().getPlugin(
4444
JavaPluginConvention.class);
45-
if(plugin == null) {
45+
if (plugin == null) {
4646
return Collections.emptyList();
4747
}
4848
return plugin.getSourceSets();

0 commit comments

Comments
 (0)