Skip to content

Commit a92533d

Browse files
committed
Bugfix to findSuperClassParameterType and add test case
1 parent a1e9372 commit a92533d

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/AbstractPipelineStepProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public JSONObject toJSON()
140140
@Override
141141
public Class<StepType> getStepClass()
142142
{
143-
return (Class<StepType>) SequencePipelineService.get().findSuperClassParameterType(getClass());
143+
return (Class<StepType>) SequencePipelineService.get().findSuperClassParameterType(this);
144144
}
145145

146146
@Override

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,8 @@ public Set<Class> getIntegrationTests()
445445
SequenceIntegrationTests.SequenceAnalysisPipelineTestCase2.class,
446446
OutputIntegrationTests.VariantProcessingTest.class,
447447
SequenceRemoteIntegrationTests.class,
448-
SequenceTriggerHelper.TestCase.class
448+
SequenceTriggerHelper.TestCase.class,
449+
SequencePipelineServiceImpl.TestCase.class
449450
));
450451

451452
return testClasses;

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import org.apache.logging.log4j.LogManager;
77
import org.apache.logging.log4j.Logger;
88
import org.jetbrains.annotations.Nullable;
9+
import org.junit.Assert;
10+
import org.junit.Test;
911
import org.labkey.api.pipeline.PipelineJob;
1012
import org.labkey.api.pipeline.PipelineJobException;
1113
import org.labkey.api.pipeline.PipelineJobService;
@@ -112,7 +114,7 @@ public <StepType extends PipelineStep> Set<PipelineStepProvider<StepType>> getPr
112114

113115
if (stepType.isAssignableFrom(clazz))
114116
{
115-
ret.add((PipelineStepProvider<StepType>)provider);
117+
ret.add((PipelineStepProvider<StepType>) provider);
116118
}
117119
}
118120

@@ -220,7 +222,7 @@ public <StepType extends PipelineStep> List<PipelineStepCtx<StepType>> getSteps(
220222
Map<String, String> params;
221223
if (job instanceof HasJobParams)
222224
{
223-
params = ((HasJobParams)job).getJobParams();
225+
params = ((HasJobParams) job).getJobParams();
224226
}
225227
else
226228
{
@@ -437,7 +439,8 @@ public Integer getMaxThreads(Logger log)
437439
@Override
438440
public CommandWrapper getCommandWrapper(Logger log)
439441
{
440-
return new AbstractCommandWrapper(log){
442+
return new AbstractCommandWrapper(log)
443+
{
441444

442445
};
443446
}
@@ -619,4 +622,15 @@ public TaskFileManager getTaskFileManager()
619622
return new TaskFileManagerImpl();
620623
}
621624

625+
public static class TestCase extends Assert
626+
{
627+
@Test
628+
public void testGenerics()
629+
{
630+
for (PipelineStepProvider<?> p : _instance._providers)
631+
{
632+
Assert.assertNotNull("Unable to find stepClass for: " + p.getName(), p.getStepClass());
633+
}
634+
}
635+
}
622636
}

0 commit comments

Comments
 (0)