Skip to content

Commit 5030494

Browse files
authored
Return Set<Class<?>> from Module "get test" methods
Original PR: LabKey/platform#7098
1 parent 5f1204e commit 5030494

4 files changed

Lines changed: 9 additions & 10 deletions

File tree

studydesign/src/org/labkey/studydesign/StudyDesignModule.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public String getName()
3434
protected Collection<WebPartFactory> createWebPartFactories()
3535
{
3636
return List.of(
37-
new AssayScheduleWebpartFactory(),
38-
new ImmunizationScheduleWebpartFactory(),
39-
new VaccineDesignWebpartFactory()
37+
new AssayScheduleWebpartFactory(),
38+
new ImmunizationScheduleWebpartFactory(),
39+
new VaccineDesignWebpartFactory()
4040
);
4141
}
4242

@@ -72,12 +72,11 @@ protected void startupAfterSpringConfig(ModuleContext moduleContext)
7272
}
7373

7474
@Override
75-
@NotNull
76-
public Set<Class> getIntegrationTests()
75+
public @NotNull Set<Class<?>> getIntegrationTests()
7776
{
7877
return Set.of(
79-
TreatmentManager.TreatmentDataTestCase.class,
80-
TreatmentManager.AssayScheduleTestCase.class
78+
TreatmentManager.TreatmentDataTestCase.class,
79+
TreatmentManager.AssayScheduleTestCase.class
8180
);
8281
}
8382
}

studydesign/src/org/labkey/studydesign/view/AssayScheduleWebpartFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public AssayScheduleWebpartFactory()
4343
}
4444

4545
@Override
46-
public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
46+
public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
4747
{
4848
if (!canShow(portalCtx.getContainer()))
4949
return null;

studydesign/src/org/labkey/studydesign/view/ImmunizationScheduleWebpartFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public ImmunizationScheduleWebpartFactory()
4343
}
4444

4545
@Override
46-
public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
46+
public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
4747
{
4848
if (!canShow(portalCtx.getContainer()))
4949
return null;

studydesign/src/org/labkey/studydesign/view/VaccineDesignWebpartFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public VaccineDesignWebpartFactory()
3535
}
3636

3737
@Override
38-
public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
38+
public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
3939
{
4040
if (!canShow(portalCtx.getContainer()))
4141
return null;

0 commit comments

Comments
 (0)