Skip to content

Commit 2664af8

Browse files
remove (Integer) casts
bulk search/replace
1 parent d1ac0fc commit 2664af8

File tree

6 files changed

+19
-8
lines changed

6 files changed

+19
-8
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
import java.util.zip.ZipEntry;
210210
import java.util.zip.ZipOutputStream;
211211

212+
import static org.labkey.api.exp.api.ExperimentService.asInteger;
212213
import static org.labkey.sequenceanalysis.SequenceIntegrationTests.PIPELINE_PROP_NAME;
213214

214215
public class SequenceAnalysisController extends SpringActionController
@@ -3239,8 +3240,8 @@ public ApiResponse execute(CheckFileStatusForm form, BindException errors)
32393240
continue;
32403241
}
32413242

3242-
Integer dataId = (Integer) rowMap.get("dataid");
3243-
Integer libraryId = (Integer) rowMap.get("library_id");
3243+
Integer dataId = asInteger(rowMap.get("dataid"));
3244+
Integer libraryId = asInteger(rowMap.get("library_id"));
32443245
ExpData d = ExperimentService.get().getExpData(dataId);
32453246
if (d == null)
32463247
{

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisManager.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@
9191
import java.util.Map;
9292
import java.util.Set;
9393

94+
import static org.labkey.api.exp.api.ExperimentService.asInteger;
95+
9496
public class SequenceAnalysisManager
9597
{
9698
private static final SequenceAnalysisManager _instance = new SequenceAnalysisManager();
@@ -783,7 +785,7 @@ public List<Integer> importRefSequencesFromFasta(Container c, User u, File file,
783785
map.put("jobId", jobId);
784786

785787
map = Table.insert(u, dnaTable, map);
786-
sequenceIds.add((Integer) map.get("rowid"));
788+
sequenceIds.add(asInteger(map.get("rowid")));
787789

788790
RefNtSequenceModel m = new TableSelector(dnaTable, new SimpleFilter(FieldKey.fromString("rowid"), map.get("rowid")), null).getObject(RefNtSequenceModel.class);
789791

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisServiceImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
import java.util.Set;
7070
import java.util.function.Function;
7171

72+
import static org.labkey.api.exp.api.ExperimentService.asLong;
73+
7274
/**
7375
* User: bimber
7476
* Date: 10/27/13
@@ -231,7 +233,7 @@ public ReferenceGenomeImpl getReferenceGenome(int genomeId, User u) throws Pipel
231233
throw new UnauthorizedException("Cannot read data in container: " + c.getPath());
232234
}
233235

234-
ExpData d = ExperimentService.get().getExpData((Integer)map.get("fasta_file"));
236+
ExpData d = ExperimentService.get().getExpData(asLong(map.get("fasta_file")));
235237
if (d.getFile() == null)
236238
{
237239
throw new PipelineJobException("No FASTA file found for genome: " + genomeId);

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceIntegrationTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@
9090
import java.util.Set;
9191
import java.util.stream.Collectors;
9292

93+
import static org.labkey.api.exp.api.ExperimentService.asInteger;
94+
9395
/**
9496
* User: bimber
9597
* Date: 11/25/12
@@ -1753,11 +1755,11 @@ protected Integer createSavedLibrary() throws Exception
17531755
if (ts.exists())
17541756
{
17551757
Map<String, Object> rowMap = ts.getMap();
1756-
Integer fasta_file = (Integer)rowMap.get("fasta_file");
1758+
Integer fasta_file = asInteger(rowMap.get("fasta_file"));
17571759
ExpData d = fasta_file == null ? null : ExperimentService.get().getExpData(fasta_file);
17581760
if (d != null && d.getFile() != null && d.getFile().exists())
17591761
{
1760-
return (Integer) rowMap.get("rowid");
1762+
return asInteger(rowMap.get("rowid"));
17611763
}
17621764
else
17631765
{

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/IlluminaImportTask.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@
5757
import java.util.List;
5858
import java.util.Map;
5959

60+
import static org.labkey.api.exp.api.ExperimentService.asInteger;
61+
6062
/**
6163
* User: bbimber
6264
* Date: 4/22/12
@@ -292,7 +294,7 @@ private void handleInstrumentRun(DbSchema schema)
292294

293295
runRow = Table.insert(getJob().getUser(), runTable, runRow);
294296

295-
_instrumentRunId = (Integer)runRow.get("rowid");
297+
_instrumentRunId = asInteger(runRow.get("rowid"));
296298
getJob().getLogger().info("Created run: " + _instrumentRunId);
297299
}
298300

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/ImportGenomeTrackTask.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@
8181
import java.util.Map;
8282
import java.util.Set;
8383

84+
import static org.labkey.api.exp.api.ExperimentService.asInteger;
85+
8486
/**
8587
* User: bbimber
8688
* Date: 8/6/12
@@ -338,7 +340,7 @@ else if (SequenceUtil.FILETYPE.bw.getFileType().isType(file))
338340
throw new PipelineJobException("Unable to find rowid for new track");
339341
}
340342

341-
return (Integer)map.get("rowid");
343+
return asInteger(map.get("rowid"));
342344
}
343345

344346
private void sortGxf(File gxf) throws PipelineJobException

0 commit comments

Comments
 (0)