Skip to content

Add MAXWORK lifecycle to final lifecycle states #3642

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

Open
FineAndDandy wants to merge 2 commits into
base: integration
Choose a base branch
from
+44 −2
Open

Add MAXWORK lifecycle to final lifecycle states #3642

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7430bd1
Add MAXWORK lifecycle to final lifecycle states
FineAndDandy Jun 25, 2026
eb3f367
Merge branch 'integration' into bugfix/3639
FineAndDandy Jun 25, 2026
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
4 changes: 2 additions & 2 deletions ...ces/query-metric/api/src/main/java/datawave/microservice/querymetric/BaseQueryMetric.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,8 +1057,8 @@ public void setLifecycle(Lifecycle lifecycle) {
*/
@JsonIgnore
public boolean isLifecycleFinal() {
return Lifecycle.CLOSED == lifecycle || Lifecycle.CANCELLED == lifecycle || Lifecycle.MAXRESULTS == lifecycle || Lifecycle.NEXTTIMEOUT == lifecycle
|| Lifecycle.TIMEOUT == lifecycle || Lifecycle.SHUTDOWN == lifecycle;
return Lifecycle.CLOSED == lifecycle || Lifecycle.CANCELLED == lifecycle || Lifecycle.MAXRESULTS == lifecycle || Lifecycle.MAXWORK == lifecycle

@apmoriarty apmoriarty Jun 25, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At this point we should disable the formatter and have something like

// @formatter:off
return Lifecycle.CLOSED ||
           Lifecycle.CANCELLED ||
...
// @formatter:on

|| Lifecycle.NEXTTIMEOUT == lifecycle || Lifecycle.TIMEOUT == lifecycle || Lifecycle.SHUTDOWN == lifecycle;
}

public String getQueryAuthorizations() {
Expand Down
42 changes: 42 additions & 0 deletions ...query-metric/api/src/test/java/datawave/microservice/querymetric/BaseQueryMetricTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package datawave.microservice.querymetric;

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.util.stream.Stream;

import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

public class BaseQueryMetricTest {

static Stream<BaseQueryMetric.Lifecycle> finalStates() {
return Stream.of(BaseQueryMetric.Lifecycle.CANCELLED, BaseQueryMetric.Lifecycle.MAXRESULTS, BaseQueryMetric.Lifecycle.MAXWORK,

@apmoriarty apmoriarty Jun 25, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Static imorts?

BaseQueryMetric.Lifecycle.TIMEOUT, BaseQueryMetric.Lifecycle.NEXTTIMEOUT, BaseQueryMetric.Lifecycle.CLOSED);
}

static Stream<BaseQueryMetric.Lifecycle> otherStates() {
return Stream.of(null, BaseQueryMetric.Lifecycle.NONE, BaseQueryMetric.Lifecycle.DEFINED, BaseQueryMetric.Lifecycle.INITIALIZED,
BaseQueryMetric.Lifecycle.RESULTS);
}

@ParameterizedTest(name = "{0} should be preserved")
@MethodSource("finalStates")
public void testFinalLifecycle(BaseQueryMetric.Lifecycle lifecycle) {
BaseQueryMetric metric = new QueryMetric();
metric.setLifecycle(lifecycle);
assertEquals(lifecycle, metric.getLifecycle());
metric.setLifecycle(BaseQueryMetric.Lifecycle.CLOSED);
assertEquals(lifecycle, metric.getLifecycle());
}

@ParameterizedTest(name = "{0} should be over-written with CLOSE")
@MethodSource("otherStates")
public void testNonFinalLifecycles(BaseQueryMetric.Lifecycle lifecycle) {
BaseQueryMetric metric = new QueryMetric();
metric.setLifecycle(lifecycle);
assertEquals(lifecycle, metric.getLifecycle());
metric.setLifecycle(BaseQueryMetric.Lifecycle.CLOSED);
assertEquals(BaseQueryMetric.Lifecycle.CLOSED, metric.getLifecycle());
}

}
Loading