Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,14 @@ protected static void validateModelId(String modelId) {
}
}

protected static void validateApplicationVersion(String version) {
if (version == null || version.trim().isEmpty()) {
throw new IllegalArgumentException(
"The application version is missing. Set the '" + APPLICATION_VERSION_PROPERTY
+ "' property (e.g. in application.properties) so the build can proceed.");
}
}

private void generateModelDescriptor(String modelId, String model, OpenAPI openAPI,
Path outputDirectory,
Optional<ClassInfo> restResource,
Expand All @@ -527,8 +535,10 @@ private void generateModelDescriptor(String modelId, String model, OpenAPI openA
descriptor.setModel(model);
descriptor.setName(
config.getOptionalValue(APPLICATION_NAME_PROPERTY, String.class).orElse(openAPI.getInfo().getTitle()));
descriptor.setVersion(
config.getOptionalValue(APPLICATION_VERSION_PROPERTY, String.class).orElse(openAPI.getInfo().getVersion()));
String applicationVersion =
config.getOptionalValue(APPLICATION_VERSION_PROPERTY, String.class).orElse(openAPI.getInfo().getVersion());
validateApplicationVersion(applicationVersion);
descriptor.setVersion(applicationVersion);
descriptor.setResourceType(getResourceTypeFromRestResource(restResource));
descriptor.setDescription(config.getOptionalValue(APPLICATION_DESCRIPTION_PROPERTY, String.class)
.orElse(openAPI.getInfo().getDescription()));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package ai.timefold.solver.service.quarkus.deployment;

import static ai.timefold.solver.service.quarkus.deployment.TimefoldModelDescriptorProcessor.validateApplicationVersion;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import org.junit.jupiter.api.Test;

class ApplicationVersionValidationTest {

@Test
void validVersionDoesNotThrow() {
assertThatCode(() -> validateApplicationVersion("v1")).doesNotThrowAnyException();
}

@Test
void nullVersionThrows() {
assertThatThrownBy(() -> validateApplicationVersion(null))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("timefold.application.version");
}

@Test
void emptyVersionThrows() {
assertThatThrownBy(() -> validateApplicationVersion(""))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("timefold.application.version");
}

@Test
void blankVersionThrows() {
assertThatThrownBy(() -> validateApplicationVersion(" "))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("timefold.application.version");
}
}