From 1552759584d1017d02bce606876d192efe9e605d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 3 Feb 2014 17:26:10 -0800 Subject: [PATCH] Fix package tangle by moving AsciiBytes --- .../main/java/org/springframework/boot/loader/JarLauncher.java | 1 + .../org/springframework/boot/loader/PropertiesLauncher.java | 1 + .../main/java/org/springframework/boot/loader/WarLauncher.java | 1 + .../java/org/springframework/boot/loader/archive/Archive.java | 2 +- .../springframework/boot/loader/archive/ExplodedArchive.java | 2 +- .../springframework/boot/loader/archive/FilteredArchive.java | 2 +- .../org/springframework/boot/loader/archive/JarFileArchive.java | 2 +- .../java/org/springframework/boot/loader/jar/JarEntryData.java | 2 +- .../org/springframework/boot/loader/jar/JarEntryFilter.java | 2 +- .../main/java/org/springframework/boot/loader/jar/JarFile.java | 2 +- .../org/springframework/boot/loader/{ => util}/AsciiBytes.java | 2 +- .../java/org/springframework/boot/loader/AsciiBytesTests.java | 1 + .../boot/loader/archive/ExplodedArchiveTests.java | 2 +- .../boot/loader/archive/JarFileArchiveTests.java | 2 +- .../java/org/springframework/boot/loader/jar/JarFileTests.java | 2 +- 15 files changed, 15 insertions(+), 11 deletions(-) rename spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/{ => util}/AsciiBytes.java (98%) diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarLauncher.java index 23f1ff021f0..10569575a1d 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarLauncher.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarLauncher.java @@ -19,6 +19,7 @@ package org.springframework.boot.loader; import java.util.List; import org.springframework.boot.loader.archive.Archive; +import org.springframework.boot.loader.util.AsciiBytes; /** * {@link Launcher} for JAR based archives. This launcher assumes that dependency jars are diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java index 7751f8cb9cf..c2921e0ccfc 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java @@ -42,6 +42,7 @@ import org.springframework.boot.loader.archive.Archive.EntryFilter; import org.springframework.boot.loader.archive.ExplodedArchive; import org.springframework.boot.loader.archive.FilteredArchive; import org.springframework.boot.loader.archive.JarFileArchive; +import org.springframework.boot.loader.util.AsciiBytes; import org.springframework.boot.loader.util.SystemPropertyUtils; /** diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/WarLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/WarLauncher.java index 7b764a125ee..56c8b4fe346 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/WarLauncher.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/WarLauncher.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.List; import org.springframework.boot.loader.archive.Archive; +import org.springframework.boot.loader.util.AsciiBytes; /** * {@link Launcher} for WAR based archives. This launcher for standard WAR archives. diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java index 0ddb0534d1a..da4c455febe 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java @@ -23,8 +23,8 @@ import java.util.Collection; import java.util.List; import java.util.jar.Manifest; -import org.springframework.boot.loader.AsciiBytes; import org.springframework.boot.loader.Launcher; +import org.springframework.boot.loader.util.AsciiBytes; /** * An archive that can be launched by the {@link Launcher}. diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java index 763a34f97f2..b5b862ecb88 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; import java.util.jar.Manifest; -import org.springframework.boot.loader.AsciiBytes; +import org.springframework.boot.loader.util.AsciiBytes; /** * {@link Archive} implementation backed by an exploded archive directory. diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/FilteredArchive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/FilteredArchive.java index 7e4d6e48483..ad6c84f8131 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/FilteredArchive.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/FilteredArchive.java @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.List; import java.util.jar.Manifest; -import org.springframework.boot.loader.AsciiBytes; +import org.springframework.boot.loader.util.AsciiBytes; /** * Decorator to apply an {@link Archive.EntryFilter} to an existing {@link Archive}. diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java index 009721bc873..f55aff6821b 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java @@ -27,10 +27,10 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.jar.Manifest; -import org.springframework.boot.loader.AsciiBytes; import org.springframework.boot.loader.jar.JarEntryData; import org.springframework.boot.loader.jar.JarEntryFilter; import org.springframework.boot.loader.jar.JarFile; +import org.springframework.boot.loader.util.AsciiBytes; /** * {@link Archive} implementation backed by a {@link JarFile}. diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java index 01a68eda0ba..cdf75592732 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java @@ -21,9 +21,9 @@ import java.io.InputStream; import java.lang.ref.SoftReference; import java.util.zip.ZipEntry; -import org.springframework.boot.loader.AsciiBytes; import org.springframework.boot.loader.data.RandomAccessData; import org.springframework.boot.loader.data.RandomAccessData.ResourceAccess; +import org.springframework.boot.loader.util.AsciiBytes; /** * Holds the underlying data of a {@link JarEntry}, allowing creation to be deferred until diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java index 53284716ddb..f5b0792dd9e 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java @@ -16,7 +16,7 @@ package org.springframework.boot.loader.jar; -import org.springframework.boot.loader.AsciiBytes; +import org.springframework.boot.loader.util.AsciiBytes; /** * Interface that can be used to filter and optionally rename jar entries. diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java index b110c58741e..78c417ce74e 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java @@ -34,10 +34,10 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; import java.util.zip.ZipEntry; -import org.springframework.boot.loader.AsciiBytes; import org.springframework.boot.loader.data.RandomAccessData; import org.springframework.boot.loader.data.RandomAccessData.ResourceAccess; import org.springframework.boot.loader.data.RandomAccessDataFile; +import org.springframework.boot.loader.util.AsciiBytes; /** * Extended variant of {@link java.util.jar.JarFile} that behaves in the same way but diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/AsciiBytes.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/AsciiBytes.java similarity index 98% rename from spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/AsciiBytes.java rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/AsciiBytes.java index 980619cc6b0..be24bf8d565 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/AsciiBytes.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/AsciiBytes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.loader; +package org.springframework.boot.loader.util; import java.nio.charset.Charset; diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AsciiBytesTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AsciiBytesTests.java index 1ac23ef8c85..dbca694acbc 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AsciiBytesTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AsciiBytesTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.loader; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.loader.util.AsciiBytes; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java index 9352f0b4eba..79a398b8366 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java @@ -33,9 +33,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.loader.AsciiBytes; import org.springframework.boot.loader.TestJarCreator; import org.springframework.boot.loader.archive.Archive.Entry; +import org.springframework.boot.loader.util.AsciiBytes; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java index d8f93e71684..54af9b90ba2 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java @@ -25,9 +25,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.loader.AsciiBytes; import org.springframework.boot.loader.TestJarCreator; import org.springframework.boot.loader.archive.Archive.Entry; +import org.springframework.boot.loader.util.AsciiBytes; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java index 78448c19737..8798611a092 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java @@ -31,9 +31,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.loader.AsciiBytes; import org.springframework.boot.loader.TestJarCreator; import org.springframework.boot.loader.data.RandomAccessDataFile; +import org.springframework.boot.loader.util.AsciiBytes; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan;