TaskTemplate params bug resolved (#5503)

spring-cloud · Oct 10, 2023 · d7fc7ad · d7fc7ad
1 parent c8bb557
commit d7fc7ad
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/...est-client/src/main/java/org/springframework/cloud/dataflow/rest/client/TaskTemplate.java b/...est-client/src/main/java/org/springframework/cloud/dataflow/rest/client/TaskTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -303,14 +303,18 @@ public void cleanup(long id, String schemaTarget) {
 	@Override
 	public void cleanup(long id, String schemaTarget, boolean removeData) {
 		MultiValueMap<String, Object> values = new LinkedMultiValueMap<>();
-		if (StringUtils.hasText(schemaTarget)) {
-			values.add("schemaTarget", schemaTarget);
-		}
+
 		String uriTemplate = executionLink.expand(id).getHref();
+
 		if (removeData) {
-			values.add("action", "CLEANUP,REMOVE_DATA");
+			uriTemplate = uriTemplate + "?action=CLEANUP,REMOVE_DATA";
+		}
+
+		if (StringUtils.hasText(schemaTarget)) {
+			String schemaVal =  (removeData) ?  "&schemaTarget=" + schemaTarget : "?schemaTarget=" + schemaTarget;
+			uriTemplate = uriTemplate + schemaVal;
 		}
-		restTemplate.delete(uriTemplate, values);
+		restTemplate.delete(uriTemplate);
 	}
 
 	@Override