Skip to content

SK-2232 client initialisation for java flow db sdk #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skyflow-bharti wants to merge 2 commits into
base: skyflow-vivek/SK-2223-use-common-modules-for-bearer-token-generation
Choose a base branch
from
Open

SK-2232 client initialisation for java flow db sdk #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63d8c9a
SK-2232 skyflow client and common code
skyflow-bharti Aug 8, 2025
7fbff4c
SK-2232 refactor common code
skyflow-bharti Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...va/com/skyflow/v2/config/Credentials.java → ...om/skyflow/common/config/Credentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skyflow.v2.config;
package com.skyflow.common.config;

import java.util.ArrayList;

Expand Down
4 changes: 2 additions & 2 deletions ...va/com/skyflow/v2/config/VaultConfig.java → ...om/skyflow/common/config/VaultConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.skyflow.v2.config;
package com.skyflow.common.config;

import com.skyflow.v2.enums.Env;
import com.skyflow.common.enums.Env;

public class VaultConfig {
private String vaultId;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/skyflow/v2/enums/Env.java → ...in/java/com/skyflow/common/enums/Env.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skyflow.v2.enums;
package com.skyflow.common.enums;

public enum Env {
DEV,
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/skyflow/v2/enums/LogLevel.java → ...va/com/skyflow/common/enums/LogLevel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skyflow.v2.enums;
package com.skyflow.common.enums;

public enum LogLevel {
OFF,
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/skyflow/v2/errors/ErrorCode.java → .../com/skyflow/common/errors/ErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skyflow.v2.errors;
package com.skyflow.common.errors;

public enum ErrorCode {
INVALID_INPUT(400),
Expand Down
7 changes: 4 additions & 3 deletions ...a/com/skyflow/v2/errors/ErrorMessage.java → ...m/skyflow/common/errors/ErrorMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.skyflow.v2.errors;
package com.skyflow.common.errors;

import com.skyflow.v2.utils.Constants;
import com.skyflow.common.utils.SdkVersion;

public enum ErrorMessage {
// Client initialization
Expand Down Expand Up @@ -152,8 +152,9 @@ public enum ErrorMessage {
;
private final String message;


ErrorMessage(String message) {
this.message = message.replace("%s0", Constants.SDK_PREFIX);
this.message = message.replace("%s0", SdkVersion.getSdkPrefix());
}

public String getMessage() {
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/skyflow/v2/errors/HttpStatus.java → ...com/skyflow/common/errors/HttpStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skyflow.v2.errors;
package com.skyflow.common.errors;

public enum HttpStatus {
BAD_REQUEST("Bad Request");
Expand Down
4 changes: 2 additions & 2 deletions ...m/skyflow/v2/errors/SkyflowException.java → ...yflow/common/errors/SkyflowException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.skyflow.v2.errors;
package com.skyflow.common.errors;

import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.skyflow.v2.utils.Constants;
import com.skyflow.common.utils.Constants;

import java.util.List;
import java.util.Map;
Expand Down
4 changes: 2 additions & 2 deletions .../skyflow/v2/generated/rest/ApiClient.java → ...m/skyflow/common/generated/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
package com.skyflow.v2.generated.rest;
package com.skyflow.common.generated;

import com.skyflow.v2.generated.rest.core.ClientOptions;
import com.skyflow.v2.generated.rest.core.Suppliers;
import com.skyflow.v2.generated.rest.resources.audit.AuditClient;
import com.skyflow.v2.generated.rest.resources.authentication.AuthenticationClient;
import com.skyflow.common.generated.authentication.AuthenticationClient;
import com.skyflow.v2.generated.rest.resources.binlookup.BinLookupClient;
import com.skyflow.v2.generated.rest.resources.deprecated.DeprecatedClient;
import com.skyflow.v2.generated.rest.resources.files.FilesClient;
Expand Down
2 changes: 1 addition & 1 deletion ...w/v2/generated/rest/ApiClientBuilder.java → ...ow/common/generated/ApiClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
package com.skyflow.v2.generated.rest;
package com.skyflow.common.generated;

import com.skyflow.v2.generated.rest.core.ClientOptions;
import com.skyflow.v2.generated.rest.core.Environment;
Expand Down
6 changes: 3 additions & 3 deletions ...entication/AsyncAuthenticationClient.java → ...entication/AsyncAuthenticationClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
package com.skyflow.v2.generated.rest.resources.authentication;
package com.skyflow.common.generated.authentication;

import com.skyflow.common.generated.authentication.requests.V1GetAuthTokenRequest;
import com.skyflow.v2.generated.rest.core.ClientOptions;
import com.skyflow.v2.generated.rest.core.RequestOptions;
import com.skyflow.v2.generated.rest.resources.authentication.requests.V1GetAuthTokenRequest;
import com.skyflow.v2.generated.rest.types.V1GetAuthTokenResponse;
import com.skyflow.common.generated.types.V1GetAuthTokenResponse;
import java.util.concurrent.CompletableFuture;

public class AsyncAuthenticationClient {
Expand Down
8 changes: 4 additions & 4 deletions ...ication/AsyncRawAuthenticationClient.java → ...ication/AsyncRawAuthenticationClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
package com.skyflow.v2.generated.rest.resources.authentication;
package com.skyflow.common.generated.authentication;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.skyflow.v2.generated.rest.core.ApiClientApiException;
import com.skyflow.common.generated.authentication.requests.V1GetAuthTokenRequest;
import com.skyflow.common.generated.core.ApiClientApiException;
import com.skyflow.v2.generated.rest.core.ApiClientException;
import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse;
import com.skyflow.v2.generated.rest.core.ClientOptions;
Expand All @@ -14,8 +15,7 @@
import com.skyflow.v2.generated.rest.errors.BadRequestError;
import com.skyflow.v2.generated.rest.errors.NotFoundError;
import com.skyflow.v2.generated.rest.errors.UnauthorizedError;
import com.skyflow.v2.generated.rest.resources.authentication.requests.V1GetAuthTokenRequest;
import com.skyflow.v2.generated.rest.types.V1GetAuthTokenResponse;
import com.skyflow.common.generated.types.V1GetAuthTokenResponse;
import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import okhttp3.Call;
Expand Down
6 changes: 3 additions & 3 deletions .../authentication/AuthenticationClient.java → .../authentication/AuthenticationClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
package com.skyflow.v2.generated.rest.resources.authentication;
package com.skyflow.common.generated.authentication;

import com.skyflow.v2.generated.rest.core.ClientOptions;
import com.skyflow.v2.generated.rest.core.RequestOptions;
import com.skyflow.v2.generated.rest.resources.authentication.requests.V1GetAuthTokenRequest;
import com.skyflow.v2.generated.rest.types.V1GetAuthTokenResponse;
import com.skyflow.common.generated.authentication.requests.V1GetAuthTokenRequest;
import com.skyflow.common.generated.types.V1GetAuthTokenResponse;

public class AuthenticationClient {
protected final ClientOptions clientOptions;
Expand Down
8 changes: 4 additions & 4 deletions ...thentication/RawAuthenticationClient.java → ...thentication/RawAuthenticationClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
package com.skyflow.v2.generated.rest.resources.authentication;
package com.skyflow.common.generated.authentication;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.skyflow.v2.generated.rest.core.ApiClientApiException;
import com.skyflow.common.generated.authentication.requests.V1GetAuthTokenRequest;
import com.skyflow.common.generated.core.ApiClientApiException;
import com.skyflow.v2.generated.rest.core.ApiClientException;
import com.skyflow.v2.generated.rest.core.ApiClientHttpResponse;
import com.skyflow.v2.generated.rest.core.ClientOptions;
Expand All @@ -14,8 +15,7 @@
import com.skyflow.v2.generated.rest.errors.BadRequestError;
import com.skyflow.v2.generated.rest.errors.NotFoundError;
import com.skyflow.v2.generated.rest.errors.UnauthorizedError;
import com.skyflow.v2.generated.rest.resources.authentication.requests.V1GetAuthTokenRequest;
import com.skyflow.v2.generated.rest.types.V1GetAuthTokenResponse;
import com.skyflow.common.generated.types.V1GetAuthTokenResponse;
import java.io.IOException;
import okhttp3.Headers;
import okhttp3.HttpUrl;
Expand Down
2 changes: 1 addition & 1 deletion ...ation/requests/V1GetAuthTokenRequest.java → ...ation/requests/V1GetAuthTokenRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
package com.skyflow.v2.generated.rest.resources.authentication.requests;
package com.skyflow.common.generated.authentication.requests;

import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
Expand Down
4 changes: 3 additions & 1 deletion ...w/vaultLH/core/ApiClientApiException.java → ...generated/core/ApiClientApiException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
package com.skyflow.vaultLH.core;
package com.skyflow.common.generated.core;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.skyflow.v2.generated.rest.core.ApiClientException;
import okhttp3.Response;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...ed/rest/types/V1GetAuthTokenResponse.java → ...nerated/types/V1GetAuthTokenResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
package com.skyflow.v2.generated.rest.types;
package com.skyflow.common.generated.types;

import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
Expand Down
10 changes: 5 additions & 5 deletions .../com/skyflow/v2/utils/logger/LogUtil.java → ...va/com/skyflow/common/logger/LogUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.skyflow.v2.utils.logger;
package com.skyflow.common.logger;

import com.skyflow.v2.enums.LogLevel;
import com.skyflow.v2.logs.InfoLogs;
import com.skyflow.v2.utils.Constants;
import com.skyflow.common.enums.LogLevel;
import com.skyflow.common.logs.InfoLogs;
import com.skyflow.common.utils.SdkVersion;

import java.util.logging.*;

public final class LogUtil {
private static final Logger LOGGER = Logger.getLogger(LogUtil.class.getName());
private static final String SDK_LOG_PREFIX = "[" + Constants.SDK_PREFIX + "] ";
private static final String SDK_LOG_PREFIX = "[" + SdkVersion.getSdkPrefix() + "] ";
private static boolean IS_LOGGER_SETUP_DONE = false;

synchronized public static void setupLogger(LogLevel logLevel) {
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/skyflow/v2/logs/ErrorLogs.java → ...va/com/skyflow/common/logs/ErrorLogs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skyflow.v2.logs;
package com.skyflow.common.logs;

public enum ErrorLogs {
// Client initialization
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/com/skyflow/v2/logs/InfoLogs.java → ...ava/com/skyflow/common/logs/InfoLogs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.skyflow.v2.logs;
package com.skyflow.common.logs;

public enum InfoLogs {
// Client initialization
Expand Down
36 changes: 18 additions & 18 deletions src/main/java/com/skyflow/common/serviceaccount/util/BearerToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package com.skyflow.common.serviceaccount.util;

import com.google.gson.*;
import com.skyflow.v2.errors.ErrorCode;
import com.skyflow.v2.errors.ErrorMessage;
import com.skyflow.v2.errors.SkyflowException;
import com.skyflow.v2.generated.rest.ApiClient;
import com.skyflow.v2.generated.rest.ApiClientBuilder;
import com.skyflow.v2.generated.rest.core.ApiClientApiException;
import com.skyflow.v2.generated.rest.resources.authentication.AuthenticationClient;
import com.skyflow.v2.generated.rest.resources.authentication.requests.V1GetAuthTokenRequest;
import com.skyflow.v2.generated.rest.types.V1GetAuthTokenResponse;
import com.skyflow.v2.logs.ErrorLogs;
import com.skyflow.v2.logs.InfoLogs;
import com.skyflow.v2.utils.Constants;
import com.skyflow.v2.utils.Utils;
import com.skyflow.v2.utils.logger.LogUtil;
import com.skyflow.common.errors.ErrorCode;
import com.skyflow.common.errors.ErrorMessage;
import com.skyflow.common.errors.SkyflowException;
import com.skyflow.common.generated.ApiClient;
import com.skyflow.common.generated.ApiClientBuilder;
import com.skyflow.common.generated.core.ApiClientApiException;
import com.skyflow.common.generated.authentication.AuthenticationClient;
import com.skyflow.common.generated.authentication.requests.V1GetAuthTokenRequest;
import com.skyflow.common.generated.types.V1GetAuthTokenResponse;
import com.skyflow.common.logs.ErrorLogs;
import com.skyflow.common.logs.InfoLogs;
import com.skyflow.common.utils.Constants;
import com.skyflow.common.utils.CommonUtils;
import com.skyflow.common.logger.LogUtil;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;

Expand Down Expand Up @@ -62,11 +62,11 @@ private static V1GetAuthTokenResponse generateBearerTokenFromCredentials(
return getBearerTokenFromCredentials(serviceAccountCredentials, context, roles);
} catch (JsonSyntaxException e) {
LogUtil.printErrorLog(ErrorLogs.INVALID_CREDENTIALS_FILE_FORMAT.getLog());
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString(
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), CommonUtils.parameterizedString(
ErrorMessage.FileInvalidJson.getMessage(), credentialsFile.getPath()));
} catch (FileNotFoundException e) {
LogUtil.printErrorLog(ErrorLogs.CREDENTIALS_FILE_NOT_FOUND.getLog());
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString(
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), CommonUtils.parameterizedString(
ErrorMessage.FileNotFound.getMessage(), credentialsFile.getPath()));
}
}
Expand Down Expand Up @@ -117,12 +117,12 @@ private static V1GetAuthTokenResponse getBearerTokenFromCredentials(
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.MissingTokenUri.getMessage());
}

PrivateKey pvtKey = Utils.getPrivateKeyFromPem(privateKey.getAsString());
PrivateKey pvtKey = CommonUtils.getPrivateKeyFromPem(privateKey.getAsString());
String signedUserJWT = getSignedToken(
clientID.getAsString(), keyID.getAsString(), tokenURI.getAsString(), pvtKey, context
);

String basePath = Utils.getBaseURL(tokenURI.getAsString());
String basePath = CommonUtils.getBaseURL(tokenURI.getAsString());
apiClientBuilder.url(basePath);
ApiClient apiClient = apiClientBuilder.token("token").build();
AuthenticationClient authenticationApi = apiClient.authentication();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/skyflow/common/serviceaccount/util/SignedDataTokenResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.skyflow.common.serviceaccount.util;

import com.google.gson.Gson;
import com.skyflow.v2.utils.Constants;
import com.skyflow.common.utils.Constants;

public class SignedDataTokenResponse {
private static final String prefix = Constants.SIGNED_DATA_TOKEN_PREFIX;
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/skyflow/common/serviceaccount/util/SignedDataTokens.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
import com.skyflow.v2.errors.ErrorCode;
import com.skyflow.v2.errors.ErrorMessage;
import com.skyflow.v2.errors.SkyflowException;
import com.skyflow.v2.logs.ErrorLogs;
import com.skyflow.v2.logs.InfoLogs;
import com.skyflow.v2.utils.Utils;
import com.skyflow.v2.utils.logger.LogUtil;
import com.skyflow.common.errors.ErrorCode;
import com.skyflow.common.errors.ErrorMessage;
import com.skyflow.common.errors.SkyflowException;
import com.skyflow.common.logs.ErrorLogs;
import com.skyflow.common.logs.InfoLogs;
import com.skyflow.common.utils.CommonUtils;
import com.skyflow.common.logger.LogUtil;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;

Expand Down Expand Up @@ -59,11 +59,11 @@ private static List<SignedDataTokenResponse> generateSignedTokenFromCredentialsF
responseToken = generateSignedTokensFromCredentials(serviceAccountCredentials, dataTokens, timeToLive, context);
} catch (JsonSyntaxException e) {
LogUtil.printErrorLog(ErrorLogs.INVALID_CREDENTIALS_FILE_FORMAT.getLog());
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString(
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), CommonUtils.parameterizedString(
ErrorMessage.FileInvalidJson.getMessage(), credentialsFile.getPath()));
} catch (FileNotFoundException e) {
LogUtil.printErrorLog(ErrorLogs.CREDENTIALS_FILE_NOT_FOUND.getLog());
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), Utils.parameterizedString(
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), CommonUtils.parameterizedString(
ErrorMessage.FileNotFound.getMessage(), credentialsFile.getPath()));
}
return responseToken;
Expand Down Expand Up @@ -111,7 +111,7 @@ private static List<SignedDataTokenResponse> generateSignedTokensFromCredentials
LogUtil.printErrorLog(ErrorLogs.KEY_ID_IS_REQUIRED.getLog());
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.MissingKeyId.getMessage());
}
PrivateKey pvtKey = Utils.getPrivateKeyFromPem(privateKey.getAsString());
PrivateKey pvtKey = CommonUtils.getPrivateKeyFromPem(privateKey.getAsString());
signedDataTokens = getSignedToken(
clientID.getAsString(), keyID.getAsString(), pvtKey, dataTokens, timeToLive, context);
} catch (RuntimeException e) {
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/skyflow/common/serviceaccount/util/Token.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
import com.skyflow.v2.errors.ErrorCode;
import com.skyflow.v2.errors.ErrorMessage;
import com.skyflow.v2.errors.SkyflowException;
import com.skyflow.v2.logs.ErrorLogs;
import com.skyflow.v2.logs.InfoLogs;
import com.skyflow.v2.utils.logger.LogUtil;
import com.skyflow.common.errors.ErrorCode;
import com.skyflow.common.errors.ErrorMessage;
import com.skyflow.common.errors.SkyflowException;
import com.skyflow.common.logs.ErrorLogs;
import com.skyflow.common.logs.InfoLogs;
import com.skyflow.common.logger.LogUtil;
import org.apache.commons.codec.binary.Base64;

import java.nio.charset.StandardCharsets;
Expand Down
Loading
Loading