Skip to content

Commit 04e0e3f

Browse files
authored
Return Set<Class<?>> from Module "get test" methods (#1119)
1 parent f609fa8 commit 04e0e3f

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

src/org/labkey/targetedms/TargetedMSModule.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -686,19 +686,17 @@ protected void startupAfterSpringConfig(ModuleContext moduleContext)
686686
TargetedMSService.get().registerSkylineDocumentImportListener(QCNotificationSender.get());
687687
}
688688

689-
@NotNull
690689
@Override
691-
public Set<Class> getIntegrationTests()
690+
public @NotNull Set<Class<?>> getIntegrationTests()
692691
{
693692
return Set.of(
694693
MsDataSourceUtil.TestCase.class,
695694
SkylineAuditLogManager.TestCase.class
696695
);
697696
}
698697

699-
@NotNull
700698
@Override
701-
public Set<Class> getUnitTests()
699+
public @NotNull Set<Class<?>> getUnitTests()
702700
{
703701
return Set.of(
704702
ComparisonCategory.TestCase.class,

src/org/labkey/targetedms/TargetedMsRepresentativeStateAuditProvider.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public class TargetedMsRepresentativeStateAuditProvider extends AbstractAuditTyp
4040

4141
static final List<FieldKey> defaultVisibleColumns = new ArrayList<>();
4242

43-
static {
44-
43+
static
44+
{
4545
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED));
4646
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED_BY));
4747
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_IMPERSONATED_BY));
@@ -50,10 +50,9 @@ public class TargetedMsRepresentativeStateAuditProvider extends AbstractAuditTyp
5050
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_COMMENT));
5151
}
5252

53-
@Override
54-
protected AbstractAuditDomainKind getDomainKind()
53+
public TargetedMsRepresentativeStateAuditProvider()
5554
{
56-
return new TargetedMsRepresentativeStateAuditDomainKind();
55+
super(new TargetedMsRepresentativeStateAuditDomainKind());
5756
}
5857

5958
@Override

0 commit comments

Comments
 (0)