Skip to content

Commit 45442a5

Browse files
skyflow-vivekskyflow-vivek
authored
Merge pull request #263 from skyflowapi/v3-release/25.11.2
SK-2418 Beta release
2 parents 176510d + 8ceaa5e commit 45442a5

15 files changed

Lines changed: 373 additions & 50 deletions

File tree

‎common/src/main/java/com/skyflow/BaseSkyflow.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package com.skyflow;
22

33
import com.skyflow.config.Credentials;
4-
import com.skyflow.config.VaultConfig;
54
import com.skyflow.enums.LogLevel;
65
import com.skyflow.logs.InfoLogs;
76
import com.skyflow.utils.BaseUtils;
87
import com.skyflow.utils.logger.LogUtil;
98

10-
import java.util.LinkedHashMap;
11-
129
class BaseSkyflow {
1310
private final BaseSkyflowClientBuilder builder;
1411

@@ -20,18 +17,11 @@ public LogLevel getLogLevel() {
2017
return this.builder.logLevel;
2118
}
2219

23-
public VaultConfig getVaultConfig() {
24-
Object[] array = this.builder.vaultConfigMap.values().toArray();
25-
return (VaultConfig) array[0];
26-
}
27-
2820
static class BaseSkyflowClientBuilder {
29-
protected final LinkedHashMap<String, VaultConfig> vaultConfigMap;
3021
protected Credentials skyflowCredentials;
3122
protected LogLevel logLevel;
3223

3324
protected BaseSkyflowClientBuilder() {
34-
this.vaultConfigMap = new LinkedHashMap<>();
3525
this.skyflowCredentials = null;
3626
this.logLevel = LogLevel.ERROR;
3727
}

‎common/src/main/java/com/skyflow/errors/ErrorMessage.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public enum ErrorMessage {
2121
EmptyClusterId("%s0 Initialization failed. Invalid cluster ID. Specify a valid cluster ID."),
2222
EmptyVaultUrl("%s0 Initialization failed. Vault URL is empty. Specify a valid vault URL."),
2323
InvalidVaultUrlFormat("%s0 Initialization failed. Vault URL must start with 'https://'."),
24+
EitherVaultUrlOrClusterIdRequired("%s0 Initialization failed. Specify either 'clusterId' or 'vaultURL'."),
2425

2526
// Connection config
2627
InvalidConnectionId("%s0 Initialization failed. Invalid connection ID. Specify a valid connection ID."),
@@ -173,7 +174,7 @@ public enum ErrorMessage {
173174
NullTokenGroupNameInTokenGroup("%s0 Validation error. TokenGroupName in TokenGroupRedactions is null or empty. Specify a valid tokenGroupName."),
174175
InvalidRecord("%s0 Validation error. InsertRecord object in the list is invalid. Specify a valid InsertRecord object."),
175176
;
176-
;
177+
177178
private final String message;
178179

179180
ErrorMessage(String message) {

‎common/src/main/java/com/skyflow/logs/ErrorLogs.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public enum ErrorLogs {
88
EMPTY_VAULT_ID("Invalid vault config. Vault ID can not be empty."),
99
CLUSTER_ID_IS_REQUIRED("Invalid vault config. Cluster ID is required."),
1010
EMPTY_CLUSTER_ID("Invalid vault config. Cluster ID can not be empty."),
11+
EITHER_VAULT_URL_OR_CLUSTER_ID_REQUIRED("Invalid vault config. At least one of \"clusterId\" or \"vaultURL\" must be provided."),
1112
CONNECTION_CONFIG_EXISTS("Connection config with connection ID %s1 already exists."),
1213
CONNECTION_CONFIG_DOES_NOT_EXIST("Connection config with connection ID %s1 doesn't exist."),
1314
CONNECTION_ID_IS_REQUIRED("Invalid connection config. Connection ID is required."),

‎common/src/main/java/com/skyflow/utils/validations/BaseValidations.java‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.skyflow.utils.validations;
22

33
import com.skyflow.config.Credentials;
4-
import com.skyflow.config.VaultConfig;
54
import com.skyflow.errors.ErrorCode;
65
import com.skyflow.errors.ErrorMessage;
76
import com.skyflow.errors.SkyflowException;
@@ -18,28 +17,6 @@ public class BaseValidations {
1817
BaseValidations() {
1918
}
2019

21-
public static void validateVaultConfig(VaultConfig vaultConfig) throws SkyflowException {
22-
String vaultId = vaultConfig.getVaultId();
23-
String clusterId = vaultConfig.getClusterId();
24-
Credentials credentials = vaultConfig.getCredentials();
25-
if (vaultId == null) {
26-
LogUtil.printErrorLog(ErrorLogs.VAULT_ID_IS_REQUIRED.getLog());
27-
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidVaultId.getMessage());
28-
} else if (vaultId.trim().isEmpty()) {
29-
LogUtil.printErrorLog(ErrorLogs.EMPTY_VAULT_ID.getLog());
30-
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyVaultId.getMessage());
31-
} else if (clusterId == null) {
32-
LogUtil.printErrorLog(ErrorLogs.CLUSTER_ID_IS_REQUIRED.getLog());
33-
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidClusterId.getMessage());
34-
} else if (clusterId.trim().isEmpty()) {
35-
LogUtil.printErrorLog(ErrorLogs.EMPTY_CLUSTER_ID.getLog());
36-
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyClusterId.getMessage());
37-
}
38-
else if (credentials != null) {
39-
validateCredentials(credentials);
40-
}
41-
}
42-
4320
public static void validateCredentials(Credentials credentials) throws SkyflowException {
4421
int nonNullMembers = 0;
4522
String path = credentials.getPath();

‎v2/src/main/java/com/skyflow/Skyflow.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ public Skyflow addVaultConfig(VaultConfig vaultConfig) throws SkyflowException {
4040
return this;
4141
}
4242

43+
public VaultConfig getVaultConfig() {
44+
Object[] array = this.builder.vaultConfigMap.values().toArray();
45+
return (VaultConfig) array[0];
46+
}
47+
4348
public VaultConfig getVaultConfig(String vaultId) {
4449
return this.builder.vaultConfigMap.get(vaultId);
4550
}
@@ -141,13 +146,15 @@ public DetectController detect(String vaultId) throws SkyflowException {
141146
}
142147

143148
public static final class SkyflowClientBuilder extends BaseSkyflowClientBuilder {
149+
private final LinkedHashMap<String, VaultConfig> vaultConfigMap;
144150
private final LinkedHashMap<String, ConnectionController> connectionsMap;
145151
private final LinkedHashMap<String, VaultController> vaultClientsMap;
146152
private final LinkedHashMap<String, DetectController> detectClientsMap;
147153
private final LinkedHashMap<String, ConnectionConfig> connectionConfigMap;
148154

149155
public SkyflowClientBuilder() {
150156
super();
157+
this.vaultConfigMap = new LinkedHashMap<>();
151158
this.vaultClientsMap = new LinkedHashMap<>();
152159
this.detectClientsMap = new LinkedHashMap<>();
153160
this.connectionsMap = new LinkedHashMap<>();

common/src/main/java/com/skyflow/config/VaultConfig.java renamed to v2/src/main/java/com/skyflow/config/VaultConfig.java

File renamed without changes.

‎v2/src/main/java/com/skyflow/utils/validations/Validations.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import com.google.gson.Gson;
44
import com.google.gson.JsonObject;
55
import com.skyflow.config.ConnectionConfig;
6+
import com.skyflow.config.Credentials;
7+
import com.skyflow.config.VaultConfig;
68
import com.skyflow.enums.InterfaceName;
79
import com.skyflow.enums.RedactionType;
810
import com.skyflow.enums.TokenMode;
@@ -35,6 +37,27 @@ private Validations() {
3537
super();
3638
}
3739

40+
public static void validateVaultConfig(VaultConfig vaultConfig) throws SkyflowException {
41+
String vaultId = vaultConfig.getVaultId();
42+
String clusterId = vaultConfig.getClusterId();
43+
Credentials credentials = vaultConfig.getCredentials();
44+
if (vaultId == null) {
45+
LogUtil.printErrorLog(ErrorLogs.VAULT_ID_IS_REQUIRED.getLog());
46+
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidVaultId.getMessage());
47+
} else if (vaultId.trim().isEmpty()) {
48+
LogUtil.printErrorLog(ErrorLogs.EMPTY_VAULT_ID.getLog());
49+
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyVaultId.getMessage());
50+
} else if (clusterId == null) {
51+
LogUtil.printErrorLog(ErrorLogs.CLUSTER_ID_IS_REQUIRED.getLog());
52+
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidClusterId.getMessage());
53+
} else if (clusterId.trim().isEmpty()) {
54+
LogUtil.printErrorLog(ErrorLogs.EMPTY_CLUSTER_ID.getLog());
55+
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyClusterId.getMessage());
56+
} else if (credentials != null) {
57+
validateCredentials(credentials);
58+
}
59+
}
60+
3861
public static void validateConnectionConfig(ConnectionConfig connectionConfig) throws SkyflowException {
3962
String connectionId = connectionConfig.getConnectionId();
4063
String connectionUrl = connectionConfig.getConnectionUrl();

common/test/java/com/skyflow/config/VaultConfigTests.java renamed to v2/test/java/com/skyflow/config/VaultConfigTests.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.skyflow.errors.ErrorCode;
55
import com.skyflow.errors.ErrorMessage;
66
import com.skyflow.errors.SkyflowException;
7-
import com.skyflow.utils.validations.BaseValidations;
7+
import com.skyflow.utils.validations.Validations;
88
import org.junit.Assert;
99
import org.junit.BeforeClass;
1010
import org.junit.Test;
@@ -35,7 +35,7 @@ public void testValidVaultConfigWithCredentialsInValidations() {
3535
vaultConfig.setClusterId(clusterID);
3636
vaultConfig.setEnv(Env.SANDBOX);
3737
vaultConfig.setCredentials(credentials);
38-
BaseValidations.validateVaultConfig(vaultConfig);
38+
Validations.validateVaultConfig(vaultConfig);
3939

4040
Assert.assertEquals(vaultID, vaultConfig.getVaultId());
4141
Assert.assertEquals(clusterID, vaultConfig.getClusterId());
@@ -53,7 +53,7 @@ public void testValidVaultConfigWithoutCredentialsInValidations() {
5353
vaultConfig.setVaultId(vaultID);
5454
vaultConfig.setClusterId(clusterID);
5555
vaultConfig.setEnv(Env.SANDBOX);
56-
BaseValidations.validateVaultConfig(vaultConfig);
56+
Validations.validateVaultConfig(vaultConfig);
5757

5858
Assert.assertEquals(vaultID, vaultConfig.getVaultId());
5959
Assert.assertEquals(clusterID, vaultConfig.getClusterId());
@@ -71,7 +71,7 @@ public void testDefaultEnvInVaultConfigWithCredentialsInValidations() {
7171
vaultConfig.setVaultId(vaultID);
7272
vaultConfig.setClusterId(clusterID);
7373
vaultConfig.setCredentials(credentials);
74-
BaseValidations.validateVaultConfig(vaultConfig);
74+
Validations.validateVaultConfig(vaultConfig);
7575

7676
Assert.assertEquals(vaultID, vaultConfig.getVaultId());
7777
Assert.assertEquals(clusterID, vaultConfig.getClusterId());
@@ -89,7 +89,7 @@ public void testDefaultEnvInVaultConfigWithoutCredentialsInValidations() {
8989
vaultConfig.setVaultId(vaultID);
9090
vaultConfig.setClusterId(clusterID);
9191
vaultConfig.setEnv(null);
92-
BaseValidations.validateVaultConfig(vaultConfig);
92+
Validations.validateVaultConfig(vaultConfig);
9393

9494
Assert.assertEquals(vaultID, vaultConfig.getVaultId());
9595
Assert.assertEquals(clusterID, vaultConfig.getClusterId());
@@ -106,7 +106,7 @@ public void testNoVaultIdInVaultConfigInValidations() {
106106
try {
107107
vaultConfig.setClusterId(clusterID);
108108
vaultConfig.setEnv(Env.SANDBOX);
109-
BaseValidations.validateVaultConfig(vaultConfig);
109+
Validations.validateVaultConfig(vaultConfig);
110110
Assert.fail(EXCEPTION_NOT_THROWN);
111111
} catch (SkyflowException e) {
112112
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -121,7 +121,7 @@ public void testEmptyVaultIdInVaultConfigInValidations() {
121121
vaultConfig.setVaultId("");
122122
vaultConfig.setClusterId(clusterID);
123123
vaultConfig.setEnv(Env.SANDBOX);
124-
BaseValidations.validateVaultConfig(vaultConfig);
124+
Validations.validateVaultConfig(vaultConfig);
125125
Assert.fail(EXCEPTION_NOT_THROWN);
126126
} catch (SkyflowException e) {
127127
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -135,7 +135,7 @@ public void testNoClusterIdInVaultConfigInValidations() {
135135
VaultConfig vaultConfig = new VaultConfig();
136136
vaultConfig.setVaultId(vaultID);
137137
vaultConfig.setEnv(Env.SANDBOX);
138-
BaseValidations.validateVaultConfig(vaultConfig);
138+
Validations.validateVaultConfig(vaultConfig);
139139
Assert.fail(EXCEPTION_NOT_THROWN);
140140
} catch (SkyflowException e) {
141141
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
@@ -150,7 +150,7 @@ public void testEmptyClusterIdInVaultConfigInValidations() {
150150
vaultConfig.setVaultId(vaultID);
151151
vaultConfig.setClusterId("");
152152
vaultConfig.setEnv(Env.SANDBOX);
153-
BaseValidations.validateVaultConfig(vaultConfig);
153+
Validations.validateVaultConfig(vaultConfig);
154154
Assert.fail(EXCEPTION_NOT_THROWN);
155155
} catch (SkyflowException e) {
156156
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());

‎v3/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212

1313
<artifactId>skyflow-java</artifactId>
14-
<version>3.0.0-beta.7</version>
14+
<version>3.0.0-beta.7-dev.6749619</version>
1515
<packaging>jar</packaging>
1616
<name>${project.groupId}:${project.artifactId}</name>
1717
<description>Skyflow V3 SDK for the Java programming language</description>

‎v3/src/main/java/com/skyflow/Skyflow.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ public static SkyflowClientBuilder builder() {
3131
return new SkyflowClientBuilder();
3232
}
3333

34+
public VaultConfig getVaultConfig() {
35+
Object[] array = this.builder.vaultConfigMap.values().toArray();
36+
return (VaultConfig) array[0];
37+
}
38+
3439
public VaultController vault() throws SkyflowException {
3540
Object[] array = this.builder.vaultClientsMap.keySet().toArray();
3641
if (array.length < 1) {
@@ -48,9 +53,11 @@ public VaultController vault() throws SkyflowException {
4853
}
4954

5055
public static final class SkyflowClientBuilder extends BaseSkyflowClientBuilder {
56+
private final LinkedHashMap<String, VaultConfig> vaultConfigMap;
5157
private final LinkedHashMap<String, VaultController> vaultClientsMap;
5258

5359
public SkyflowClientBuilder() {
60+
this.vaultConfigMap = new LinkedHashMap<>();
5461
this.vaultClientsMap = new LinkedHashMap<>();
5562
}
5663

0 commit comments

Comments
 (0)