Skip to content

Improve generics and other warnings #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 1 commit into from
Sep 5, 2025
Merged

Improve generics and other warnings #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flow/src/org/labkey/flow/controllers/FlowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public ModelAndView getView(Object o, BindException errors)
run = schema.getRun();
// script = schema.getScript();

QueryView view = schema.createView(getViewContext(), settings);
QueryView view = schema.createView(getViewContext(), settings, errors);
if (view.getQueryDef() == null)
{
throw new NotFoundException("Query definition '" + settings.getQueryName() + "' in flow schema not found");
Expand Down
9 changes: 5 additions & 4 deletions flow/src/org/labkey/flow/controllers/editscript/CompensationCalculationPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.labkey.flow.controllers.editscript;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.fhcrc.cpas.flow.script.xml.ChannelDef;
import org.fhcrc.cpas.flow.script.xml.ChannelSubsetDef;
import org.fhcrc.cpas.flow.script.xml.CompensationCalculationDef;
Expand Down Expand Up @@ -263,14 +264,14 @@ public SelectBuilder selectKeywordValues(Sign sign, int index)

private boolean subsetNameMatches(String subsetUser, String subsetWorkspace, Sign sign, String channel)
{
if (StringUtils.equals(subsetUser, subsetWorkspace))
if (Strings.CS.equals(subsetUser, subsetWorkspace))
return true;
if (StringUtils.equals(subsetUser, channel + subsetWorkspace))
if (Strings.CS.equals(subsetUser, channel + subsetWorkspace))
return true;
String strSign = sign == Sign.positive ? "+" : "-";
if (StringUtils.equals(subsetUser, channel + strSign + subsetWorkspace))
if (Strings.CS.equals(subsetUser, channel + strSign + subsetWorkspace))
return true;
if (StringUtils.equals(subsetUser, strSign + subsetWorkspace))
if (Strings.CS.equals(subsetUser, strSign + subsetWorkspace))
return true;
return false;
}
Expand Down
6 changes: 3 additions & 3 deletions microarray/src/org/labkey/microarray/matrix/ExpressionMatrixAssayProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package org.labkey.microarray.matrix;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.fhcrc.cpas.exp.xml.ExperimentRunType;
import org.fhcrc.cpas.exp.xml.SimpleTypeNames;
import org.fhcrc.cpas.exp.xml.SimpleValueType;
Expand Down Expand Up @@ -234,7 +234,7 @@ public void beforeXarExportRun(ExpRun run, ExperimentRunType xrun)
}
for (SimpleValueType sv : xrun.getProperties().getSimpleValArray())
{
if (StringUtils.equals("featureSet",sv.getName()))
if (Strings.CS.equals("featureSet",sv.getName()))
{
int featureAnnotationSetRowId = (int)Float.parseFloat(sv.getStringValue());
String featureAnnotationSetName = mapRowIdName.get(featureAnnotationSetRowId);
Expand Down Expand Up @@ -267,7 +267,7 @@ public void beforeXarImportRun(ExperimentRunType xrun)
}
for (SimpleValueType sv : xrun.getProperties().getSimpleValArray())
{
if (StringUtils.equals(FEATURE_SET_PROPERTY_NAME,sv.getName()))
if (Strings.CS.equals(FEATURE_SET_PROPERTY_NAME,sv.getName()))
{
String featureAnnotationSetName = sv.getStringValue();
Long featureAnnotationRowId = mapNameRowId.get(featureAnnotationSetName);
Expand Down