From 61ac04aa4cef67ca2261bd938f509865697b5a40 Mon Sep 17 00:00:00 2001 From: Ilayaperumal Gopinathan Date: Thu, 16 Jul 2015 09:31:56 -0700 Subject: [PATCH] Make it easier to subclass Launchers Change constructors from `package private` to `protected` for subclasses to use. Closes gh-3741 --- .../boot/loader/ExecutableArchiveLauncher.java | 2 +- .../java/org/springframework/boot/loader/JarLauncher.java | 7 +++++++ .../java/org/springframework/boot/loader/WarLauncher.java | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java index 5ebfcb09894..89f59bd1f3a 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java @@ -55,7 +55,7 @@ public abstract class ExecutableArchiveLauncher extends Launcher { this.javaAgentDetector = javaAgentDetector; } - ExecutableArchiveLauncher(Archive archive) { + protected ExecutableArchiveLauncher(Archive archive) { this.javaAgentDetector = new InputArgumentsJavaAgentDetector(); this.archive = archive; } 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 459ec3dddf6..4f1f9b50ed4 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 @@ -31,6 +31,13 @@ public class JarLauncher extends ExecutableArchiveLauncher { private static final AsciiBytes LIB = new AsciiBytes("lib/"); + public JarLauncher() { + } + + protected JarLauncher(Archive archive) { + super(archive); + } + @Override protected boolean isNestedArchive(Archive.Entry entry) { return !entry.isDirectory() && entry.getName().startsWith(LIB); 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 82a745aef7e..4aad3aaf806 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 @@ -42,7 +42,7 @@ public class WarLauncher extends ExecutableArchiveLauncher { super(); } - WarLauncher(Archive archive) { + protected WarLauncher(Archive archive) { super(archive); }