Return Set<Class<?>> from Module "get test" methods (#574)

Author: labkey-adam

SkylineToolsStore/src/org/labkey/skylinetoolsstore/SkylineToolsStoreModule.java

@@ -74,7 +74,7 @@ protected Collection<WebPartFactory> createWebPartFactories()
                             }
 
                             @Override
-                            public WebPartView getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart) throws WebPartConfigurationException
+                            public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart) throws WebPartConfigurationException
                             {
                                 return new SkylineToolsStoreWebPart();
                             }

lincs/src/org/labkey/lincs/LincsModule.java

@@ -85,7 +85,7 @@ protected Collection<WebPartFactory> createWebPartFactories()
         BaseWebPartFactory runsList = new BaseWebPartFactory(LincsDataView.WEB_PART_NAME)
         {
             @Override
-            public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
+            public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
             {
                 return new LincsDataView(portalCtx);
             }

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java

@@ -357,9 +357,8 @@ public Set<String> getSchemaNames()
         return Collections.singleton(PanoramaPublicSchema.SCHEMA_NAME);
     }
 
-    @NotNull
     @Override
-    public Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
         return Set.of(
                 PanoramaPublicController.TestCase.class,
@@ -368,11 +367,10 @@ public Set<Class> getIntegrationTests()
         );
     }
 
-    @NotNull
     @Override
-    public Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
-        Set<Class> set = new HashSet<>();
+        Set<Class<?>> set = new HashSet<>();
         set.add(PanoramaPublicController.TestCase.class);
         set.add(PanoramaPublicNotification.TestCase.class);
         set.add(SkylineVersion.TestCase.class);
@@ -384,7 +382,7 @@ public Set<Class> getUnitTests()
         set.add(CatalogEntryManager.TestCase.class);
         set.add(BlueskyApiClient.TestCase.class);
         set.add(PrivateDataReminderSettings.TestCase.class);
-        return set;
 
+        return set;
     }
 }

signup/src/org/labkey/signup/SignUpModule.java

@@ -31,6 +31,7 @@
 import org.labkey.api.view.ViewContext;
 import org.labkey.api.view.WebPartFactory;
 import org.labkey.api.view.WebPartView;
+import org.labkey.signup.SignUpController.SignupForm;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -69,9 +70,9 @@ protected Collection<WebPartFactory> createWebPartFactories()
         BaseWebPartFactory signupWebpart = new BaseWebPartFactory("Sign Up")
         {
             @Override
-            public WebPartView getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart)
+            public JspView<SignupForm> getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart)
             {
-                JspView<SignUpController.SignupForm> view = new JspView<>("/org/labkey/signup/signupPage.jsp", new SignUpController.SignupForm());
+                JspView<SignupForm> view = new JspView<>("/org/labkey/signup/signupPage.jsp", new SignupForm());
                 view.setTitle("Sign Up");
 
                 return view;

testresults/src/org/labkey/testresults/TestResultsWebPart.java

@@ -22,7 +22,7 @@ public TestResultsWebPart()
     }
 
     @Override
-    public WebPartView getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart) throws WebPartConfigurationException
+    public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, Portal.@NotNull WebPart webPart) throws WebPartConfigurationException
     {
         Container c =portalCtx.getContainer();
         TestsDataBean bean = null;