jars) {
- return infLibs(jars.stream().map(File::new).toList());
- }
-
/**
* Provides the Spring Boot loader launcher fully-qualified class name.
*
@@ -381,9 +321,9 @@ public abstract class AbstractBootOperation>
/**
* Retrieves the Spring Boot loader launcher libraries.
*
- * @return the Java archives
+ * @return a list of Java archives
*/
- public Collection launcherLibs() {
+ public List launcherLibs() {
return launcherLibs_;
}
@@ -392,81 +332,22 @@ public abstract class AbstractBootOperation>
*
* @param jars a collection of Java archives
* @return this operation instance
- * @throws IOException if a JAR could not be found
- * @see #infLibs(File...)
+ * @throws IOException if an error occurs
*/
public T launcherLibs(Collection jars) throws IOException {
- for (var j : jars) {
- if (j.exists()) {
- launcherLibs_.add(j);
- } else {
- throw new IOException("Spring Boot loader launcher library not found: " + j);
+ if (!jars.isEmpty()) {
+ for (var j : jars) {
+ if (j.exists()) {
+ launcherLibs_.add(j);
+ } else {
+ throw new IOException("Spring Boot loader launcher library not found: " + j);
+ }
}
}
//noinspection unchecked
return (T) this;
}
- /**
- * Provides the libraries for the Spring Boot loader launcher.
- *
- * @param jars one or more Java archives
- * @return this operation instance
- * @throws IOException if a JAR could not be found
- * @see #infLibs(Collection)
- */
- public T launcherLibs(File... jars) throws IOException {
- return launcherLibs(List.of(jars));
- }
-
- /**
- * Provides the libraries for the Spring Boot loader launcher.
- *
- * @param jars one or more Java archives
- * @return this operation instance
- * @throws IOException if a JAR could not be found
- * @see #launcherLibsStrings(Collection)
- */
- public T launcherLibs(String... jars) throws IOException {
- return launcherLibsStrings(List.of(jars));
- }
-
- /**
- * Provides the libraries for the Spring Boot loader launcher.
- *
- * @param jars one or more Java archives
- * @return this operation instance
- * @throws IOException if a JAR could not be found
- * @see #launcherLibsPaths(Collection)
- */
- public T launcherLibs(Path... jars) throws IOException {
- return launcherLibsPaths(List.of(jars));
- }
-
- /**
- * Provides the libraries for the Spring Boot loader launcher.
- *
- * @param jars one or more Java archives
- * @return this operation instance
- * @throws IOException if a JAR could not be found
- * @see #launcherLibs(Path...)
- */
- public T launcherLibsPaths(Collection jars) throws IOException {
- return launcherLibs(jars.stream().map(Path::toFile).toList());
- }
-
- /**
- * Provides the libraries for the Spring Boot loader launcher.
- *
- * @param jars one or more Java archives
- * @return this operation instance
- * @throws IOException if a JAR could not be found
- * @see #launcherLibs(String...)
- */
- public T launcherLibsStrings(Collection jars) throws IOException {
- return launcherLibs(jars.stream().map(File::new).toList());
- }
-
/**
* Provides the fully-qualified main class name.
*
@@ -496,17 +377,17 @@ public abstract class AbstractBootOperation>
* @return this operation instance
*/
public T manifestAttribute(String name, String value) {
- manifestAttributes_.put(name, value);
+ manifestAttributes_.add(new BootManifestAttribute(name, value));
//noinspection unchecked
return (T) this;
}
/**
- * Retrieves the attributes that will be put in the archive manifest.
+ * Retrieves the list of attributes that will be put in the archive manifest.
*
- * @return the manifest attributes
+ * @return a list of manifest attributes
*/
- public Map manifestAttributes() {
+ public List manifestAttributes() {
return manifestAttributes_;
}
@@ -515,10 +396,9 @@ public abstract class AbstractBootOperation>
*
* @param attributes the manifest attributes
* @return this operation instance
- * @see #manifestAttribute(String, String)
*/
- public T manifestAttributes(Map attributes) {
- manifestAttributes_.putAll(attributes);
+ public T manifestAttributes(Collection attributes) {
+ manifestAttributes_.addAll(attributes);
//noinspection unchecked
return (T) this;
}
@@ -528,78 +408,22 @@ public abstract class AbstractBootOperation>
*
* @param directories one or more source directories
* @return this operation instance
- * @see #sourceDirectories(File...)
- */
- public T sourceDirectories(Collection directories) {
- sourceDirectories_.addAll(directories);
- //noinspection unchecked
- return (T) this;
- }
-
- /**
- * Provides source directories that will be used for the archive creation.
- *
- * @param directories one or more source directories
- * @return this operation instance
- * @see #sourceDirectories(Collection)
*/
public T sourceDirectories(File... directories) {
- return sourceDirectories(List.of(directories));
- }
-
- /**
- * Provides source directories that will be used for the archive creation.
- *
- * @param directories one or more source directories
- * @return this operation instance
- * @see #sourceDirectoriesStrings(Collection)
- */
- public T sourceDirectories(String... directories) {
- return sourceDirectoriesStrings(List.of(directories));
- }
-
- /**
- * Provides source directories that will be used for the archive creation.
- *
- * @param directories one or more source directories
- * @return this operation instance
- * @see #sourceDirectoriesPaths(Collection)
- */
- public T sourceDirectories(Path... directories) {
- return sourceDirectoriesPaths(List.of(directories));
+ sourceDirectories_.addAll(List.of(directories));
+ //noinspection unchecked
+ return (T) this;
}
/**
* Retrieves the source directories that will be used for the archive creation.
*
- * @return the source directories
+ * @return a list of directories
*/
- public Collection sourceDirectories() {
+ public List sourceDirectories() {
return sourceDirectories_;
}
- /**
- * Provides source directories that will be used for the archive creation.
- *
- * @param directories one or more source directories
- * @return this operation instance
- * @see #sourceDirectories(Path...)
- */
- public T sourceDirectoriesPaths(Collection directories) {
- return sourceDirectories(directories.stream().map(Path::toFile).toList());
- }
-
- /**
- * Provides source directories that will be used for the archive creation.
- *
- * @param directories one or more source directories
- * @return this operation instance
- * @see #sourceDirectories(String...)
- */
- public T sourceDirectoriesStrings(Collection directories) {
- return sourceDirectories(directories.stream().map(File::new).toList());
- }
-
/**
* Verifies that all the elements ({@link #mainClass() mainClass}, {@link #launcherClass() launcherClass} and
* {@link #launcherLibs() launcherLibs}) required to create the archive have been provided, throws an
diff --git a/src/main/java/rife/bld/extension/BootJarOperation.java b/src/main/java/rife/bld/extension/BootJarOperation.java
index d758857..5667bfd 100644
--- a/src/main/java/rife/bld/extension/BootJarOperation.java
+++ b/src/main/java/rife/bld/extension/BootJarOperation.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.Collection;
-import java.util.Map;
+import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -89,7 +89,7 @@ public class BootJarOperation extends AbstractBootOperation {
* {@link Project#standaloneClasspathJars() standaloneClasspathJars}
* The {@link #mainClass(String) main class} to {@link Project#mainClass() mainClass}
* The {@code Manifest-Version}, {@code Main-Class} and {@code Start-Class}
- * {@link #manifestAttributes() manifest attributes}
+ * {@link #manifestAttributes(Collection) manifest attributes}
* The {@link #sourceDirectories(File...) source directories} to
* {@link Project#buildMainDirectory() buildMainDirectory} and
* {@link Project#srcMainResourcesDirectory() srcMainResourcesDirectory}
@@ -107,10 +107,11 @@ public class BootJarOperation extends AbstractBootOperation {
.launcherClass(BootUtils.launcherClass(project, "JarLauncher"))
.launcherLibs(project.standaloneClasspathJars())
.mainClass(project.mainClass())
- .manifestAttributes(Map.of(
- "Manifest-Version", "1.0",
- "Main-Class", launcherClass(),
- "Start-Class", mainClass()))
+ .manifestAttributes(List.of(
+ new BootManifestAttribute("Manifest-Version", "1.0"),
+ new BootManifestAttribute("Main-Class", launcherClass()),
+ new BootManifestAttribute("Start-Class", mainClass())
+ ))
.sourceDirectories(project.buildMainDirectory(), project.srcMainResourcesDirectory());
}
}
diff --git a/src/main/java/rife/bld/extension/BootManifestAttribute.java b/src/main/java/rife/bld/extension/BootManifestAttribute.java
new file mode 100644
index 0000000..beac96d
--- /dev/null
+++ b/src/main/java/rife/bld/extension/BootManifestAttribute.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package rife.bld.extension;
+
+/**
+ * Constructs a new manifest attribute.
+ *
+ * @param name The attribute name
+ * @param value The attribute value
+ * @author Erik C. Thauvin
+ * @since 1.0
+ */
+public record BootManifestAttribute(String name, String value) {
+}
diff --git a/src/main/java/rife/bld/extension/BootUtils.java b/src/main/java/rife/bld/extension/BootUtils.java
index 42ae132..dfdfee9 100644
--- a/src/main/java/rife/bld/extension/BootUtils.java
+++ b/src/main/java/rife/bld/extension/BootUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
package rife.bld.extension;
import rife.bld.Project;
+import rife.tools.FileUtils;
+import rife.tools.exceptions.FileUtilsErrorException;
import java.io.File;
import java.io.IOException;
@@ -36,6 +38,20 @@ public final class BootUtils {
// no-op
}
+ /**
+ * Deletes the given directories.
+ *
+ * @param directories one or more directories to delete
+ * @throws FileUtilsErrorException if an error occurs
+ */
+ public static void deleteDirectories(File... directories) throws FileUtilsErrorException {
+ for (var d : directories) {
+ if (d.exists()) {
+ FileUtils.deleteDirectory(d);
+ }
+ }
+ }
+
/**
* Calculates the given file size in bytes, kilobytes, megabytes, gigabytes or terabytes.
*
diff --git a/src/main/java/rife/bld/extension/BootWarOperation.java b/src/main/java/rife/bld/extension/BootWarOperation.java
index 51f7fdf..7ee8db7 100644
--- a/src/main/java/rife/bld/extension/BootWarOperation.java
+++ b/src/main/java/rife/bld/extension/BootWarOperation.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,11 +22,9 @@ import rife.tools.FileUtils;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
-import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -114,7 +112,7 @@ public class BootWarOperation extends AbstractBootOperation {
* {@link Project#standaloneClasspathJars() standaloneClasspathJars}
* The {@link #mainClass(String) main class} to {@link Project#mainClass() mainClass}
* The {@code Manifest-Version}, {@code Main-Class} and {@code Start-Class}
- * {@link #manifestAttributes() manifest attributes}
+ * {@link #manifestAttributes(Collection) manifest attributes}
* The {@link #sourceDirectories(File...) source directories} to
* {@link Project#buildMainDirectory() buildMainDirectory} and
* {@link Project#srcMainResourcesDirectory() srcMainResourcesDirectory}
@@ -133,20 +131,19 @@ public class BootWarOperation extends AbstractBootOperation {
.launcherClass(BootUtils.launcherClass(project, "WarLauncher"))
.launcherLibs(project.standaloneClasspathJars())
.mainClass(project.mainClass())
- .manifestAttributes(Map.of(
- "Manifest-Version", "1.0",
- "Main-Class", launcherClass(),
- "Start-Class", mainClass()))
+ .manifestAttributes(List.of(
+ new BootManifestAttribute("Manifest-Version", "1.0"),
+ new BootManifestAttribute("Main-Class", launcherClass()),
+ new BootManifestAttribute("Start-Class", mainClass())
+ ))
.providedLibs(project.providedClasspathJars())
.sourceDirectories(project.buildMainDirectory(), project.srcMainResourcesDirectory());
}
-
/**
* Provides libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}.
*
* @param jars a collection of Java archive files
* @return this operation instance
- * @see #providedLibs(File...)
*/
public BootWarOperation providedLibs(Collection jars) {
providedLibs_.addAll(jars);
@@ -158,62 +155,9 @@ public class BootWarOperation extends AbstractBootOperation {
*
* @param jars one or more Java archive files
* @return this operation instance
- * @see #providedLibsStrings(Collection)
- */
- public BootWarOperation providedLibs(String... jars) {
- return providedLibsStrings(List.of(jars));
- }
-
- /**
- * Provides the libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}.
- *
- * @param jars one or more Java archive files
- * @return this operation instance
- * @see #providedLibs(Collection)
*/
public BootWarOperation providedLibs(File... jars) {
- return providedLibs(List.of(jars));
- }
-
- /**
- * Provides the libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}.
- *
- * @param jars one or more Java archive files
- * @return this operation instance
- * @see #providedLibsPaths(Collection)
- */
- public BootWarOperation providedLibs(Path... jars) {
- return providedLibsPaths(List.of(jars));
- }
-
- /**
- * Retrieves the libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}.
- *
- * @return the list of Java archive files.
- */
- public List providedLibs() {
- return providedLibs_;
- }
-
- /**
- * Provides the libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}.
- *
- * @param jars one or more Java archive files
- * @return this operation instance
- * @see #providedLibs(Path...)
- */
- public BootWarOperation providedLibsPaths(Collection jars) {
- return providedLibs(jars.stream().map(Path::toFile).toList());
- }
-
- /**
- * Provides the libraries that will be used for the WAR creation in {@code /WEB-INF/lib-provided}.
- *
- * @param jars one or more Java archive files
- * @return this operation instance
- * @see #providedLibs(String...)
- */
- public BootWarOperation providedLibsStrings(Collection jars) {
- return providedLibs(jars.stream().map(File::new).toList());
+ providedLibs_.addAll(List.of(jars));
+ return this;
}
}
diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java
index 5ee7341..9515e7d 100644
--- a/src/test/java/rife/bld/extension/BootJarOperationTest.java
+++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
package rife.bld.extension;
-import org.assertj.core.api.AutoCloseableSoftAssertions;
import org.junit.jupiter.api.Test;
import rife.bld.Project;
import rife.bld.dependencies.VersionNumber;
@@ -35,8 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
class BootJarOperationTest {
- private static final String BLD = "bld-2.2.1.jar";
- private static final String BOOT_VERSION = "3.4.5";
+ private static final String BLD = "bld-1.8.0-20240107.042858-1.jar";
private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/";
private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/";
private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/";
@@ -46,8 +44,6 @@ class BootJarOperationTest {
org/springframework/boot/
org/springframework/boot/loader/
org/springframework/boot/loader/jar/
- org/springframework/boot/loader/jar/JarEntriesStream$InputStreamSupplier.class
- org/springframework/boot/loader/jar/JarEntriesStream.class
org/springframework/boot/loader/jar/ManifestInfo.class
org/springframework/boot/loader/jar/MetaInfVersionsInfo.class
org/springframework/boot/loader/jar/NestedJarFile$JarEntriesEnumeration.class
@@ -62,7 +58,6 @@ class BootJarOperationTest {
org/springframework/boot/loader/jar/ZipInflaterInputStream.class
org/springframework/boot/loader/jarmode/
org/springframework/boot/loader/jarmode/JarMode.class
- org/springframework/boot/loader/jarmode/JarModeErrorException.class
org/springframework/boot/loader/launch/
org/springframework/boot/loader/launch/Archive$Entry.class
org/springframework/boot/loader/launch/Archive.class
@@ -125,7 +120,6 @@ class BootJarOperationTest {
org/springframework/boot/loader/nio/file/NestedFileSystem.class
org/springframework/boot/loader/nio/file/NestedFileSystemProvider.class
org/springframework/boot/loader/nio/file/NestedPath.class
- org/springframework/boot/loader/nio/file/UriPathEncoder.class
org/springframework/boot/loader/ref/
org/springframework/boot/loader/ref/Cleaner.class
org/springframework/boot/loader/ref/DefaultCleaner.class
@@ -134,10 +128,9 @@ class BootJarOperationTest {
org/springframework/boot/loader/zip/CloseableDataBlock.class
org/springframework/boot/loader/zip/DataBlock.class
org/springframework/boot/loader/zip/DataBlockInputStream.class
- org/springframework/boot/loader/zip/FileDataBlock$FileAccess.class
- org/springframework/boot/loader/zip/FileDataBlock$Tracker$1.class
- org/springframework/boot/loader/zip/FileDataBlock$Tracker.class
- org/springframework/boot/loader/zip/FileDataBlock.class
+ org/springframework/boot/loader/zip/FileChannelDataBlock$ManagedFileChannel.class
+ org/springframework/boot/loader/zip/FileChannelDataBlock$Tracker.class
+ org/springframework/boot/loader/zip/FileChannelDataBlock.class
org/springframework/boot/loader/zip/NameOffsetLookups.class
org/springframework/boot/loader/zip/VirtualDataBlock.class
org/springframework/boot/loader/zip/VirtualZipDataBlock$DataPart.class
@@ -159,11 +152,9 @@ class BootJarOperationTest {
""";
private static final String MAIN_CLASS = "com.example.Foo";
private static final String PROVIDED_LIB = "LatencyUtils-2.0.3.jar";
- private static final String SPRING_BOOT = "spring-boot-" + BOOT_VERSION + ".jar";
- private static final String SPRING_BOOT_ACTUATOR = "spring-boot-actuator-" + BOOT_VERSION + ".jar";
- private static final String SPRING_BOOT_LOADER = "spring-boot-loader-" + BOOT_VERSION + ".jar";
- private static final String SRC_MAIN_JAVA = "src/main/java";
- private static final String SRC_TEST_JAVA = "src/test/java";
+ private static final String SPRING_BOOT = "spring-boot-3.2.2.jar";
+ private static final String SPRING_BOOT_ACTUATOR = "spring-boot-actuator-3.2.2.jar";
+ private static final String SPRING_BOOT_LOADER = "spring-boot-loader-3.2.2.jar";
private StringBuilder readJarEntries(File jar) throws IOException {
var jarEntries = new StringBuilder();
@@ -186,13 +177,7 @@ class BootJarOperationTest {
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("class required");
- assertThatCode(() -> new BootWarOperation().launcherLibs(new File("foo")))
- .as("foo")
- .isInstanceOf(IOException.class)
- .hasMessageContaining("not found");
-
- assertThatCode(() -> new BootWarOperation().launcherLibs("bar"))
- .as("bar")
+ assertThatCode(() -> new BootWarOperation().launcherLibs(List.of(new File("foo"))))
.isInstanceOf(IOException.class)
.hasMessageContaining("not found");
@@ -205,38 +190,6 @@ class BootJarOperationTest {
assertThat(bootWar.verifyExecute()).isTrue();
}
- @Test
- void testInfLibs() {
- var op = new BootWarOperation();
-
- var foo = new File(EXAMPLES_LIB_COMPILE + SPRING_BOOT);
- var bar = new File(EXAMPLES_LIB_COMPILE + SPRING_BOOT_ACTUATOR);
-
- op.infLibs(EXAMPLES_LIB_COMPILE + SPRING_BOOT, EXAMPLES_LIB_COMPILE + SPRING_BOOT_ACTUATOR);
- assertThat(op.infLibs()).as("String...").containsExactly(foo, bar);
- op.infLibs().clear();
-
- op.infLibs(foo, bar);
- assertThat(op.infLibs()).as("File...").containsExactly(foo, bar);
- op.infLibs().clear();
-
- op.infLibs(foo.toPath(), bar.toPath());
- assertThat(op.infLibs()).as("Path...").containsExactly(foo, bar);
- op.infLibs().clear();
-
- op.infLibsStrings(List.of(EXAMPLES_LIB_COMPILE + SPRING_BOOT, EXAMPLES_LIB_COMPILE + SPRING_BOOT_ACTUATOR));
- assertThat(op.infLibs()).as("List(String...)").containsExactly(foo, bar);
- op.infLibs().clear();
-
- op.infLibs(List.of(foo, bar));
- assertThat(op.infLibs()).as("List(File...)").containsExactly(foo, bar);
- op.infLibs().clear();
-
- op.infLibsPaths(List.of(foo.toPath(), bar.toPath()));
- assertThat(op.infLibs()).as("List(Path...)").containsExactly(foo, bar);
- op.infLibs().clear();
- }
-
@Test
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
void testJarExecute() throws Exception {
@@ -265,6 +218,7 @@ class BootJarOperationTest {
"BOOT-INF/classes/rife/bld/extension/\n" +
"BOOT-INF/classes/rife/bld/extension/AbstractBootOperation.class\n" +
"BOOT-INF/classes/rife/bld/extension/BootJarOperation.class\n" +
+ "BOOT-INF/classes/rife/bld/extension/BootManifestAttribute.class\n" +
"BOOT-INF/classes/rife/bld/extension/BootUtils.class\n" +
"BOOT-INF/classes/rife/bld/extension/BootWarOperation.class\n" +
"BOOT-INF/lib/\n" +
@@ -282,9 +236,9 @@ class BootJarOperationTest {
new BootJarOperation()
.fromProject(new CustomProject(new File(".")))
.launcherLibs(List.of(new File(EXAMPLES_LIB_STANDALONE + SPRING_BOOT_LOADER)))
- .destinationDirectory(tmp_dir.getAbsolutePath())
- .infLibs(new File(EXAMPLES_LIB_COMPILE + SPRING_BOOT).getAbsolutePath(),
- new File(EXAMPLES_LIB_COMPILE + SPRING_BOOT_ACTUATOR).getAbsolutePath())
+ .destinationDirectory(tmp_dir)
+ .infLibs(new File(EXAMPLES_LIB_COMPILE + SPRING_BOOT),
+ new File(EXAMPLES_LIB_COMPILE + SPRING_BOOT_ACTUATOR))
.execute();
var jarFile = new File(tmp_dir, "test_project-0.0.1-boot.jar");
@@ -299,6 +253,7 @@ class BootJarOperationTest {
"BOOT-INF/classes/rife/bld/extension/\n" +
"BOOT-INF/classes/rife/bld/extension/AbstractBootOperation.class\n" +
"BOOT-INF/classes/rife/bld/extension/BootJarOperation.class\n" +
+ "BOOT-INF/classes/rife/bld/extension/BootManifestAttribute.class\n" +
"BOOT-INF/classes/rife/bld/extension/BootUtils.class\n" +
"BOOT-INF/classes/rife/bld/extension/BootWarOperation.class\n" +
"BOOT-INF/lib/\n" +
@@ -311,95 +266,33 @@ class BootJarOperationTest {
FileUtils.deleteDirectory(tmp_dir);
}
- @Test
- void testLauncherLibs() throws IOException {
- var op = new BootJarOperation();
-
- var launcher = new File(EXAMPLES_LIB_STANDALONE + SPRING_BOOT_LOADER);
- op = op.launcherLibs(EXAMPLES_LIB_STANDALONE + SPRING_BOOT_LOADER);
- assertThat(op.launcherLibs()).as("String...").containsExactly(launcher);
- op.launcherLibs().clear();
-
- op = op.launcherLibs(launcher);
- assertThat(op.launcherLibs()).as("File...").containsExactly(launcher);
- op.launcherLibs().clear();
-
- op = op.launcherLibs(launcher.toPath());
- assertThat(op.launcherLibs()).as("Path...").containsExactly(launcher);
- op.launcherLibs().clear();
-
- op = op.launcherLibsStrings(List.of(EXAMPLES_LIB_STANDALONE + SPRING_BOOT_LOADER));
- assertThat(op.launcherLibs()).as("List(String...)").containsExactly(launcher);
- op.launcherLibs().clear();
-
- op = op.launcherLibs(List.of(launcher));
- assertThat(op.launcherLibs()).as("List(File...)").containsExactly(launcher);
- op.launcherLibs().clear();
-
- op = op.launcherLibsPaths(List.of(launcher.toPath()));
- assertThat(op.launcherLibs()).as("List(Path...)").containsExactly(launcher);
- op.launcherLibs().clear();
- }
-
@Test
void testProject() throws IOException {
var tmp_dir = Files.createTempDirectory("bootprjtmp").toFile();
var project = new CustomProject(tmp_dir);
- var bootJar = new BootJarOperation().fromProject(project).sourceDirectories(SRC_MAIN_JAVA);
+ var bootJar = new BootJarOperation().fromProject(project);
- try (var softly = new AutoCloseableSoftAssertions()) {
- softly.assertThat(bootJar.mainClass()).as("mainClass").isEqualTo(MAIN_CLASS);
- softly.assertThat(bootJar.sourceDirectories()).as("sourceDirectories.size").hasSize(3)
- .containsExactly(project.buildMainDirectory(), project.srcMainResourcesDirectory(),
- new File(SRC_MAIN_JAVA));
- softly.assertThat(bootJar.manifestAttributes()).as("manifestAttributes.size").hasSize(3);
- softly.assertThat(bootJar.manifestAttributes().get("Manifest-Version")).as("Manifest-Version")
- .isEqualTo("1.0");
- softly.assertThat(bootJar.manifestAttributes().get("Main-Class")).as("Main-Class").endsWith("JarLauncher");
- softly.assertThat(bootJar.manifestAttributes().get("Start-Class")).as("Start-Class").isEqualTo(MAIN_CLASS);
- softly.assertThat(bootJar.manifestAttribute("Manifest-Test", "tsst")
- .manifestAttributes().get("Manifest-Test")).as("Manifest-Test").isEqualTo("tsst");
- softly.assertThat(bootJar.destinationDirectory()).as("destinationDirectory").isDirectory();
- softly.assertThat(bootJar.destinationDirectory()).isEqualTo(project.buildDistDirectory());
- softly.assertThat(bootJar.infLibs()).as("infoLibs").isEmpty();
- softly.assertThat(bootJar.launcherLibs()).as("launcherJars").isEmpty();
- softly.assertThat(bootJar.destinationFileName()).isEqualTo("test_project-0.0.1-boot.jar");
- }
+ assertThat(bootJar.mainClass()).as("mainClass").isEqualTo(MAIN_CLASS);
+ assertThat(bootJar.sourceDirectories()).as("sourceDirectories.size").hasSize(2);
+ assertThat(bootJar.manifestAttributes()).as("manifestAttributes.size").hasSize(3);
+ assertThat(bootJar.manifestAttributes().get(0)).as("Manifest-Version")
+ .isEqualTo(new BootManifestAttribute("Manifest-Version", "1.0"));
+ assertThat(bootJar.manifestAttributes().get(1).value()).as("Main-Class").endsWith("JarLauncher");
+ assertThat(bootJar.manifestAttributes().get(2)).as("Start-Class")
+ .isEqualTo(new BootManifestAttribute("Start-Class", MAIN_CLASS));
+ assertThat(bootJar.manifestAttribute("Manifest-Test", "tsst")
+ .manifestAttributes()).as("Manifest-Test").hasSize(4)
+ .element(3).extracting(BootManifestAttribute::name).isEqualTo("Manifest-Test");
+ assertThat(bootJar.destinationDirectory()).as("destinationDirectory").isDirectory();
+ assertThat(bootJar.destinationDirectory().getAbsolutePath()).as("destinationDirectory")
+ .isEqualTo(Path.of(tmp_dir.getPath(), "build", "dist").toString());
+ assertThat(bootJar.infLibs()).as("infoLibs").isEmpty();
+ assertThat(bootJar.launcherLibs()).as("launcherJars").isEmpty();
+ assertThat(bootJar.destinationFileName()).isEqualTo("test_project-0.0.1-boot.jar");
FileUtils.deleteDirectory(tmp_dir);
}
- @Test
- void testSourceDirectories() {
- var op = new BootJarOperation();
-
- var src = new File(SRC_MAIN_JAVA);
- var test = new File(SRC_TEST_JAVA);
- op = op.sourceDirectories(SRC_MAIN_JAVA, SRC_TEST_JAVA);
- assertThat(op.sourceDirectories()).as("String...").containsExactly(src, test);
- op.sourceDirectories().clear();
-
- op = op.sourceDirectories(src, test);
- assertThat(op.sourceDirectories()).as("File...").containsExactly(src, test);
- op.sourceDirectories().clear();
-
- op = op.sourceDirectories(src.toPath(), test.toPath());
- assertThat(op.sourceDirectories()).as("Path...").containsExactly(src, test);
- op.sourceDirectories().clear();
-
- op.sourceDirectoriesStrings(List.of(SRC_MAIN_JAVA, SRC_TEST_JAVA));
- assertThat(op.sourceDirectories()).as("List(String...").containsExactly(src, test);
- op.sourceDirectories().clear();
-
- op.sourceDirectories(List.of(src, test));
- assertThat(op.sourceDirectories()).as("List(File...)").containsExactly(src, test);
- op.sourceDirectories().clear();
-
- op.sourceDirectoriesPaths(List.of(src.toPath(), test.toPath()));
- assertThat(op.sourceDirectories()).as("List(Path...)").containsExactly(src, test);
- op.sourceDirectories().clear();
- }
-
@Test
void testWarProjectExecute() throws Exception {
var tmp_dir = Files.createTempDirectory("bootjartmp").toFile();
@@ -407,9 +300,9 @@ class BootJarOperationTest {
new BootWarOperation()
.fromProject(project)
.launcherLibs(List.of(new File(EXAMPLES_LIB_STANDALONE + SPRING_BOOT_LOADER)))
- .destinationDirectory(tmp_dir.toPath())
- .infLibs(Path.of(EXAMPLES_LIB_COMPILE + SPRING_BOOT),
- Path.of(EXAMPLES_LIB_COMPILE + SPRING_BOOT_ACTUATOR))
+ .destinationDirectory(tmp_dir)
+ .infLibs(new File(EXAMPLES_LIB_COMPILE + SPRING_BOOT),
+ new File(EXAMPLES_LIB_COMPILE + SPRING_BOOT_ACTUATOR))
.providedLibs(new File(EXAMPLES_LIB_RUNTIME + PROVIDED_LIB))
.execute();
@@ -427,6 +320,7 @@ class BootJarOperationTest {
"WEB-INF/classes/rife/bld/extension/\n" +
"WEB-INF/classes/rife/bld/extension/AbstractBootOperation.class\n" +
"WEB-INF/classes/rife/bld/extension/BootJarOperation.class\n" +
+ "WEB-INF/classes/rife/bld/extension/BootManifestAttribute.class\n" +
"WEB-INF/classes/rife/bld/extension/BootUtils.class\n" +
"WEB-INF/classes/rife/bld/extension/BootWarOperation.class\n" +
"WEB-INF/lib/\n" +
@@ -440,24 +334,6 @@ class BootJarOperationTest {
FileUtils.deleteDirectory(tmp_dir);
}
- @Test
- void testWarProvidedLibs() {
- var op = new BootWarOperation();
-
- var foo = new File(EXAMPLES_LIB_RUNTIME + PROVIDED_LIB);
- op = op.providedLibs(EXAMPLES_LIB_RUNTIME + PROVIDED_LIB);
- assertThat(op.providedLibs()).containsExactly(foo);
- op.providedLibs().clear();
-
- op = op.providedLibs(foo);
- assertThat(op.providedLibs()).containsExactly(foo);
- op.providedLibs().clear();
-
- op = op.providedLibs(foo.toPath());
- assertThat(op.providedLibs()).containsExactly(foo);
- op.providedLibs().clear();
- }
-
static class CustomProject extends Project {
CustomProject(File tmp) {
super();