Skip to content

Commit b6076f5

Browse files
committed
Merge pull request #20911 from dreis2211
* pr/20911: Fix unused parameters Closes gh-20911
2 parents 62ebe9c + d4575bc commit b6076f5

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/DependencyCustomizerTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ void setUp() {
5757
MockitoAnnotations.initMocks(this);
5858
given(this.resolver.getGroupId("spring-boot-starter-logging")).willReturn("org.springframework.boot");
5959
given(this.resolver.getArtifactId("spring-boot-starter-logging")).willReturn("spring-boot-starter-logging");
60+
given(this.resolver.getVersion("spring-boot-starter-logging")).willReturn("1.2.3");
6061
this.moduleNode.addClass(this.classNode);
6162
this.dependencyCustomizer = new DependencyCustomizer(new GroovyClassLoader(getClass().getClassLoader()),
6263
this.moduleNode, new DependencyResolutionContext() {
@@ -184,6 +185,7 @@ private void assertGrabAnnotation(AnnotationNode annotationNode, String group, S
184185
String classifier, String type, boolean transitive) {
185186
assertThat(getMemberValue(annotationNode, "group")).isEqualTo(group);
186187
assertThat(getMemberValue(annotationNode, "module")).isEqualTo(module);
188+
assertThat(getMemberValue(annotationNode, "version")).isEqualTo(version);
187189
if (type == null) {
188190
assertThat(annotationNode.getMember("type")).isNull();
189191
}

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ private void addBootAttributes(Attributes attributes) {
324324
addBootBootAttributesForRepackagingLayout(attributes, (RepackagingLayout) layout);
325325
}
326326
else {
327-
addBootBootAttributesForPlainLayout(attributes, layout);
327+
addBootBootAttributesForPlainLayout(attributes);
328328
}
329329
}
330330

@@ -337,7 +337,7 @@ private void addBootBootAttributesForRepackagingLayout(Attributes attributes, Re
337337
}
338338
}
339339

340-
private void addBootBootAttributesForPlainLayout(Attributes attributes, Layout layout) {
340+
private void addBootBootAttributesForPlainLayout(Attributes attributes) {
341341
attributes.putValue(BOOT_CLASSES_ATTRIBUTE, getLayout().getClassesLocation());
342342
putIfHasLength(attributes, BOOT_LIB_ATTRIBUTE, getLayout().getLibraryLocation("", LibraryScope.COMPILE));
343343
}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowReactiveWebServerFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public WebServer getWebServer(org.springframework.http.server.reactive.HttpHandl
103103
handler = UndertowCompressionConfigurer.configureCompression(getCompression(), handler);
104104
Closeable closeable = null;
105105
if (isAccessLogEnabled()) {
106-
AccessLogHandlerConfiguration accessLogHandlerConfiguration = configureAccessLogHandler(builder, handler);
106+
AccessLogHandlerConfiguration accessLogHandlerConfiguration = configureAccessLogHandler(handler);
107107
closeable = accessLogHandlerConfiguration.closeable;
108108
handler = accessLogHandlerConfiguration.accessLogHandler;
109109
}
@@ -147,7 +147,7 @@ private Undertow.Builder createBuilder(int port) {
147147
return builder;
148148
}
149149

150-
private AccessLogHandlerConfiguration configureAccessLogHandler(Undertow.Builder builder, HttpHandler handler) {
150+
private AccessLogHandlerConfiguration configureAccessLogHandler(HttpHandler handler) {
151151
try {
152152
createAccessLogDirectoryIfNecessary();
153153
XnioWorker worker = createWorker();

0 commit comments

Comments
 (0)