Skip to content

Commit 1fd9c4d

Browse files
committed
Polish
Closes gh-30992
2 parents 075d01d + e8c508a commit 1fd9c4d

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,10 @@ private MavenExec addGeneratePluginDescriptorTask(Project project, Jar jarTask,
212212
File generatedHelpMojoDir = new File(project.getBuildDir(), "generated/sources/helpMojo");
213213
SourceSet mainSourceSet = getMainSourceSet(project);
214214
project.getTasks().withType(Javadoc.class, this::setJavadocOptions);
215-
FormatHelpMojoSource copyFormattedHelpMojoSourceTask = createFormatHelpMojoSourceTask(project,
216-
generateHelpMojoTask, generatedHelpMojoDir);
217-
project.getTasks().getByName(mainSourceSet.getCompileJavaTaskName()).dependsOn(copyFormattedHelpMojoSourceTask);
218-
mainSourceSet.java((javaSources) -> javaSources.srcDir(copyFormattedHelpMojoSourceTask));
215+
FormatHelpMojoSource formattedHelpMojoSource = createFormatHelpMojoSource(project, generateHelpMojoTask,
216+
generatedHelpMojoDir);
217+
project.getTasks().getByName(mainSourceSet.getCompileJavaTaskName()).dependsOn(formattedHelpMojoSource);
218+
mainSourceSet.java((javaSources) -> javaSources.srcDir(formattedHelpMojoSource));
219219
Sync pluginDescriptorInputs = createSyncPluginDescriptorInputs(project, pluginDescriptorDir, mainSourceSet);
220220
pluginDescriptorInputs.dependsOn(mainSourceSet.getClassesTaskName());
221221
MavenExec task = createGeneratePluginDescriptorTask(project, pluginDescriptorDir);
@@ -234,7 +234,7 @@ private void setJavadocOptions(Javadoc javadoc) {
234234
options.addMultilineStringsOption("tag").setValue(Arrays.asList("goal:X", "requiresProject:X", "threadSafe:X"));
235235
}
236236

237-
private FormatHelpMojoSource createFormatHelpMojoSourceTask(Project project, MavenExec generateHelpMojoTask,
237+
private FormatHelpMojoSource createFormatHelpMojoSource(Project project, MavenExec generateHelpMojoTask,
238238
File generatedHelpMojoDir) {
239239
FormatHelpMojoSource formatHelpMojoSource = project.getTasks().create("formatHelpMojoSource",
240240
FormatHelpMojoSource.class);
@@ -244,7 +244,7 @@ private FormatHelpMojoSource createFormatHelpMojoSourceTask(Project project, Mav
244244
}
245245

246246
private Sync createSyncPluginDescriptorInputs(Project project, File destination, SourceSet sourceSet) {
247-
Sync pluginDescriptorInputs = project.getTasks().create("copyPluginDescriptorInputs", Sync.class);
247+
Sync pluginDescriptorInputs = project.getTasks().create("syncPluginDescriptorInputs", Sync.class);
248248
pluginDescriptorInputs.setDestinationDir(destination);
249249
File pomFile = new File(project.getProjectDir(), "src/maven/resources/pom.xml");
250250
pluginDescriptorInputs.from(pomFile, (copy) -> replaceVersionPlaceholder(copy, project));

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.security.web.SecurityFilterChain;
3131

3232
/**
33-
* Configures a {@link OpaqueTokenIntrospector} when a token introspection endpoint is
33+
* Configures an {@link OpaqueTokenIntrospector} when a token introspection endpoint is
3434
* available. Also configures a {@link SecurityFilterChain} if a
3535
* {@link OpaqueTokenIntrospector} bean is found.
3636
*

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -131,7 +131,7 @@ public class LoggingApplicationListener implements GenericApplicationListener {
131131
public static final String LOG_FILE_BEAN_NAME = "springBootLogFile";
132132

133133
/**
134-
* The name of the{@link LoggerGroups} bean.
134+
* The name of the {@link LoggerGroups} bean.
135135
* @since 2.2.0
136136
*/
137137
public static final String LOGGER_GROUPS_BEAN_NAME = "springBootLoggerGroups";

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/OriginTrackedResource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public String toString() {
165165
* {@link WritableResource}.
166166
* @param resource the tracked resource
167167
* @param origin the origin of the resource
168-
* @return a {@link OriginTrackedWritableResource} instance
168+
* @return an {@link OriginTrackedWritableResource} instance
169169
*/
170170
public static OriginTrackedWritableResource of(WritableResource resource, Origin origin) {
171171
return (OriginTrackedWritableResource) of((Resource) resource, origin);
@@ -176,7 +176,7 @@ public static OriginTrackedWritableResource of(WritableResource resource, Origin
176176
* {@link Resource}.
177177
* @param resource the tracked resource
178178
* @param origin the origin of the resource
179-
* @return a {@link OriginTrackedResource} instance
179+
* @return an {@link OriginTrackedResource} instance
180180
*/
181181
public static OriginTrackedResource of(Resource resource, Origin origin) {
182182
if (resource instanceof WritableResource) {

0 commit comments

Comments
 (0)