Skip to content

SK-2473: allow null and empty field values in insert and update valid… #270

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-himanshu wants to merge 1 commit into
base: release/26.1.3
Choose a base branch
from
Open

SK-2473: allow null and empty field values in insert and update valid… #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 0 additions & 18 deletions src/main/java/com/skyflow/utils/validations/Validations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,15 +291,6 @@ public static void validateInsertRequest(InsertRequest insertRequest) throws Sky
ErrorLogs.EMPTY_OR_NULL_KEY_IN_VALUES.getLog(), InterfaceName.INSERT.getName()
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyKeyInValues.getMessage());
} else {
Object value = valuesMap.get(key);
if (value == null || value.toString().trim().isEmpty()) {
LogUtil.printErrorLog(Utils.parameterizedString(
ErrorLogs.EMPTY_OR_NULL_VALUE_IN_VALUES.getLog(),
InterfaceName.INSERT.getName(), key
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyValueInValues.getMessage());
}
}
}
}
Expand Down Expand Up @@ -541,15 +532,6 @@ public static void validateUpdateRequest(UpdateRequest updateRequest) throws Sky
ErrorLogs.EMPTY_OR_NULL_KEY_IN_VALUES.getLog(), InterfaceName.UPDATE.getName()
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyKeyInValues.getMessage());
} else {
Object value = data.get(key);
if (value == null || value.toString().trim().isEmpty()) {
LogUtil.printErrorLog(Utils.parameterizedString(
ErrorLogs.EMPTY_OR_NULL_VALUE_IN_VALUES.getLog(), InterfaceName.UPDATE.getName(), key
));
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(),
ErrorMessage.EmptyValueInValues.getMessage());
}
}
}

Expand Down
23 changes: 17 additions & 6 deletions src/test/java/com/skyflow/vault/data/InsertTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,24 @@ public void testEmptyValueInValuesInInsertRequestValidations() {
InsertRequest request = InsertRequest.builder().table(table).values(values).build();
try {
Validations.validateInsertRequest(request);
Assert.fail(EXCEPTION_NOT_THROWN);
Assert.assertEquals(table, request.getTable());
Assert.assertEquals(1, request.getValues().size());
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
Assert.assertEquals(
Utils.parameterizedString(ErrorMessage.EmptyValueInValues.getMessage(), Constants.SDK_PREFIX),
e.getMessage()
);
Assert.fail(INVALID_EXCEPTION_THROWN);
}
}

@Test
public void testNullValueInValuesInInsertRequestValidations() {
valueMap.put("test_column_3", null);
values.add(valueMap);
InsertRequest request = InsertRequest.builder().table(table).values(values).build();
try {
Validations.validateInsertRequest(request);
Assert.assertEquals(table, request.getTable());
Assert.assertEquals(1, request.getValues().size());
} catch (SkyflowException e) {
Assert.fail(INVALID_EXCEPTION_THROWN);
}
}

Expand Down
26 changes: 10 additions & 16 deletions src/test/java/com/skyflow/vault/data/UpdateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,40 +248,34 @@ public void testEmptyKeyInValuesInUpdateRequestValidations() {
}

@Test
public void testNullValueInValuesInUpdateRequestValidations() {
public void testEmptyValueInValuesInUpdateRequestValidations() {
dataMap.put("skyflow_id", skyflowID);
dataMap.put("test_column_1", "test_value_1");
dataMap.put("test_column_2", "test_value_2");
dataMap.put("test_column_3", null);
dataMap.put("test_column_3", "");
UpdateRequest request = UpdateRequest.builder().table(table).data(dataMap).build();
try {
Validations.validateUpdateRequest(request);
Assert.fail(EXCEPTION_NOT_THROWN);
Assert.assertEquals(table, request.getTable());
Assert.assertEquals(4, request.getData().size());
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
Assert.assertEquals(
Utils.parameterizedString(ErrorMessage.EmptyValueInValues.getMessage(), Constants.SDK_PREFIX),
e.getMessage()
);
Assert.fail(INVALID_EXCEPTION_THROWN);
}
}

@Test
public void testEmptyValueInValuesInUpdateRequestValidations() {
public void testNullValueInValuesInUpdateRequestValidations() {
dataMap.put("skyflow_id", skyflowID);
dataMap.put("test_column_1", "test_value_1");
dataMap.put("test_column_2", "test_value_2");
dataMap.put("test_column_3", "");
dataMap.put("test_column_3", null);
UpdateRequest request = UpdateRequest.builder().table(table).data(dataMap).build();
try {
Validations.validateUpdateRequest(request);
Assert.fail(EXCEPTION_NOT_THROWN);
Assert.assertEquals(table, request.getTable());
Assert.assertEquals(4, request.getData().size());
} catch (SkyflowException e) {
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
Assert.assertEquals(
Utils.parameterizedString(ErrorMessage.EmptyValueInValues.getMessage(), Constants.SDK_PREFIX),
e.getMessage()
);
Assert.fail(INVALID_EXCEPTION_THROWN);
}
}

Expand Down
Loading