root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Fix unused parameters 

See gh-20911
This commit is contained in:
dreis2211 2020-04-10 13:11:38 +02:00 committed by Stephane Nicoll
parent 62ebe9c006
commit d4575bc122
3 changed files with 6 additions and 4 deletions
Show Stats 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); MockitoAnnotations.initMocks(this);
given(this.resolver.getGroupId("spring-boot-starter-logging")).willReturn("org.springframework.boot"); 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.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.moduleNode.addClass(this.classNode);
this.dependencyCustomizer = new DependencyCustomizer(new GroovyClassLoader(getClass().getClassLoader()), this.dependencyCustomizer = new DependencyCustomizer(new GroovyClassLoader(getClass().getClassLoader()),
this.moduleNode, new DependencyResolutionContext() { this.moduleNode, new DependencyResolutionContext() {
@ -184,6 +185,7 @@ class DependencyCustomizerTests {
String classifier, String type, boolean transitive) { String classifier, String type, boolean transitive) {
assertThat(getMemberValue(annotationNode, "group")).isEqualTo(group); assertThat(getMemberValue(annotationNode, "group")).isEqualTo(group);
assertThat(getMemberValue(annotationNode, "module")).isEqualTo(module); assertThat(getMemberValue(annotationNode, "module")).isEqualTo(module);
assertThat(getMemberValue(annotationNode, "version")).isEqualTo(version);
if (type == null) { if (type == null) {
assertThat(annotationNode.getMember("type")).isNull(); 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); addBootBootAttributesForRepackagingLayout(attributes, (RepackagingLayout) layout);
} }
else { 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()); attributes.putValue(BOOT_CLASSES_ATTRIBUTE, getLayout().getClassesLocation());
putIfHasLength(attributes, BOOT_LIB_ATTRIBUTE, getLayout().getLibraryLocation("", LibraryScope.COMPILE)); 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); handler = UndertowCompressionConfigurer.configureCompression(getCompression(), handler);
Closeable closeable = null; Closeable closeable = null;
if (isAccessLogEnabled()) { if (isAccessLogEnabled()) {
AccessLogHandlerConfiguration accessLogHandlerConfiguration = configureAccessLogHandler(builder, handler); AccessLogHandlerConfiguration accessLogHandlerConfiguration = configureAccessLogHandler(handler);
closeable = accessLogHandlerConfiguration.closeable; closeable = accessLogHandlerConfiguration.closeable;
handler = accessLogHandlerConfiguration.accessLogHandler; handler = accessLogHandlerConfiguration.accessLogHandler;
} }
@ -147,7 +147,7 @@ public class UndertowReactiveWebServerFactory extends AbstractReactiveWebServerF
return builder; return builder;
} }
private AccessLogHandlerConfiguration configureAccessLogHandler(Undertow.Builder builder, HttpHandler handler) { private AccessLogHandlerConfiguration configureAccessLogHandler(HttpHandler handler) {
try { try {
createAccessLogDirectoryIfNecessary(); createAccessLogDirectoryIfNecessary();
XnioWorker worker = createWorker(); XnioWorker worker = createWorker();