Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update wording of exception when installing server into non-empty folder #484

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Update wording of exception when installing server into non-empty folder #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-tests/src/test/java/org/wildfly/prospero/it/commonapi/InstallationHistoryActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ public void candidateFolderHasToBeEmpty() throws Exception {
final SavedState savedState = revisions.get(1);
assertThatThrownBy(() -> historyAction.prepareRevert(savedState, mavenOptions, Collections.emptyList(), candidate))
.isInstanceOf(IllegalArgumentException.class)
.message().contains("Can't install into a non empty directory");
.message().contains("Can't install the server into a non empty directory");
}

private UpdateAction updateAction() throws ProvisioningException, OperationException {
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/src/test/java/org/wildfly/prospero/it/commonapi/UpdateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public void candidateFolderHasToBeEmpty() throws Exception {
List.of(new Repository("temp", tempRepo.toExternalForm())))
.buildUpdate(candidateFolder))
.isInstanceOf(IllegalArgumentException.class)
.message().contains("Can't install into a non empty directory");
.message().contains("Can't install the server into a non empty directory");
}

private File upgradeTestArtifactIn(File manifestFile) throws IOException, MetadataException {
Expand Down
2 changes: 1 addition & 1 deletion prospero-common/src/main/java/org/wildfly/prospero/ProsperoLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public interface ProsperoLogger extends BasicLogger {
@Message(id = 202, value = "Invalid channel manifest definition")
ChannelDefinitionException invalidManifest(@Cause InvalidChannelMetadataException e);

@Message(id = 203, value = "Can't install into a non empty directory '%s'. Use `update` command if you want to modify existing installation.")
@Message(id = 203, value = "Can't install the server into a non empty directory '%s'.")
IllegalArgumentException cannotInstallIntoNonEmptyDirectory(Path path);

@Message(id = 204, value = "Installation dir '%s' doesn't exist")
Expand Down