From 4b17f3ceef842ba83258c49548145d8ade18ffd3 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 9 Jul 2015 10:37:21 -0700 Subject: [PATCH] Formatting --- .../springframework/boot/loader/tools/Repackager.java | 1 - .../boot/loader/tools/RepackagerTests.java | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java index 0ff3f14a40f..642cef6dbb0 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java @@ -160,7 +160,6 @@ public class Repackager { try { final List unpackLibraries = new ArrayList(); final List standardLibraries = new ArrayList(); - libraries.doWithLibraries(new LibraryCallback() { @Override public void library(Library library) throws IOException { diff --git a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java index 8b3a91ad5d0..eea9ee6bd85 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java @@ -142,7 +142,6 @@ public class RepackagerTests { Repackager repackager = new Repackager(file); repackager.repackage(NO_LIBRARIES); repackager.repackage(NO_LIBRARIES); - Manifest actualManifest = getManifest(file); assertThat(actualManifest.getMainAttributes().getValue("Main-Class"), equalTo("org.springframework.boot.loader.JarLauncher")); @@ -396,7 +395,7 @@ public class RepackagerTests { @Test 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); final File nestedFile = nested.getFile(); this.testJarFile.addFile("lib/" + nestedFile.getName(), nested.getFile()); @@ -411,7 +410,6 @@ public class RepackagerTests { } }); - JarFile jarFile = new JarFile(file); try { assertThat(jarFile.getEntry("lib/" + nestedFile.getName()).getComment(), @@ -425,16 +423,14 @@ public class RepackagerTests { @Test public void existingSourceEntriesTakePrecedenceOverStandardLibraries() throws Exception { - final TestJarFile nested = new TestJarFile(this.temporaryFolder); + TestJarFile nested = new TestJarFile(this.temporaryFolder); nested.addClass("a/b/C.class", ClassWithoutMainMethod.class); final File nestedFile = nested.getFile(); this.testJarFile.addFile("lib/" + nestedFile.getName(), nested.getFile()); this.testJarFile.addClass("A.class", ClassWithMainMethod.class); File file = this.testJarFile.getFile(); Repackager repackager = new Repackager(file); - long sourceLength = nestedFile.length(); - repackager.repackage(new Libraries() { @Override @@ -446,7 +442,6 @@ public class RepackagerTests { } }); - JarFile jarFile = new JarFile(file); try { assertThat(jarFile.getEntry("lib/" + nestedFile.getName()).getSize(),