Skip to content

Commit eaccde5

Browse files
committed
feat: Make EnvUtils public
1 parent edf2370 commit eaccde5

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

flink-sql-runner/src/main/java/com/datasqrl/flinkrunner/EnvUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.UUID;
2121

2222
/** Utility class for environment variable operations. */
23-
final class EnvUtils {
23+
public final class EnvUtils {
2424

2525
/**
2626
* Returns a map of environment variables with deployment-specific defaults.
@@ -35,7 +35,7 @@ final class EnvUtils {
3535
*
3636
* @return an immutable map containing all environment variables with defaults applied
3737
*/
38-
static Map<String, String> getEnvWithDefaults() {
38+
static Map<String, String> getEnvWithDeploymentDefaults() {
3939
var env = new HashMap<>(System.getenv());
4040
env.putIfAbsent("DEPLOYMENT_ID", UUID.randomUUID().toString());
4141
env.putIfAbsent("DEPLOYMENT_TIMESTAMP", String.valueOf(System.currentTimeMillis()));

flink-sql-runner/src/main/java/com/datasqrl/flinkrunner/EnvVarResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class EnvVarResolver {
3737
private final ObjectMapper objectMapper;
3838

3939
public EnvVarResolver() {
40-
this(EnvUtils.getEnvWithDefaults());
40+
this(EnvUtils.getEnvWithDeploymentDefaults());
4141
}
4242

4343
public EnvVarResolver(Map<String, String> envVars) {

flink-sql-runner/src/test/java/com/datasqrl/flinkrunner/EnvUtilsTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class EnvUtilsTest {
2525

2626
@Test
2727
void givenSystemEnv_whenGetEnvWithDefaults_thenReturnsEnvWithDefaults() {
28-
var env = EnvUtils.getEnvWithDefaults();
28+
var env = EnvUtils.getEnvWithDeploymentDefaults();
2929

3030
assertThat(env).isNotNull();
3131
assertThat(env).containsKey("DEPLOYMENT_ID");
@@ -34,7 +34,7 @@ void givenSystemEnv_whenGetEnvWithDefaults_thenReturnsEnvWithDefaults() {
3434

3535
@Test
3636
void givenSystemEnv_whenGetEnvWithDefaults_thenDeploymentIdIsValidUuid() {
37-
var env = EnvUtils.getEnvWithDefaults();
37+
var env = EnvUtils.getEnvWithDeploymentDefaults();
3838

3939
String deploymentId = env.get("DEPLOYMENT_ID");
4040
assertThat(deploymentId)
@@ -44,7 +44,7 @@ void givenSystemEnv_whenGetEnvWithDefaults_thenDeploymentIdIsValidUuid() {
4444

4545
@Test
4646
void givenSystemEnv_whenGetEnvWithDefaults_thenDeploymentTimestampIsValidLong() {
47-
var env = EnvUtils.getEnvWithDefaults();
47+
var env = EnvUtils.getEnvWithDeploymentDefaults();
4848

4949
String timestamp = env.get("DEPLOYMENT_TIMESTAMP");
5050
assertThat(timestamp).isNotNull();
@@ -53,15 +53,15 @@ void givenSystemEnv_whenGetEnvWithDefaults_thenDeploymentTimestampIsValidLong()
5353

5454
@Test
5555
void givenSystemEnv_whenGetEnvWithDefaults_thenReturnsImmutableMap() {
56-
var env = EnvUtils.getEnvWithDefaults();
56+
var env = EnvUtils.getEnvWithDeploymentDefaults();
5757

5858
assertThatThrownBy(() -> env.put("NEW_KEY", "value"))
5959
.isInstanceOf(UnsupportedOperationException.class);
6060
}
6161

6262
@Test
6363
void givenSystemEnv_whenGetEnvWithDefaults_thenIncludesSystemEnvironmentVariables() {
64-
var env = EnvUtils.getEnvWithDefaults();
64+
var env = EnvUtils.getEnvWithDeploymentDefaults();
6565
var systemEnv = System.getenv();
6666

6767
// Verify that all system environment variables are present
@@ -72,18 +72,18 @@ void givenSystemEnv_whenGetEnvWithDefaults_thenIncludesSystemEnvironmentVariable
7272

7373
@Test
7474
void givenMultipleCalls_whenGetEnvWithDefaults_thenGeneratesDifferentDeploymentIds() {
75-
var env1 = EnvUtils.getEnvWithDefaults();
76-
var env2 = EnvUtils.getEnvWithDefaults();
75+
var env1 = EnvUtils.getEnvWithDeploymentDefaults();
76+
var env2 = EnvUtils.getEnvWithDeploymentDefaults();
7777

7878
assertThat(env1.get("DEPLOYMENT_ID")).isNotEqualTo(env2.get("DEPLOYMENT_ID"));
7979
}
8080

8181
@Test
8282
void givenMultipleCalls_whenGetEnvWithDefaults_thenGeneratesDifferentTimestamps()
8383
throws InterruptedException {
84-
var env1 = EnvUtils.getEnvWithDefaults();
84+
var env1 = EnvUtils.getEnvWithDeploymentDefaults();
8585
Thread.sleep(2); // Small delay to ensure different timestamps
86-
var env2 = EnvUtils.getEnvWithDefaults();
86+
var env2 = EnvUtils.getEnvWithDeploymentDefaults();
8787

8888
long timestamp1 = Long.parseLong(env1.get("DEPLOYMENT_TIMESTAMP"));
8989
long timestamp2 = Long.parseLong(env2.get("DEPLOYMENT_TIMESTAMP"));

0 commit comments

Comments
 (0)