From 29215f73e353dfa83c4897602a357e83156564b4 Mon Sep 17 00:00:00 2001 From: skyflow-shravan <121150537+skyflow-shravan@users.noreply.github.com> Date: Fri, 3 Oct 2025 18:04:34 +0530 Subject: [PATCH 1/4] SK-2315 add version as prefix to logs (#251) --- v3/pom.xml | 7 +++++ .../java/com/skyflow/utils/Constants.java | 27 +++++++++++++++++-- v3/src/main/resources/sdk.properties | 1 + 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 v3/src/main/resources/sdk.properties diff --git a/v3/pom.xml b/v3/pom.xml index 750541e3..eec86619 100644 --- a/v3/pom.xml +++ b/v3/pom.xml @@ -35,6 +35,7 @@ 8 UTF-8 false + ${project.version} @@ -48,6 +49,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/v3/src/main/java/com/skyflow/utils/Constants.java b/v3/src/main/java/com/skyflow/utils/Constants.java index ef03e41e..49beaf97 100644 --- a/v3/src/main/java/com/skyflow/utils/Constants.java +++ b/v3/src/main/java/com/skyflow/utils/Constants.java @@ -1,10 +1,14 @@ package com.skyflow.utils; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + public final class Constants extends BaseConstants { public static final String SDK_NAME = "Skyflow Java SDK "; - public static final String SDK_VERSION = "3.0.0-beta.6"; + public static final String SDK_VERSION; public static final String VAULT_DOMAIN = ".skyvault."; - public static final String SDK_PREFIX = SDK_NAME + SDK_VERSION; + public static final String SDK_PREFIX; public static final Integer INSERT_BATCH_SIZE = 50; public static final Integer MAX_INSERT_BATCH_SIZE = 1000; public static final Integer INSERT_CONCURRENCY_LIMIT = 1; @@ -13,5 +17,24 @@ public final class Constants extends BaseConstants { public static final Integer DETOKENIZE_CONCURRENCY_LIMIT = 1; public static final Integer MAX_DETOKENIZE_BATCH_SIZE = 1000; public static final Integer MAX_DETOKENIZE_CONCURRENCY_LIMIT = 10; + public static final String DEFAULT_SDK_VERSION = "v3"; + + static { + String sdkVersion; + // Use a static initializer block to read the properties file + Properties properties = new Properties(); + try (InputStream input = Constants.class.getClassLoader().getResourceAsStream("sdk.properties")) { + if (input == null) { + sdkVersion = DEFAULT_SDK_VERSION; + } else { + properties.load(input); + sdkVersion = properties.getProperty("sdk.version", DEFAULT_SDK_VERSION); + } + } catch (IOException ex) { + sdkVersion = DEFAULT_SDK_VERSION; + } + SDK_VERSION = sdkVersion; + SDK_PREFIX = SDK_NAME + " " + SDK_VERSION; + } } diff --git a/v3/src/main/resources/sdk.properties b/v3/src/main/resources/sdk.properties new file mode 100644 index 00000000..54fb1501 --- /dev/null +++ b/v3/src/main/resources/sdk.properties @@ -0,0 +1 @@ +sdk.version=${sdk.version} \ No newline at end of file From 132f746002505be627e4e5612ab01510759f1983 Mon Sep 17 00:00:00 2001 From: skyflow-shravan Date: Fri, 3 Oct 2025 12:34:51 +0000 Subject: [PATCH 2/4] [AUTOMATED] Private Release 3.0.0-beta.6-dev-29215f7 --- v3/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/pom.xml b/v3/pom.xml index eec86619..1e7df258 100644 --- a/v3/pom.xml +++ b/v3/pom.xml @@ -11,7 +11,7 @@ skyflow-java - 3.0.0-beta.6 + 3.0.0-beta.6-dev.29215f7 jar ${project.groupId}:${project.artifactId} Skyflow V3 SDK for the Java programming language From 4dec76589a4c19574cf2a55fc8d67be247c81364 Mon Sep 17 00:00:00 2001 From: skyflow-shravan Date: Fri, 3 Oct 2025 20:52:28 +0530 Subject: [PATCH 3/4] SK-2315 update the samples --- .github/workflows/release.yml | 2 +- samples/pom.xml | 2 +- samples/src/main/java/com/example/vault/BulkInsertAsync.java | 4 ++-- samples/src/main/java/com/example/vault/BulkInsertSync.java | 5 +++-- .../java/com/example/vault/BulkMultiTableInsertAsync.java | 4 ++-- .../java/com/example/vault/BulkMultiTableInsertSync.java | 5 +++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76dda879..9d7b3873 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ name: Public release on: push: - tags: '*.*.*' + tags: '[0-9]+.[0-9]+.[0-9]+' jobs: build-and-deploy: uses: ./.github/workflows/shared-build-and-deploy.yml diff --git a/samples/pom.xml b/samples/pom.xml index 96f921ee..ad4a1427 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.skyflow skyflow-java - 3.0.0-beta.3 + 3.0.0-beta.6 diff --git a/samples/src/main/java/com/example/vault/BulkInsertAsync.java b/samples/src/main/java/com/example/vault/BulkInsertAsync.java index b8befd10..87006e87 100644 --- a/samples/src/main/java/com/example/vault/BulkInsertAsync.java +++ b/samples/src/main/java/com/example/vault/BulkInsertAsync.java @@ -5,7 +5,7 @@ import com.skyflow.config.VaultConfig; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; -import com.skyflow.enums.UpdateType; +import com.skyflow.enums.UpsertType; import com.skyflow.vault.data.InsertRecord; import com.skyflow.vault.data.InsertRequest; import com.skyflow.vault.data.InsertResponse; @@ -77,7 +77,7 @@ public static void main(String[] args) { InsertRequest request = InsertRequest.builder() .table("") .upsert(upsertColumns) - .upsertType(UpdateType.REPLACE) + .upsertType(UpsertType.REPLACE) .records(insertRecords) .build(); diff --git a/samples/src/main/java/com/example/vault/BulkInsertSync.java b/samples/src/main/java/com/example/vault/BulkInsertSync.java index 56a1482b..c52ebb0f 100644 --- a/samples/src/main/java/com/example/vault/BulkInsertSync.java +++ b/samples/src/main/java/com/example/vault/BulkInsertSync.java @@ -5,8 +5,9 @@ import com.skyflow.config.VaultConfig; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; -import com.skyflow.enums.UpdateType; +import com.skyflow.enums.UpsertType; import com.skyflow.errors.SkyflowException; +import com.skyflow.vault.data.InsertRecord; import com.skyflow.vault.data.InsertRequest; import com.skyflow.vault.data.InsertResponse; @@ -76,7 +77,7 @@ public static void main(String[] args) { InsertRequest request = InsertRequest.builder() .table("") .upsert(upsertColumns) - .upsertType(UpdateType.REPLACE) + .upsertType(UpsertType.REPLACE) .records(insertRecords) .build(); diff --git a/samples/src/main/java/com/example/vault/BulkMultiTableInsertAsync.java b/samples/src/main/java/com/example/vault/BulkMultiTableInsertAsync.java index e2c9b5a7..1606cf70 100644 --- a/samples/src/main/java/com/example/vault/BulkMultiTableInsertAsync.java +++ b/samples/src/main/java/com/example/vault/BulkMultiTableInsertAsync.java @@ -5,7 +5,7 @@ import com.skyflow.config.VaultConfig; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; -import com.skyflow.enums.UpdateType; +import com.skyflow.enums.UpsertType; import com.skyflow.vault.data.InsertRecord; import com.skyflow.vault.data.InsertRequest; import com.skyflow.vault.data.InsertResponse; @@ -48,7 +48,7 @@ public static void main(String[] args) { // Step 4: Prepare first record for insertion HashMap recordData1 = new HashMap<>(); - rerecordData1cord1.put("", ""); + recordData1.put("", ""); recordData1.put("", ""); List upsertColumns = new ArrayList<>(); diff --git a/samples/src/main/java/com/example/vault/BulkMultiTableInsertSync.java b/samples/src/main/java/com/example/vault/BulkMultiTableInsertSync.java index ad61ada8..95bf50dc 100644 --- a/samples/src/main/java/com/example/vault/BulkMultiTableInsertSync.java +++ b/samples/src/main/java/com/example/vault/BulkMultiTableInsertSync.java @@ -5,8 +5,9 @@ import com.skyflow.config.VaultConfig; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; -import com.skyflow.enums.UpdateType; +import com.skyflow.enums.UpsertType; import com.skyflow.errors.SkyflowException; +import com.skyflow.vault.data.InsertRecord; import com.skyflow.vault.data.InsertRequest; import com.skyflow.vault.data.InsertResponse; @@ -46,7 +47,7 @@ public static void main(String[] args) { // Step 4: Prepare first record for insertion HashMap recordData1 = new HashMap<>(); - rerecordData1cord1.put("", ""); + recordData1.put("", ""); recordData1.put("", ""); List upsertColumns = new ArrayList<>(); From 7bfe1cf6b99e7d4458949432683d7058e8b2c6b0 Mon Sep 17 00:00:00 2001 From: skyflow-shravan Date: Fri, 3 Oct 2025 15:22:59 +0000 Subject: [PATCH 4/4] [AUTOMATED] Private Release 3.0.0-beta.6-dev-4dec765 --- v3/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/pom.xml b/v3/pom.xml index 1e7df258..6ffde05d 100644 --- a/v3/pom.xml +++ b/v3/pom.xml @@ -11,7 +11,7 @@ skyflow-java - 3.0.0-beta.6-dev.29215f7 + 3.0.0-beta.6-dev.4dec765 jar ${project.groupId}:${project.artifactId} Skyflow V3 SDK for the Java programming language