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

Remove support for module layout

Browse Source 
Closes gh-8107
This commit is contained in:
Andy Wilkinson
2017-01-25 16:49:37 +00:00
parent 3ce6d8e5b5
commit bdf903896f
8 changed files with 0 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java
View File

@@ -17,12 +17,9 @@
package org.springframework.boot.loader.tools;
import java.io.File;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
/**
* Common {@link Layout}s.
@@ -156,40 +153,4 @@ public final class Layouts {
}
/**
* Module layout (designed to be used as a "plug-in").
* @deprecated since 1.5 in favour of a custom {@link LayoutFactory}
*/
@Deprecated
public static class Module implements Layout {
private static final Set<LibraryScope> LIB_DESTINATION_SCOPES = new HashSet<LibraryScope>(
Arrays.asList(LibraryScope.COMPILE, LibraryScope.RUNTIME,
LibraryScope.CUSTOM));
@Override
public String getLauncherClassName() {
return null;
}
@Override
public String getLibraryDestination(String libraryName, LibraryScope scope) {
if (LIB_DESTINATION_SCOPES.contains(scope)) {
return "lib/";
}
return null;
}
@Override
public String getClassesLocation() {
return "";
}
@Override
public boolean isExecutable() {
return false;
}
}
}

14
spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java
View File

@@ -86,18 +86,4 @@ public class LayoutsTests {
.isEqualTo("WEB-INF/lib/");
}
@Test
@SuppressWarnings("deprecation")
public void moduleLayout() throws Exception {
Layout layout = new Layouts.Module();
assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.COMPILE))
.isEqualTo("lib/");
assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.PROVIDED))
.isNull();
assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.RUNTIME))
.isEqualTo("lib/");
assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.CUSTOM))
.isEqualTo("lib/");
}
}