Improve use of generics

Author: bbimber

LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java

@@ -1274,7 +1274,7 @@ private void verifyOligoCount(int expected) throws Exception
         log("verifying oligo count, expected: " + expected);
 
         SelectRowsCommand sr = new SelectRowsCommand("laboratory", "dna_oligos");
-        sr.setColumns(Arrays.asList("rowid", "name", "container"));
+        sr.setColumns(Arrays.asList("rowid", "name", "container", "sequence"));
 
         Connection cn = WebTestHelper.getRemoteApiConnection();
         SelectRowsResponse srr = sr.execute(cn, getCurrentContainerPath());

laboratory/src/org/labkey/laboratory/LaboratoryUserSchema.java

@@ -67,7 +67,7 @@ else if (LaboratorySchema.TABLE_SAMPLES.equalsIgnoreCase(name))
             return super.createWrappedTable(name, sourceTable, cf);
     }
 
-    private SimpleTable getSubjectsTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
+    private SimpleTable<?> getSubjectsTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
     {
         return new ContainerScopedTable<>(this, schematable, cf, "subjectname").init();
     }
@@ -77,27 +77,27 @@ private TableInfo getContainerScopedTable(String name, @NotNull TableInfo schema
         return new ContainerScopedTable<>(this, schematable, cf, pkCol).init();
     }
 
-    private SimpleTable getDnaOligosTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
+    private SimpleTable<?> getDnaOligosTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
     {
         return new ContainerIncrementingTable(this, schematable, cf, "oligo_id").init();
     }
 
-    private SimpleTable getSamplesTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
+    private SimpleTable<?> getSamplesTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
     {
         return new ContainerIncrementingTable(this, schematable, cf, "freezerid").init();
     }
 
-    private SimpleTable getPeptideTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
+    private SimpleTable<?> getPeptideTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
     {
         return new ContainerIncrementingTable(this, schematable, cf, "peptideId").init();
     }
 
-    private SimpleTable getAntibodiesTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
+    private SimpleTable<?> getAntibodiesTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
     {
         return new ContainerIncrementingTable(this, schematable, cf, "antibodyId").init();
     }
 
-    private SimpleTable getWorkbooksTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
+    private SimpleTable<?> getWorkbooksTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
     {
         return new LaboratoryWorkbooksTable(this, schematable, cf).init();
     }