Return Set<Class<?>> from Module "get test" methods

labkey-adam · labkey-adam · commit d13a255a4a43 · 2025-10-02T13:50:36.000-07:00
diff --git a/OpenLdapSync/src/org/labkey/openldapsync/OpenLdapSyncModule.java b/OpenLdapSync/src/org/labkey/openldapsync/OpenLdapSyncModule.java
@@ -119,7 +119,7 @@ public boolean isAvailable(DefaultSchema schema, Module module)
     }
 
     @Override
-    public @NotNull Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
         return PageFlowUtil.set(LdapSyncRunner.TestCase.class);
     }
diff --git a/OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncAuditProvider.java b/OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncAuditProvider.java
@@ -36,8 +36,8 @@ public class LdapSyncAuditProvider extends AbstractAuditTypeProvider implements
 
     static final List<FieldKey> 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));
@@ -47,6 +47,11 @@ public class LdapSyncAuditProvider extends AbstractAuditTypeProvider implements
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_COMMENT));
     }
 
+    public LdapSyncAuditProvider()
+    {
+        super(new LdapSyncAuditDomainKind());
+    }
+
     @Override
     public String getEventName()
     {
@@ -68,7 +73,7 @@ public String getDescription()
     @Override
     public TableInfo createTableInfo(UserSchema userSchema, ContainerFilter cf)
     {
-        DefaultAuditTypeTable table = new DefaultAuditTypeTable(this, createStorageTableInfo(), userSchema, cf, defaultVisibleColumns)
+        return new DefaultAuditTypeTable(LdapSyncAuditProvider.this, createStorageTableInfo(), userSchema, cf, defaultVisibleColumns)
         {
             @Override
             protected void initColumn(MutableColumnInfo col)
@@ -87,7 +92,6 @@ else if (COLUMN_NAME_MEMBERSHIPS_CHANGED.equalsIgnoreCase(col.getName()))
                 }
             }
         };
-        return table;
     }
 
     @Override
@@ -96,12 +100,6 @@ public List<FieldKey> getDefaultVisibleColumns()
         return defaultVisibleColumns;
     }
 
-    @Override
-    protected AbstractAuditDomainKind getDomainKind()
-    {
-        return new LdapSyncAuditDomainKind();
-    }
-
     @Override
     public Map<FieldKey, String> legacyNameMap()
     {
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisModule.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisModule.java
@@ -505,40 +505,35 @@ protected void registerContainerListeners()
     }
 
     @Override
-    @NotNull
-    public Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
-        @SuppressWarnings({"unchecked"})
-        Set<Class> testClasses = new HashSet<>(Arrays.asList(
-                Barcoder.TestCase.class,
-                BamIterator.TestCase.class,
-                SequenceIntegrationTests.SequenceImportPipelineTestCase.class,
-                //SequenceIntegrationTests.SequenceAnalysisPipelineTestCase3.class,
-                SequenceIntegrationTests.SequenceAnalysisPipelineTestCase1.class,
-                SequenceIntegrationTests.SequenceAnalysisPipelineTestCase2.class,
-                OutputIntegrationTests.VariantProcessingTest.class,
-                SequenceRemoteIntegrationTests.class,
-                SequenceTriggerHelper.TestCase.class,
-                SequencePipelineServiceImpl.TestCase.class
-        ));
-
-        return testClasses;
+        return Set.of(
+            Barcoder.TestCase.class,
+            BamIterator.TestCase.class,
+            SequenceIntegrationTests.SequenceImportPipelineTestCase.class,
+            //SequenceIntegrationTests.SequenceAnalysisPipelineTestCase3.class,
+            SequenceIntegrationTests.SequenceAnalysisPipelineTestCase1.class,
+            SequenceIntegrationTests.SequenceAnalysisPipelineTestCase2.class,
+            OutputIntegrationTests.VariantProcessingTest.class,
+            SequenceRemoteIntegrationTests.class,
+            SequenceTriggerHelper.TestCase.class,
+            SequencePipelineServiceImpl.TestCase.class
+        );
     }
 
     @Override
-    @NotNull
-    public Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
-        return PageFlowUtil.set(
-                SequenceAlignmentTask.TestCase.class,
-                SequenceAnalysisManager.TestCase.class,
-                SequenceJob.TestCase.class,
-                SequenceJobSupportImpl.TestCase.class,
-                ProcessVariantsHandler.TestCase.class,
-                VariantProcessingJob.TestCase.class,
-                ScatterGatherUtils.TestCase.class,
-                ChainFileValidator.TestCase.class,
-                FastqcRunner.TestCase.class
+        return Set.of(
+            SequenceAlignmentTask.TestCase.class,
+            SequenceAnalysisManager.TestCase.class,
+            SequenceJob.TestCase.class,
+            SequenceJobSupportImpl.TestCase.class,
+            ProcessVariantsHandler.TestCase.class,
+            VariantProcessingJob.TestCase.class,
+            ScatterGatherUtils.TestCase.class,
+            ChainFileValidator.TestCase.class,
+            FastqcRunner.TestCase.class
         );
     }
 
diff --git a/Studies/src/org/labkey/studies/StudiesModule.java b/Studies/src/org/labkey/studies/StudiesModule.java
@@ -14,7 +14,6 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.studies.query.StudiesUserSchema;
 import org.labkey.api.studies.security.StudiesDataAdminRole;
-import org.labkey.studies.query.StudiesUserSchema;
 import org.labkey.studies.study.StudiesFilterProvider;
 import org.labkey.studies.study.StudyEnrollmentEventProvider;
 
@@ -83,10 +82,8 @@ public QuerySchema createSchema(final DefaultSchema schema, Module module)
     }
 
     @Override
-    public @NotNull Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
-        return PageFlowUtil.set(
-                StudiesManager.TestCase.class
-        );
+        return Set.of(StudiesManager.TestCase.class);
     }
 }
diff --git a/cluster/src/org/labkey/cluster/ClusterModule.java b/cluster/src/org/labkey/cluster/ClusterModule.java
@@ -122,23 +122,15 @@ public Set<String> getSchemaNames()
     }
 
     @Override
-    @NotNull
-    public Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
-        @SuppressWarnings({"unchecked"})
-        Set<Class> testClasses = new HashSet<>(List.of(
-                TestCase.class
-        ));
-
-        return testClasses;
+        return Set.of(TestCase.class);
     }
 
     @Override
-    public @NotNull Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
-        return new HashSet<>(List.of(
-                SlurmExecutionEngine.TestCase.class
-        ));
+        return Set.of(SlurmExecutionEngine.TestCase.class);
     }
 
     @Override
diff --git a/discvrcore/src/org/labkey/discvrcore/DiscvrCoreModule.java b/discvrcore/src/org/labkey/discvrcore/DiscvrCoreModule.java
@@ -87,7 +87,7 @@ public Set<String> getSchemaNames()
 
 
     @Override
-    public @NotNull Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
         return PageFlowUtil.set(AuditSummaryUserSchema.TestCase.class);
     }
diff --git a/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java b/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java
@@ -142,11 +142,8 @@ public Set<String> getSchemaNames()
     }
 
     @Override
-    @NotNull
-    public Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
-        return PageFlowUtil.set(
-                JBrowseManager.TestCase.class
-        );
+        return Set.of(JBrowseManager.TestCase.class);
     }
 }
diff --git a/singlecell/src/org/labkey/singlecell/SingleCellModule.java b/singlecell/src/org/labkey/singlecell/SingleCellModule.java
@@ -310,12 +310,11 @@ public static void registerPipelineSteps()
     }
 
     @Override
-    @NotNull
-    public Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
-        return PageFlowUtil.set(
-                AbstractSingleCellHandler.TestCase.class,
-                PrepareRawCounts.TestCase.class
+        return Set.of(
+            AbstractSingleCellHandler.TestCase.class,
+            PrepareRawCounts.TestCase.class
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public boolean isAvailable(DefaultSchema schema, Module module)`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`@Override`
`122`		`- public @NotNull Set<Class> getIntegrationTests()`
	`122`	`+ public @NotNull Set<Class<?>> getIntegrationTests()`
`123`	`123`	`{`
`124`	`124`	`return PageFlowUtil.set(LdapSyncRunner.TestCase.class);`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public class LdapSyncAuditProvider extends AbstractAuditTypeProvider implements`
`36`	`36`
`37`	`37`	`static final List<FieldKey> defaultVisibleColumns = new ArrayList<>();`
`38`	`38`
`39`		`- static {`
`40`		`-`
	`39`	`+ static`
	`40`	`+ {`
`41`	`41`	`defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED));`
`42`	`42`	`defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED_BY));`
`43`	`43`	`defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_IMPERSONATED_BY));`
`@@ -47,6 +47,11 @@ public class LdapSyncAuditProvider extends AbstractAuditTypeProvider implements`
`47`	`47`	`defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_COMMENT));`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ public LdapSyncAuditProvider()`
	`51`	`+ {`
	`52`	`+ super(new LdapSyncAuditDomainKind());`
	`53`	`+ }`
	`54`	`+`
`50`	`55`	`@Override`
`51`	`56`	`public String getEventName()`
`52`	`57`	`{`
`@@ -68,7 +73,7 @@ public String getDescription()`
`68`	`73`	`@Override`
`69`	`74`	`public TableInfo createTableInfo(UserSchema userSchema, ContainerFilter cf)`
`70`	`75`	`{`
`71`		`- DefaultAuditTypeTable table = new DefaultAuditTypeTable(this, createStorageTableInfo(), userSchema, cf, defaultVisibleColumns)`
	`76`	`+ return new DefaultAuditTypeTable(LdapSyncAuditProvider.this, createStorageTableInfo(), userSchema, cf, defaultVisibleColumns)`
`72`	`77`	`{`
`73`	`78`	`@Override`
`74`	`79`	`protected void initColumn(MutableColumnInfo col)`
`@@ -87,7 +92,6 @@ else if (COLUMN_NAME_MEMBERSHIPS_CHANGED.equalsIgnoreCase(col.getName()))`
`87`	`92`	`}`
`88`	`93`	`}`
`89`	`94`	`};`
`90`		`- return table;`
`91`	`95`	`}`
`92`	`96`
`93`	`97`	`@Override`
`@@ -96,12 +100,6 @@ public List<FieldKey> getDefaultVisibleColumns()`
`96`	`100`	`return defaultVisibleColumns;`
`97`	`101`	`}`
`98`	`102`
`99`		`- @Override`
`100`		`- protected AbstractAuditDomainKind getDomainKind()`
`101`		`- {`
`102`		`- return new LdapSyncAuditDomainKind();`
`103`		`- }`
`104`		`-`
`105`	`103`	`@Override`
`106`	`104`	`public Map<FieldKey, String> legacyNameMap()`
`107`	`105`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`import org.labkey.api.util.PageFlowUtil;`
`15`	`15`	`import org.labkey.studies.query.StudiesUserSchema;`
`16`	`16`	`import org.labkey.api.studies.security.StudiesDataAdminRole;`
`17`		`-import org.labkey.studies.query.StudiesUserSchema;`
`18`	`17`	`import org.labkey.studies.study.StudiesFilterProvider;`
`19`	`18`	`import org.labkey.studies.study.StudyEnrollmentEventProvider;`
`20`	`19`
`@@ -83,10 +82,8 @@ public QuerySchema createSchema(final DefaultSchema schema, Module module)`
`83`	`82`	`}`
`84`	`83`
`85`	`84`	`@Override`
`86`		`- public @NotNull Set<Class> getIntegrationTests()`
	`85`	`+ public @NotNull Set<Class<?>> getIntegrationTests()`
`87`	`86`	`{`
`88`		`- return PageFlowUtil.set(`
`89`		`- StudiesManager.TestCase.class`
`90`		`- );`
	`87`	`+ return Set.of(StudiesManager.TestCase.class);`
`91`	`88`	`}`
`92`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,23 +122,15 @@ public Set<String> getSchemaNames()`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`@Override`
`125`		`- @NotNull`
`126`		`- public Set<Class> getIntegrationTests()`
	`125`	`+ public @NotNull Set<Class<?>> getIntegrationTests()`
`127`	`126`	`{`
`128`		`- @SuppressWarnings({"unchecked"})`
`129`		`- Set<Class> testClasses = new HashSet<>(List.of(`
`130`		`- TestCase.class`
`131`		`- ));`
`132`		`-`
`133`		`- return testClasses;`
	`127`	`+ return Set.of(TestCase.class);`
`134`	`128`	`}`
`135`	`129`
`136`	`130`	`@Override`
`137`		`- public @NotNull Set<Class> getUnitTests()`
	`131`	`+ public @NotNull Set<Class<?>> getUnitTests()`
`138`	`132`	`{`
`139`		`- return new HashSet<>(List.of(`
`140`		`- SlurmExecutionEngine.TestCase.class`
`141`		`- ));`
	`133`	`+ return Set.of(SlurmExecutionEngine.TestCase.class);`
`142`	`134`	`}`
`143`	`135`
`144`	`136`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public Set<String> getSchemaNames()`
`87`	`87`
`88`	`88`
`89`	`89`	`@Override`
`90`		`- public @NotNull Set<Class> getIntegrationTests()`
	`90`	`+ public @NotNull Set<Class<?>> getIntegrationTests()`
`91`	`91`	`{`
`92`	`92`	`return PageFlowUtil.set(AuditSummaryUserSchema.TestCase.class);`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,11 +142,8 @@ public Set<String> getSchemaNames()`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`@Override`
`145`		`- @NotNull`
`146`		`- public Set<Class> getUnitTests()`
	`145`	`+ public @NotNull Set<Class<?>> getUnitTests()`
`147`	`146`	`{`
`148`		`- return PageFlowUtil.set(`
`149`		`- JBrowseManager.TestCase.class`
`150`		`- );`
	`147`	`+ return Set.of(JBrowseManager.TestCase.class);`
`151`	`148`	`}`
`152`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -310,12 +310,11 @@ public static void registerPipelineSteps()`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`@Override`
`313`		`- @NotNull`
`314`		`- public Set<Class> getUnitTests()`
	`313`	`+ public @NotNull Set<Class<?>> getUnitTests()`
`315`	`314`	`{`
`316`		`- return PageFlowUtil.set(`
`317`		`- AbstractSingleCellHandler.TestCase.class,`
`318`		`- PrepareRawCounts.TestCase.class`
	`315`	`+ return Set.of(`
	`316`	`+ AbstractSingleCellHandler.TestCase.class,`
	`317`	`+ PrepareRawCounts.TestCase.class`
`319`	`318`	`);`
`320`	`319`	`}`
`321`	`320`	`}`