root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #31997 from nilshartmann 

* pr/31997:
  Polish "Explicit error message if source is not an archive"
  Explicit error message if source is not an archive

Closes gh-31997
This commit is contained in:
Stephane Nicoll 2022-08-17 08:34:26 +02:00
parent 2550763669 e94ddfa589
commit f7fba30345
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Context.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -55,7 +55,8 @@ class Context {
* @param workingDir the working directory * @param workingDir the working directory
*/ */
Context(File archiveFile, File workingDir) { Context(File archiveFile, File workingDir) {
Assert.state(isExistingFile(archiveFile) && isJarOrWar(archiveFile), "Unable to find source archive"); Assert.state(isExistingFile(archiveFile), "Unable to find source archive");
Assert.state(isJarOrWar(archiveFile), "Source archive " + archiveFile + " must end with .jar or .war");
this.archiveFile = archiveFile; this.archiveFile = archiveFile;
this.workingDir = workingDir; this.workingDir = workingDir;
this.relativeDir = deduceRelativeDir(archiveFile.getParentFile(), this.workingDir); this.relativeDir = deduceRelativeDir(archiveFile.getParentFile(), this.workingDir);

4
spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ContextTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -55,7 +55,7 @@ class ContextTests {
File zip = new File(this.temp, "test.zip"); File zip = new File(this.temp, "test.zip");
Files.createFile(zip.toPath()); Files.createFile(zip.toPath());
assertThatIllegalStateException().isThrownBy(() -> new Context(zip, this.temp)) assertThatIllegalStateException().isThrownBy(() -> new Context(zip, this.temp))
.withMessage("Unable to find source archive"); .withMessageContaining("test.zip must end with .jar or .war");
} }
@Test @Test