@@ -146,42 +146,14 @@ public class TaskTemplate implements TaskOperations {
146
146
this .restTemplate = restTemplate ;
147
147
this .dataFlowServerVersion = dataFlowServerVersion ;
148
148
149
- String version = VersionUtils .getThreePartVersion (dataFlowServerVersion );
150
- if (VersionUtils .isDataFlowServerVersionGreaterThanOrEqualToRequiredVersion (version , VALIDATION_RELATION_VERSION )) {
151
- Assert .isTrue (resources .getLink (VALIDATION_REL ).isPresent (), ()->VALIDATION_REL + " relation is required" );
152
- this .validationLink = resources .getLink (VALIDATION_REL ).get ();
153
- } else {
154
- this .validationLink = null ;
155
- }
156
-
157
- // TODO early 2.11.3-SNAPSHOT version didn't have this. Remove && resources.getLink(THIN_EXECUTIONS_RELATION).isPresent() when releasing 2.11.3
158
- if (VersionUtils .isDataFlowServerVersionGreaterThanOrEqualToRequiredVersion (version , VALIDATION_THIN_TASK_VERSION ) && resources .getLink (THIN_EXECUTIONS_RELATION ).isPresent ()) {
159
- Assert .isTrue (resources .getLink (THIN_EXECUTIONS_RELATION ).isPresent (), () -> THIN_EXECUTIONS_RELATION + " relation is required" );
160
- this .thinExecutionsLink = resources .getLink (THIN_EXECUTIONS_RELATION ).get ();
161
- } else {
162
- this .thinExecutionsLink = null ;
163
- }
164
-
165
- if (resources .getLink (THIN_EXECUTIONS_BY_NAME_RELATION ).isPresent ()) {
166
- this .thinExecutionsByNameLink = resources .getLink (THIN_EXECUTIONS_BY_NAME_RELATION ).get ();
167
- } else {
168
- this .thinExecutionsByNameLink = null ;
169
- }
170
- if (VersionUtils .isDataFlowServerVersionGreaterThanOrEqualToRequiredVersion (version , VALIDATION_TASK_LAUNCH_VERSION )) {
171
- Assert .isTrue (resources .getLink (EXECUTION_LAUNCH_RELATION ).isPresent (), () -> EXECUTION_LAUNCH_RELATION + " relation is required" );
172
- this .executionLaunchLink = resources .getLink (EXECUTION_LAUNCH_RELATION ).get ();
173
- } else {
174
- this .executionLaunchLink = null ;
175
- }
176
-
177
- if (VersionUtils .isDataFlowServerVersionGreaterThanOrEqualToRequiredVersion (version , EXECUTIONS_CURRENT_RELATION_VERSION )) {
178
- Assert .isTrue (resources .getLink (EXECUTIONS_CURRENT_RELATION ).isPresent (), ()-> EXECUTIONS_CURRENT_RELATION + " relation is required" );
179
- this .executionsCurrentLink = resources .getLink (EXECUTIONS_CURRENT_RELATION ).get ();
180
- } else {
181
- this .executionsCurrentLink = null ;
182
- }
149
+ this .validationLink = resources .getLink (VALIDATION_REL ).get ();
183
150
this .aboutLink = resources .getLink ("about" ).get ();
184
151
152
+ this .thinExecutionsLink = resources .getLink (THIN_EXECUTIONS_RELATION ).orElse (null );
153
+ this .thinExecutionsByNameLink = resources .getLink (THIN_EXECUTIONS_BY_NAME_RELATION ).orElse (null );
154
+ this .executionLaunchLink = resources .getLink (EXECUTION_LAUNCH_RELATION ).orElse (null );
155
+ this .executionsCurrentLink = resources .getLink (EXECUTIONS_CURRENT_RELATION ).orElse (null );
156
+
185
157
this .definitionsLink = resources .getLink (DEFINITIONS_RELATION ).get ();
186
158
this .definitionLink = resources .getLink (DEFINITION_RELATION ).get ();
187
159
this .executionsLink = resources .getLink (EXECUTIONS_RELATION ).get ();
@@ -305,14 +277,13 @@ public TaskExecutionThinResource.Page thinExecutionListByTaskName(String taskNam
305
277
if (thinExecutionsByNameLink != null ) {
306
278
return restTemplate .getForObject (thinExecutionsByNameLink .expand (taskName ).getHref (), TaskExecutionThinResource .Page .class );
307
279
} else {
308
- return restTemplate .getForObject (executionsLink .expand (taskName ).getHref (), TaskExecutionThinResource .Page .class );
280
+ return restTemplate .getForObject (executionByNameLink .expand (taskName ).getHref (), TaskExecutionThinResource .Page .class );
309
281
}
310
282
}
311
283
312
284
@ Override
313
285
public TaskExecutionResource .Page executionListByTaskName (String taskName ) {
314
- return restTemplate .getForObject (executionByNameLink .expand (taskName ).getHref (),
315
- TaskExecutionResource .Page .class );
286
+ return restTemplate .getForObject (executionByNameLink .expand (taskName ).getHref (), TaskExecutionResource .Page .class );
316
287
}
317
288
318
289
@ Override
0 commit comments