diff --git a/batch/itests/org.jboss.tools.batch.core.itest/projects/BatchTestProject/src/batch/MyBatchletNamedWithConstant.java b/batch/itests/org.jboss.tools.batch.core.itest/projects/BatchTestProject/src/batch/MyBatchletNamedWithConstant.java new file mode 100644 index 0000000000..4f0c90f399 --- /dev/null +++ b/batch/itests/org.jboss.tools.batch.core.itest/projects/BatchTestProject/src/batch/MyBatchletNamedWithConstant.java @@ -0,0 +1,20 @@ +package batch; + +import javax.batch.api.AbstractBatchlet; +import javax.inject.Named; + +@Named(MyBatchletNamedWithConstant.NAME) +public class MyBatchletNamedWithConstant extends AbstractBatchlet { + public static final String NAME = "batchlet_named_with_constant"; + + public MyBatchletNamedWithConstant() { + // TODO Auto-generated constructor stub + } + + @Override + public String process() throws Exception { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/batch/itests/org.jboss.tools.batch.core.itest/src/org/jboss/tools/batch/core/itest/BatchModelTest.java b/batch/itests/org.jboss.tools.batch.core.itest/src/org/jboss/tools/batch/core/itest/BatchModelTest.java index 0483a6bcab..1bec216d92 100644 --- a/batch/itests/org.jboss.tools.batch.core.itest/src/org/jboss/tools/batch/core/itest/BatchModelTest.java +++ b/batch/itests/org.jboss.tools.batch.core.itest/src/org/jboss/tools/batch/core/itest/BatchModelTest.java @@ -257,4 +257,8 @@ public void testArtifactRegisteredInBatchXML() { assertArtifactByNameAndType("my_other_job_listener", BatchArtifactType.JOB_LISTENER, false); } + public void testBatchletNamedWithConstant() { + assertArtifactByNameAndType("batchlet_named_with_constant", BatchArtifactType.BATCHLET); + } + } diff --git a/batch/itests/org.jboss.tools.batch.ui.itest/src/org/jboss/tools/batch/ui/itest/ca/sapphire/ContentProposalTest.java b/batch/itests/org.jboss.tools.batch.ui.itest/src/org/jboss/tools/batch/ui/itest/ca/sapphire/ContentProposalTest.java index 74e17e3397..2b896e0f5e 100644 --- a/batch/itests/org.jboss.tools.batch.ui.itest/src/org/jboss/tools/batch/ui/itest/ca/sapphire/ContentProposalTest.java +++ b/batch/itests/org.jboss.tools.batch.ui.itest/src/org/jboss/tools/batch/ui/itest/ca/sapphire/ContentProposalTest.java @@ -37,7 +37,7 @@ public void test() { } private void checkStep1(Step step) { - checkProposals((Batchlet) step.getBatchletOrChunk().get(0), 4); + checkProposals((Batchlet) step.getBatchletOrChunk().get(0), 5); } private void checkStep2(Step step) { diff --git a/batch/plugins/org.jboss.tools.batch.core/src/org/jboss/tools/batch/internal/core/impl/BatchArtifact.java b/batch/plugins/org.jboss.tools.batch.core/src/org/jboss/tools/batch/internal/core/impl/BatchArtifact.java index e1ad06c8c9..97ab37fd20 100644 --- a/batch/plugins/org.jboss.tools.batch.core/src/org/jboss/tools/batch/internal/core/impl/BatchArtifact.java +++ b/batch/plugins/org.jboss.tools.batch.core/src/org/jboss/tools/batch/internal/core/impl/BatchArtifact.java @@ -69,7 +69,7 @@ public void setDefinition(TypeDefinition def) { void initName() { if(definition.getNamedAnnotation() != null) { - Object v = definition.getNamedAnnotation().getMemberValue(null); + Object v = definition.getNamedAnnotation().getMemberValue(null, true); if(v != null) { name = v.toString(); } else {