Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Phillip Webb 2015-07-09 10:37:21 -07:00
parent 68e54e1d5d
commit 4b17f3ceef
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
View File

@ -160,7 +160,6 @@ public class Repackager {
try { try {
final List<Library> unpackLibraries = new ArrayList<Library>(); final List<Library> unpackLibraries = new ArrayList<Library>();
final List<Library> standardLibraries = new ArrayList<Library>(); final List<Library> standardLibraries = new ArrayList<Library>();
libraries.doWithLibraries(new LibraryCallback() { libraries.doWithLibraries(new LibraryCallback() {
@Override @Override
public void library(Library library) throws IOException { public void library(Library library) throws IOException {

9
spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java
View File

@ -142,7 +142,6 @@ public class RepackagerTests {
Repackager repackager = new Repackager(file); Repackager repackager = new Repackager(file);
repackager.repackage(NO_LIBRARIES); repackager.repackage(NO_LIBRARIES);
repackager.repackage(NO_LIBRARIES); repackager.repackage(NO_LIBRARIES);
Manifest actualManifest = getManifest(file); Manifest actualManifest = getManifest(file);
assertThat(actualManifest.getMainAttributes().getValue("Main-Class"), assertThat(actualManifest.getMainAttributes().getValue("Main-Class"),
equalTo("org.springframework.boot.loader.JarLauncher")); equalTo("org.springframework.boot.loader.JarLauncher"));
@ -396,7 +395,7 @@ public class RepackagerTests {
@Test @Test
public void unpackLibrariesTakePrecedenceOverExistingSourceEntries() throws Exception { public void unpackLibrariesTakePrecedenceOverExistingSourceEntries() throws Exception {
final TestJarFile nested = new TestJarFile(this.temporaryFolder); TestJarFile nested = new TestJarFile(this.temporaryFolder);
nested.addClass("a/b/C.class", ClassWithoutMainMethod.class); nested.addClass("a/b/C.class", ClassWithoutMainMethod.class);
final File nestedFile = nested.getFile(); final File nestedFile = nested.getFile();
this.testJarFile.addFile("lib/" + nestedFile.getName(), nested.getFile()); this.testJarFile.addFile("lib/" + nestedFile.getName(), nested.getFile());
@ -411,7 +410,6 @@ public class RepackagerTests {
} }
}); });
JarFile jarFile = new JarFile(file); JarFile jarFile = new JarFile(file);
try { try {
assertThat(jarFile.getEntry("lib/" + nestedFile.getName()).getComment(), assertThat(jarFile.getEntry("lib/" + nestedFile.getName()).getComment(),
@ -425,16 +423,14 @@ public class RepackagerTests {
@Test @Test
public void existingSourceEntriesTakePrecedenceOverStandardLibraries() public void existingSourceEntriesTakePrecedenceOverStandardLibraries()
throws Exception { throws Exception {
final TestJarFile nested = new TestJarFile(this.temporaryFolder); TestJarFile nested = new TestJarFile(this.temporaryFolder);
nested.addClass("a/b/C.class", ClassWithoutMainMethod.class); nested.addClass("a/b/C.class", ClassWithoutMainMethod.class);
final File nestedFile = nested.getFile(); final File nestedFile = nested.getFile();
this.testJarFile.addFile("lib/" + nestedFile.getName(), nested.getFile()); this.testJarFile.addFile("lib/" + nestedFile.getName(), nested.getFile());
this.testJarFile.addClass("A.class", ClassWithMainMethod.class); this.testJarFile.addClass("A.class", ClassWithMainMethod.class);
File file = this.testJarFile.getFile(); File file = this.testJarFile.getFile();
Repackager repackager = new Repackager(file); Repackager repackager = new Repackager(file);
long sourceLength = nestedFile.length(); long sourceLength = nestedFile.length();
repackager.repackage(new Libraries() { repackager.repackage(new Libraries() {
@Override @Override
@ -446,7 +442,6 @@ public class RepackagerTests {
} }
}); });
JarFile jarFile = new JarFile(file); JarFile jarFile = new JarFile(file);
try { try {
assertThat(jarFile.getEntry("lib/" + nestedFile.getName()).getSize(), assertThat(jarFile.getEntry("lib/" + nestedFile.getName()).getSize(),