Skip to content
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

Jump to bottom

JBIDE-20147 Batch Property mapping issue with reference #359

Merged
merged 1 commit into from
Jul 10, 2015
Merged

JBIDE-20147 Batch Property mapping issue with reference #359

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
20 changes: 20 additions & 0 deletions ...ols.batch.core.itest/projects/BatchTestProject/src/batch/MyBatchletNamedWithConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}

}
4 changes: 4 additions & 0 deletions ...org.jboss.tools.batch.core.itest/src/org/jboss/tools/batch/core/itest/BatchModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
2 changes: 1 addition & 1 deletion ...ls.batch.ui.itest/src/org/jboss/tools/batch/ui/itest/ca/sapphire/ContentProposalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...rg.jboss.tools.batch.core/src/org/jboss/tools/batch/internal/core/impl/BatchArtifact.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down