The original code would use TaskServiceUtils to return a false if it …

…was null. Add Tests Signed-off-by: Glenn Renfro <[email protected]> Resolve code review comments Updated tests based on code review Signed-off-by: Glenn Renfro <[email protected]>
spring-cloud · Nov 14, 2024 · 163963a · 163963a
1 parent 9aa645c
commit 163963a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/...amework/cloud/dataflow/server/service/impl/ComposedTaskRunnerConfigurationProperties.java b/...amework/cloud/dataflow/server/service/impl/ComposedTaskRunnerConfigurationProperties.java
@@ -18,6 +18,7 @@
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.dataflow.core.DataFlowPropertyKeys;
+import org.springframework.util.Assert;
 
 /**
  * Properties used to define the behavior of the composed task runner.
@@ -44,7 +45,7 @@ public class ComposedTaskRunnerConfigurationProperties {
 	 * If true SCDF will set the dataflow-server-access-token for the composed
 	 * task runner to the user's token when launching composed tasks.
 	 */
-	private Boolean useUserAccessToken;
+	private Boolean useUserAccessToken = false;
 
 	public String getUri() {
 		return uri;
@@ -67,6 +68,7 @@ public Boolean isUseUserAccessToken() {
 	}
 
 	public void setUseUserAccessToken(Boolean useUserAccessToken) {
+		Assert.notNull(useUserAccessToken, "'useUserAccessToken' cannot be null");
 		this.useUserAccessToken = useUserAccessToken;
 	}
 }
diff --git a/...rk/cloud/dataflow/server/service/impl/ComposedTaskRunnerConfigurationPropertiesTests.java b/...rk/cloud/dataflow/server/service/impl/ComposedTaskRunnerConfigurationPropertiesTests.java
@@ -18,6 +18,8 @@
 
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
 public class ComposedTaskRunnerConfigurationPropertiesTests {
 
@@ -36,14 +38,23 @@ void useUserAccessTokenFromCTRPropFalse() {
 		ComposedTaskRunnerConfigurationProperties composedTaskRunnerConfigurationProperties =
 			new ComposedTaskRunnerConfigurationProperties();
 		composedTaskRunnerConfigurationProperties.setUseUserAccessToken(false);
-		assertThat(composedTaskRunnerConfigurationProperties.isUseUserAccessToken()).as("Use user access token should be false").isFalse();
+		assertThat(composedTaskRunnerConfigurationProperties.isUseUserAccessToken()).isFalse();
 	}
 
 	@Test
 	void useUserAccessTokenFromCTRPropNotSet() {
 		ComposedTaskRunnerConfigurationProperties composedTaskRunnerConfigurationProperties =
 			new ComposedTaskRunnerConfigurationProperties();
-		assertThat(composedTaskRunnerConfigurationProperties.isUseUserAccessToken()).as("Use user access token should be false").isNull();
+		assertThat(composedTaskRunnerConfigurationProperties.isUseUserAccessToken()).isFalse();
+	}
+
+	@Test
+	void setUserAccessTokenFromCTRToNull() {
+		ComposedTaskRunnerConfigurationProperties composedTaskRunnerConfigurationProperties =
+			new ComposedTaskRunnerConfigurationProperties();
+		assertThatIllegalArgumentException().isThrownBy(() -> composedTaskRunnerConfigurationProperties.setUseUserAccessToken(null)).
+			withMessageContaining("'useUserAccessToken' cannot be null")
+		;
 	}
 
 	@Test