JBIDE-20147 Batch Property mapping issue with reference

jbosstools · Jul 10, 2015 · 2e5b3cd · 2e5b3cd
1 parent e7ea020
commit 2e5b3cd
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/...ols.batch.core.itest/projects/BatchTestProject/src/batch/MyBatchletNamedWithConstant.java b/...ols.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/...org.jboss.tools.batch.core.itest/src/org/jboss/tools/batch/core/itest/BatchModelTest.java b/...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/...ls.batch.ui.itest/src/org/jboss/tools/batch/ui/itest/ca/sapphire/ContentProposalTest.java b/...ls.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/...rg.jboss.tools.batch.core/src/org/jboss/tools/batch/internal/core/impl/BatchArtifact.java b/...rg.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 {