Tests for basic tokens of job composition if parsing fails.

Author: cppwfs

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/job/dsl/ComposedJobUtil.java

@@ -29,9 +29,16 @@ public class ComposedJobUtil {
 
 	public static final String MODULE_SUFFIX = "_COMPOSED";
 
+	private static String orchestrationPatternString = "(\\|\\|" +//search for || in the definition
+						"(?=([^\\\"']*[\\\"'][^\\\"']*[\\\"'])*[^\\\"']*$))" + //make sure its not in quotes
+						"|(\\&" + //or find a & in the definition
+						"(?=([^\\\"']*[\\\"'][^\\\"']*[\\\"'])*[^\\\"']*$))";// make sure its not in quotes
+
 	private static String parameterPatternString = "(--" +//search for -- in the definition
 			"(?=([^\\\"']*[\\\"'][^\\\"']*[\\\"'])*[^\\\"']*$))"; //make sure its not in quotes
 
+	private static Pattern orchestrationPattern = Pattern.compile(orchestrationPatternString);
+
 	private static Pattern parameterPattern = Pattern.compile(parameterPatternString);
 
 	/**
@@ -64,7 +71,10 @@ public static boolean isComposedJobDefinition(String definition){
 				}
 			}
 		} catch (JobSpecificationException e) {
-			result = false; //failed to parse, could be a stream.
+			//failed to parse, could still be a composed job.  Look for basic components
+			// such as || or & if found return true.
+			Matcher matcher = orchestrationPattern.matcher(definition);
+			result = matcher.find();
 		}
 		return result;
 	}

spring-xd-dirt/src/test/java/org/springframework/xd/dirt/rest/JobsControllerIntegrationTests.java

@@ -122,7 +122,7 @@ public void testComposedJobCreation() throws Exception {
 	public void testComposedJobCreationBadDSL() throws Exception {
 		mockMvc.perform(
 				post("/jobs/definitions").param("name", "job1").param("definition", "A || B >").accept(
-						MediaType.APPLICATION_JSON)).andExpect(status().is4xxClientError());
+						MediaType.APPLICATION_JSON)).andExpect(status().isInternalServerError());
 	}
 
 	@Test