SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Task to the latests snapshot of Micrometer

Browse Source 
Updated to handle the batch changes

Removing aot execution from sample apps

Remove snapshot version and rely on bom

Signed-off-by: Glenn Renfro <grenfro@vmware.com>
This commit is contained in:
Glenn Renfro
2022-10-03 10:55:37 -04:00
parent b7b7de5337
commit 2ef93291fc
22 changed files with 57 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunner.java
View File

@@ -197,10 +197,10 @@ public class TaskJobLauncherApplicationRunner extends JobLauncherApplicationRunn
}
private JobParameters removeNonIdentifying(JobParameters parameters) {
Map<String, JobParameter> parameterMap = parameters.getParameters();
HashMap<String, JobParameter> copy = new HashMap<>();
Map<String, JobParameter<?>> parameterMap = parameters.getParameters();
HashMap<String, JobParameter<?>> copy = new HashMap<>();
for (Map.Entry<String, JobParameter> parameter : parameterMap.entrySet()) {
for (Map.Entry<String, JobParameter<?>> parameter : parameterMap.entrySet()) {
if (parameter.getValue().isIdentifying()) {
copy.put(parameter.getKey(), parameter.getValue());
}
@@ -215,7 +215,7 @@ public class TaskJobLauncherApplicationRunner extends JobLauncherApplicationRunn
}
private JobParameters merge(JobParameters parameters, JobParameters additionals) {
Map<String, JobParameter> merged = new HashMap<>();
Map<String, JobParameter<?>> merged = new HashMap<>();
merged.putAll(parameters.getParameters());
merged.putAll(additionals.getParameters());
return new JobParameters(merged);