From 4b4ae6ff3325508108ff89382e738d153e78d1ae Mon Sep 17 00:00:00 2001 From: Sebastian Kaiser Date: Thu, 14 Sep 2023 23:36:48 +0200 Subject: [PATCH 1/4] Add Version class --- .../java/com/databricks/sdk/core/Version.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 databricks-sdk-java/src/main/java/com/databricks/sdk/core/Version.java diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/Version.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/Version.java new file mode 100644 index 000000000..2633ef9a3 --- /dev/null +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/Version.java @@ -0,0 +1,15 @@ +package com.databricks.sdk.core; + +public final class Version { + + // TODO: check if reading from + // /META-INF/maven/com.databricks/databrics-sdk-java/pom.properties + // or getClass().getPackage().getImplementationVersion() is enough. + private static final String version = "0.8.1"; + + public static String sdkVersion() { + return version; + } + + private Version() {} +} From 0841b7ed0256d51cb0c8ba4d81c0114e8744e4ed Mon Sep 17 00:00:00 2001 From: Sebastian Kaiser Date: Thu, 14 Sep 2023 23:37:52 +0200 Subject: [PATCH 2/4] Replace sdkVersion with Version#sdkVersion() --- .../src/main/java/com/databricks/sdk/core/UserAgent.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/UserAgent.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/UserAgent.java index 5411e302f..74ceebf6d 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/UserAgent.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/UserAgent.java @@ -10,11 +10,6 @@ public class UserAgent { private static final Map otherInfo = new HashMap<>(); - // TODO: check if reading from - // /META-INF/maven/com.databricks/databrics-sdk-java/pom.properties - // or getClass().getPackage().getImplementationVersion() is enough. - private static final String version = "0.8.1"; - public static void withProduct(String product, String productVersion) { UserAgent.product = product; UserAgent.productVersion = productVersion; @@ -49,6 +44,6 @@ public static String asString() { .collect(Collectors.joining()); return String.format( "%s/%s databricks-sdk-java/%s jvm/%s os/%s%s", - product, productVersion, version, jvmVersion(), osName(), otherInfo); + product, productVersion, Version.sdkVersion(), jvmVersion(), osName(), otherInfo); } } From b2f3422dfee583c3627cf9ea92fb45c7db9cd8f6 Mon Sep 17 00:00:00 2001 From: Sebastian Kaiser Date: Thu, 14 Sep 2023 23:38:11 +0200 Subject: [PATCH 3/4] Update codegen definition --- .codegen.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.codegen.json b/.codegen.json index b1c5e32ab..9f33f7a4f 100644 --- a/.codegen.json +++ b/.codegen.json @@ -15,7 +15,8 @@ "version": { "pom.xml": "databricks-sdk-parent\n $VERSION", "databricks-sdk-java/pom.xml": "databricks-sdk-parent\n $VERSION", - "databricks-sdk-java/src/main/java/com/databricks/sdk/core/UserAgent.java": "private static final String version = \"$VERSION\";" + "databricks-sdk-java/src/main/java/com/databricks/sdk/core/UserAgent.java": "private static final String version = \"$VERSION\";", + "databricks-sdk-java/src/main/java/com/databricks/sdk/core/Version.java": "private static final String version = \"$VERSION\";" }, "toolchain": { "require": ["mvn", "java"], From e2838be269f5f36c8cb6464af49eff81d21718eb Mon Sep 17 00:00:00 2001 From: Sebastian Kaiser Date: Thu, 14 Sep 2023 23:38:53 +0200 Subject: [PATCH 4/4] Update codegen definition --- .codegen.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.codegen.json b/.codegen.json index 9f33f7a4f..2c941d852 100644 --- a/.codegen.json +++ b/.codegen.json @@ -15,7 +15,6 @@ "version": { "pom.xml": "databricks-sdk-parent\n $VERSION", "databricks-sdk-java/pom.xml": "databricks-sdk-parent\n $VERSION", - "databricks-sdk-java/src/main/java/com/databricks/sdk/core/UserAgent.java": "private static final String version = \"$VERSION\";", "databricks-sdk-java/src/main/java/com/databricks/sdk/core/Version.java": "private static final String version = \"$VERSION\";" }, "toolchain": {