Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20911 from dreis2211

Browse Source 
* pr/20911:
  Fix unused parameters

Closes gh-20911
This commit is contained in:
Stephane Nicoll
2020-04-10 14:09:10 +02:00
parent 62ebe9c006 d4575bc122
commit b6076f5b10
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@ class DependencyCustomizerTests {
MockitoAnnotations.initMocks(this);
given(this.resolver.getGroupId("spring-boot-starter-logging")).willReturn("org.springframework.boot");
given(this.resolver.getArtifactId("spring-boot-starter-logging")).willReturn("spring-boot-starter-logging");
given(this.resolver.getVersion("spring-boot-starter-logging")).willReturn("1.2.3");
this.moduleNode.addClass(this.classNode);
this.dependencyCustomizer = new DependencyCustomizer(new GroovyClassLoader(getClass().getClassLoader()),
this.moduleNode, new DependencyResolutionContext() {
@@ -184,6 +185,7 @@ class DependencyCustomizerTests {
String classifier, String type, boolean transitive) {
assertThat(getMemberValue(annotationNode, "group")).isEqualTo(group);
assertThat(getMemberValue(annotationNode, "module")).isEqualTo(module);
assertThat(getMemberValue(annotationNode, "version")).isEqualTo(version);
if (type == null) {
assertThat(annotationNode.getMember("type")).isNull();
}

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

@@ -324,7 +324,7 @@ public abstract class Packager {
addBootBootAttributesForRepackagingLayout(attributes, (RepackagingLayout) layout);
}
else {
addBootBootAttributesForPlainLayout(attributes, layout);
addBootBootAttributesForPlainLayout(attributes);
}
}
@@ -337,7 +337,7 @@ public abstract class Packager {
}
}
private void addBootBootAttributesForPlainLayout(Attributes attributes, Layout layout) {
private void addBootBootAttributesForPlainLayout(Attributes attributes) {
attributes.putValue(BOOT_CLASSES_ATTRIBUTE, getLayout().getClassesLocation());
putIfHasLength(attributes, BOOT_LIB_ATTRIBUTE, getLayout().getLibraryLocation("", LibraryScope.COMPILE));
}

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

@@ -103,7 +103,7 @@ public class UndertowReactiveWebServerFactory extends AbstractReactiveWebServerF
handler = UndertowCompressionConfigurer.configureCompression(getCompression(), handler);
Closeable closeable = null;
if (isAccessLogEnabled()) {
AccessLogHandlerConfiguration accessLogHandlerConfiguration = configureAccessLogHandler(builder, handler);
AccessLogHandlerConfiguration accessLogHandlerConfiguration = configureAccessLogHandler(handler);
closeable = accessLogHandlerConfiguration.closeable;
handler = accessLogHandlerConfiguration.accessLogHandler;
}
@@ -147,7 +147,7 @@ public class UndertowReactiveWebServerFactory extends AbstractReactiveWebServerF
return builder;
}
private AccessLogHandlerConfiguration configureAccessLogHandler(Undertow.Builder builder, HttpHandler handler) {
private AccessLogHandlerConfiguration configureAccessLogHandler(HttpHandler handler) {
try {
createAccessLogDirectoryIfNecessary();
XnioWorker worker = createWorker();