Fix bootstrapping

Author: labkey-jeckels

api/src/org/labkey/api/module/DefaultModule.java

@@ -1040,7 +1040,7 @@ public final Set<String> getSqlScripts(@NotNull DbSchema schema)
 
         for (String script : dir.listNames())
         {
-            if ((Strings.CI.endsWith(script, ".sql") || Strings.CI.endsWith(script, ".jsp")) && Strings.CI.endsWith(script, schema.getResourcePrefix() + "-"))
+            if ((Strings.CI.endsWith(script, ".sql") || Strings.CI.endsWith(script, ".jsp")) && Strings.CI.startsWith(script, schema.getResourcePrefix() + "-"))
                 fileNames.add(script);
         }
 

query/src/org/labkey/query/controllers/QueryController.java

@@ -3283,7 +3283,7 @@ public ActionURL getSuccessURL(QueryUpdateForm form)
             if (isBlank(str))
                 str = form.getReturnUrl();
 
-            if (Strings.CS.equals(str, "details.view"))
+            if ("details.view".equals(str))
             {
                 if (null == insertedRow)
                     return super.getSuccessURL(form);
@@ -8290,7 +8290,7 @@ private Map<Integer, Object> getRowFiles()
             return rowFiles;
         }
 
-        private List<Pair<String, String>> getUploadedTemplates(QueryImportTemplateForm form, DomainKind kind) throws ValidationException, QueryUpdateServiceException, ExperimentException
+        private List<Pair<String, String>> getUploadedTemplates(QueryImportTemplateForm form, DomainKind<?> kind) throws ValidationException, QueryUpdateServiceException, ExperimentException
         {
             FileContentService fcs = FileContentService.get();
             if (fcs == null)

query/src/org/labkey/query/olap/BitSetQueryImpl.java

@@ -1318,7 +1318,7 @@ Result union(OP op, Collection<Result> resultsIN) throws OlapException
             if (!(r instanceof MemberSetResult))
                 throw new IllegalArgumentException();
             Hierarchy h = r.getHierarchy();
-            if (null == h || (null != hierarchyName && !Strings.CS.equals(hierarchyName, h.getUniqueName())))
+            if (null == h || (null != hierarchyName && !hierarchyName.equals(h.getUniqueName())))
                 return new UnionResult(results);
             hierarchyName = h.getUniqueName();
         }

study/src/org/labkey/study/model/DatasetDefinition.java

@@ -633,7 +633,7 @@ public static TableInfo getTemplateTableInfo()
     /**
      * For consistency, now return the equivalent of
      *    StudyUserSchema().createSchema().getSchema("Datasets").getTable(_dataset.getLabel());
-     @*
+     *
      * Internal study code can still use the DatasetSchemaTableInfo methods, however, we should try hard to
      * remove usages of DatasetSchemaTableInfo.
      */

wiki/src/org/labkey/wiki/model/WikiVersion.java

@@ -142,7 +142,7 @@ public HtmlString render(@Nullable HttpView<?> view, Container c, Wiki wiki)
     public String getTitle()
     {
         if (null == _title)
-            _title = (null == _wikiName || Strings.CS.equals(_wikiName, "default")) ? "Wiki" : _wikiName;
+            _title = (null == _wikiName || "default".equals(_wikiName)) ? "Wiki" : _wikiName;
         return _title;
     }