From 48f9770be1096aca52b918acdc3b8bf33a51beec Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Thu, 2 Oct 2025 13:50:59 -0700 Subject: [PATCH] Return Set> from Module "get test" methods --- flow/src/org/labkey/flow/FlowModule.java | 6 ++---- .../flow/persist/FlowKeywordAuditProvider.java | 14 +++++++------- luminex/src/org/labkey/luminex/LuminexModule.java | 3 +-- ms2/src/org/labkey/ms2/MS2Module.java | 6 ++---- nab/src/org/labkey/nab/NabModule.java | 3 +-- protein/src/org/labkey/protein/ProteinModule.java | 4 ++-- .../src/org/labkey/viability/ViabilityModule.java | 3 +-- 7 files changed, 16 insertions(+), 23 deletions(-) diff --git a/flow/src/org/labkey/flow/FlowModule.java b/flow/src/org/labkey/flow/FlowModule.java index d53cf1bad..bdefb2d37 100644 --- a/flow/src/org/labkey/flow/FlowModule.java +++ b/flow/src/org/labkey/flow/FlowModule.java @@ -312,8 +312,7 @@ public Set getSchemaNames() @Override - @NotNull - public Set getUnitTests() + public @NotNull Set> getUnitTests() { return Set.of( AnalysisSerializer.TestCase.class, @@ -329,9 +328,8 @@ public Set getUnitTests() ); } - @NotNull @Override - public Set getIntegrationTests() + public @NotNull Set> getIntegrationTests() { return Set.of( FlowController.TestCase.class, diff --git a/flow/src/org/labkey/flow/persist/FlowKeywordAuditProvider.java b/flow/src/org/labkey/flow/persist/FlowKeywordAuditProvider.java index 04e2e37c9..8218c34e3 100644 --- a/flow/src/org/labkey/flow/persist/FlowKeywordAuditProvider.java +++ b/flow/src/org/labkey/flow/persist/FlowKeywordAuditProvider.java @@ -50,7 +50,8 @@ public class FlowKeywordAuditProvider extends AbstractAuditTypeProvider implemen static final List defaultVisibleColumns = new ArrayList<>(); - static { + static + { defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED)); defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED_BY)); defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_IMPERSONATED_BY)); @@ -60,6 +61,11 @@ public class FlowKeywordAuditProvider extends AbstractAuditTypeProvider implemen defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_KEYWORD_NEW_VALUE)); } + public FlowKeywordAuditProvider() + { + super(new FlowKeywordAuditDomainKind()); + } + @Override public TableInfo createTableInfo(UserSchema userSchema, ContainerFilter cf) { @@ -75,12 +81,6 @@ public TableInfo createTableInfo(UserSchema userSchema, ContainerFilter cf) return table; } - @Override - protected AbstractAuditDomainKind getDomainKind() - { - return new FlowKeywordAuditDomainKind(); - } - @Override public String getEventName() { diff --git a/luminex/src/org/labkey/luminex/LuminexModule.java b/luminex/src/org/labkey/luminex/LuminexModule.java index 7fb1317cd..91166c1c0 100644 --- a/luminex/src/org/labkey/luminex/LuminexModule.java +++ b/luminex/src/org/labkey/luminex/LuminexModule.java @@ -92,9 +92,8 @@ public Set getSchemaNames() return Collections.singleton(LuminexProtocolSchema.DB_SCHEMA_NAME); } - @NotNull @Override - public Set getUnitTests() + public @NotNull Set> getUnitTests() { return Set.of( AssayQCFlagColumn.TestCase.class, diff --git a/ms2/src/org/labkey/ms2/MS2Module.java b/ms2/src/org/labkey/ms2/MS2Module.java index da4cfd5d1..e406cb46e 100644 --- a/ms2/src/org/labkey/ms2/MS2Module.java +++ b/ms2/src/org/labkey/ms2/MS2Module.java @@ -299,8 +299,7 @@ public List getSchemaNames() } @Override - @NotNull - public Set getIntegrationTests() + public @NotNull Set> getIntegrationTests() { return Set.of( Comet2014ParamsBuilder.FullParseTestCase.class, @@ -312,8 +311,7 @@ public Set getIntegrationTests() } @Override - @NotNull - public Set getUnitTests() + public @NotNull Set> getUnitTests() { return Set.of( BibliospecSpectrumRenderer.TestCase.class, diff --git a/nab/src/org/labkey/nab/NabModule.java b/nab/src/org/labkey/nab/NabModule.java index 6f9d220b2..6b3098951 100644 --- a/nab/src/org/labkey/nab/NabModule.java +++ b/nab/src/org/labkey/nab/NabModule.java @@ -116,9 +116,8 @@ public void doStartup(ModuleContext moduleContext) PropertyService.get().registerDomainKind(new NabVirusDomainKind()); } - @NotNull @Override - public Set getUnitTests() + public @NotNull Set> getUnitTests() { return Set.of(PlateParserTests.class); } diff --git a/protein/src/org/labkey/protein/ProteinModule.java b/protein/src/org/labkey/protein/ProteinModule.java index fd9d076f5..d20f66770 100644 --- a/protein/src/org/labkey/protein/ProteinModule.java +++ b/protein/src/org/labkey/protein/ProteinModule.java @@ -180,7 +180,7 @@ public Set getSchemaNames() } @Override - public @NotNull Set getIntegrationTests() + public @NotNull Set> getIntegrationTests() { return Set.of( ProteinController.TestCase.class @@ -188,7 +188,7 @@ public Set getSchemaNames() } @Override - public @NotNull Set getUnitTests() + public @NotNull Set> getUnitTests() { return Set.of( FastaDbLoader.TestCase.class diff --git a/viability/src/org/labkey/viability/ViabilityModule.java b/viability/src/org/labkey/viability/ViabilityModule.java index ab98253da..70ceb753b 100644 --- a/viability/src/org/labkey/viability/ViabilityModule.java +++ b/viability/src/org/labkey/viability/ViabilityModule.java @@ -84,8 +84,7 @@ public Set getSchemaNames() } @Override - @NotNull - public Set getIntegrationTests() + public @NotNull Set> getIntegrationTests() { return Set.of( ViabilityAssayDataHandler.TestCase.class,