Skip to content

Commit 5fe0fa5

Browse files
SK-2645: allow null and empty values in insert and update methods (#290)
1 parent 8182b1c commit 5fe0fa5

File tree

3 files changed

+15
-44
lines changed

3 files changed

+15
-44
lines changed

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -313,15 +313,6 @@ public static void validateInsertRequest(InsertRequest insertRequest) throws Sky
313313
ErrorLogs.EMPTY_OR_NULL_KEY_IN_VALUES.getLog(), InterfaceName.INSERT.getName()
314314
));
315315
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyKeyInValues.getMessage());
316-
} else {
317-
Object value = valuesMap.get(key);
318-
if (value == null || value.toString().trim().isEmpty()) {
319-
LogUtil.printErrorLog(Utils.parameterizedString(
320-
ErrorLogs.EMPTY_OR_NULL_VALUE_IN_VALUES.getLog(),
321-
InterfaceName.INSERT.getName(), key
322-
));
323-
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyValueInValues.getMessage());
324-
}
325316
}
326317
}
327318
}
@@ -563,15 +554,6 @@ public static void validateUpdateRequest(UpdateRequest updateRequest) throws Sky
563554
ErrorLogs.EMPTY_OR_NULL_KEY_IN_VALUES.getLog(), InterfaceName.UPDATE.getName()
564555
));
565556
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyKeyInValues.getMessage());
566-
} else {
567-
Object value = data.get(key);
568-
if (value == null || value.toString().trim().isEmpty()) {
569-
LogUtil.printErrorLog(Utils.parameterizedString(
570-
ErrorLogs.EMPTY_OR_NULL_VALUE_IN_VALUES.getLog(), InterfaceName.UPDATE.getName(), key
571-
));
572-
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(),
573-
ErrorMessage.EmptyValueInValues.getMessage());
574-
}
575557
}
576558
}
577559

src/test/java/com/skyflow/vault/data/InsertTests.java

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -210,29 +210,24 @@ public void testEmptyValueInValuesInInsertRequestValidations() {
210210
InsertRequest request = InsertRequest.builder().table(table).values(values).build();
211211
try {
212212
Validations.validateInsertRequest(request);
213-
Assert.fail(EXCEPTION_NOT_THROWN);
213+
Assert.assertEquals(table, request.getTable());
214+
Assert.assertEquals(1, request.getValues().size());
214215
} catch (SkyflowException e) {
215-
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
216-
Assert.assertEquals(
217-
Utils.parameterizedString(ErrorMessage.EmptyValueInValues.getMessage(), Constants.SDK_PREFIX),
218-
e.getMessage()
219-
);
216+
Assert.fail(INVALID_EXCEPTION_THROWN);
220217
}
221218
}
222219

223220
@Test
224-
public void testEmptyUpsertInInsertRequestValidations() {
221+
public void testNullValueInValuesInInsertRequestValidations() {
222+
valueMap.put("test_column_3", null);
225223
values.add(valueMap);
226-
InsertRequest request = InsertRequest.builder().table(table).values(values).upsert("").build();
224+
InsertRequest request = InsertRequest.builder().table(table).values(values).build();
227225
try {
228226
Validations.validateInsertRequest(request);
229-
Assert.fail(EXCEPTION_NOT_THROWN);
227+
Assert.assertEquals(table, request.getTable());
228+
Assert.assertEquals(1, request.getValues().size());
230229
} catch (SkyflowException e) {
231-
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
232-
Assert.assertEquals(
233-
Utils.parameterizedString(ErrorMessage.EmptyUpsert.getMessage(), Constants.SDK_PREFIX),
234-
e.getMessage()
235-
);
230+
Assert.fail(INVALID_EXCEPTION_THROWN);
236231
}
237232
}
238233

src/test/java/com/skyflow/vault/data/UpdateTests.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,10 @@ public void testNullValueInValuesInUpdateRequestValidations() {
256256
UpdateRequest request = UpdateRequest.builder().table(table).data(dataMap).build();
257257
try {
258258
Validations.validateUpdateRequest(request);
259-
Assert.fail(EXCEPTION_NOT_THROWN);
259+
Assert.assertEquals(table, request.getTable());
260+
Assert.assertEquals(4, request.getData().size());
260261
} catch (SkyflowException e) {
261-
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
262-
Assert.assertEquals(
263-
Utils.parameterizedString(ErrorMessage.EmptyValueInValues.getMessage(), Constants.SDK_PREFIX),
264-
e.getMessage()
265-
);
262+
Assert.fail(INVALID_EXCEPTION_THROWN);
266263
}
267264
}
268265

@@ -275,13 +272,10 @@ public void testEmptyValueInValuesInUpdateRequestValidations() {
275272
UpdateRequest request = UpdateRequest.builder().table(table).data(dataMap).build();
276273
try {
277274
Validations.validateUpdateRequest(request);
278-
Assert.fail(EXCEPTION_NOT_THROWN);
275+
Assert.assertEquals(table, request.getTable());
276+
Assert.assertEquals(4, request.getData().size());
279277
} catch (SkyflowException e) {
280-
Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
281-
Assert.assertEquals(
282-
Utils.parameterizedString(ErrorMessage.EmptyValueInValues.getMessage(), Constants.SDK_PREFIX),
283-
e.getMessage()
284-
);
278+
Assert.fail(INVALID_EXCEPTION_THROWN);
285279
}
286280
}
287281

0 commit comments

Comments
 (0)