Skip to content

chore: merge rest-definition with definition #2343

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

Merged
rsynek merged 1 commit into from
Jun 10, 2026
Merged

chore: merge rest-definition with definition #2343

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
11 changes: 0 additions & 11 deletions build/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,17 +346,6 @@
<version>${version.ai.timefold.solver}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>ai.timefold.solver</groupId>
<artifactId>timefold-solver-model-rest-definition</artifactId>
<version>${version.ai.timefold.solver}</version>
</dependency>
<dependency>
<groupId>ai.timefold.solver</groupId>
<artifactId>timefold-solver-model-rest-definition</artifactId>
<version>${version.ai.timefold.solver}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>ai.timefold.solver</groupId>
<artifactId>timefold-solver-model-rest</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion .../rest/definition/api/DatasetSelector.java → .../definition/api/rest/DatasetSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ai.timefold.solver.model.rest.definition.api;
package ai.timefold.solver.model.definition.api.rest;

public enum DatasetSelector {

Expand Down
2 changes: 1 addition & 1 deletion ...odel/rest/definition/api/OperationId.java → ...odel/definition/api/rest/OperationId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ai.timefold.solver.model.rest.definition.api;
package ai.timefold.solver.model.definition.api.rest;

public final class OperationId {

Expand Down
2 changes: 1 addition & 1 deletion .../rest/definition/api/OperationOnPost.java → .../definition/api/rest/OperationOnPost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ai.timefold.solver.model.rest.definition.api;
package ai.timefold.solver.model.definition.api.rest;

public enum OperationOnPost {
NONE,
Expand Down
1 change: 0 additions & 1 deletion model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<module>facade/model</module>
<module>facade/model-with-maps</module>
<module>facade/model-parent</module>
<module>rest-definition</module>
<module>model-defaults</module>
<module>tools/maven-plugin</module>
</modules>
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/ai/timefold/solver/model/quarkus/deployment/TimefoldModelDescriptorProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ai.timefold.solver.model.quarkus.deployment;

import static ai.timefold.solver.model.definition.api.rest.OperationId.POST_OPERATIONS_ID_PATTERN;
import static ai.timefold.solver.model.quarkus.deployment.util.ProcessorUtils.excludeType;
import static ai.timefold.solver.model.rest.definition.api.OperationId.POST_OPERATIONS_ID_PATTERN;

import java.io.IOException;
import java.io.UncheckedIOException;
Expand Down Expand Up @@ -47,6 +47,7 @@
import ai.timefold.solver.model.definition.api.domain.ConstraintReference;
import ai.timefold.solver.model.definition.api.domain.DataFormat;
import ai.timefold.solver.model.definition.api.domain.ModelRequest;
import ai.timefold.solver.model.definition.api.rest.OperationId;
import ai.timefold.solver.model.definition.internal.descriptor.ConstraintDescriptor;
import ai.timefold.solver.model.definition.internal.descriptor.ConstraintGroupDescriptor;
import ai.timefold.solver.model.definition.internal.descriptor.DocumentationDescriptor;
Expand All @@ -68,7 +69,6 @@
import ai.timefold.solver.model.quarkus.deployment.descriptor.DefaultConstraintGroupDescriptorFactory;
import ai.timefold.solver.model.quarkus.deployment.openapi.SchemaPostProcessor;
import ai.timefold.solver.model.quarkus.deployment.openapi.SchemaUtils;
import ai.timefold.solver.model.rest.definition.api.OperationId;

import org.apache.commons.lang3.exception.UncheckedException;
import org.eclipse.microprofile.config.Config;
Expand Down
48 changes: 0 additions & 48 deletions model/rest-definition/pom.xml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions model/rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
<groupId>ai.timefold.solver</groupId>
<artifactId>timefold-solver-model-json</artifactId>
</dependency>
<dependency>
<groupId>ai.timefold.solver</groupId>
<artifactId>timefold-solver-model-rest-definition</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-jackson</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions model/rest/src/main/java/ai/timefold/solver/model/rest/impl/AbstractModelAPIResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
import ai.timefold.solver.model.definition.api.log.LogInfo;
import ai.timefold.solver.model.definition.api.metrics.ModelInputMetrics;
import ai.timefold.solver.model.definition.api.metrics.ModelOutputMetrics;
import ai.timefold.solver.model.definition.api.rest.DatasetSelector;
import ai.timefold.solver.model.definition.api.rest.OperationId;
import ai.timefold.solver.model.definition.api.rest.OperationOnPost;
import ai.timefold.solver.model.definition.api.validation.Issue;
import ai.timefold.solver.model.definition.api.validation.IssueCode;
import ai.timefold.solver.model.definition.api.validation.ModelValidator;
Expand All @@ -62,9 +65,6 @@
import ai.timefold.solver.model.definition.internal.events.SolverChannels;
import ai.timefold.solver.model.definition.internal.storage.AbstractStorageService;
import ai.timefold.solver.model.json.internal.patch.JsonPatch;
import ai.timefold.solver.model.rest.definition.api.DatasetSelector;
import ai.timefold.solver.model.rest.definition.api.OperationId;
import ai.timefold.solver.model.rest.definition.api.OperationOnPost;

import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
Expand Down
2 changes: 1 addition & 1 deletion ...-model/src/test/java/ai/timefold/solver/model/testmodel/EmployeeScheduleResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import ai.timefold.solver.model.definition.internal.events.InitSolutionEvent;
import ai.timefold.solver.model.definition.internal.events.SolverChannels;
import ai.timefold.solver.model.quarkus.deployment.defaults.EmptyModelConfigOverrides;
import ai.timefold.solver.model.rest.definition.api.OperationOnPost;
import ai.timefold.solver.model.definition.api.rest.OperationOnPost;
import ai.timefold.solver.model.testmodel.domain.Employee;
import ai.timefold.solver.model.testmodel.domain.EmployeeSchedule;
import ai.timefold.solver.model.testmodel.domain.Shift;
Expand Down
2 changes: 1 addition & 1 deletion model/test-model/src/test/java/ai/timefold/solver/model/testmodel/OpenApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import java.util.List;
import java.util.Optional;

import ai.timefold.solver.model.rest.definition.api.OperationId;
import ai.timefold.solver.model.definition.api.rest.OperationId;

import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.openapi.models.OpenAPI;
Expand Down
Loading