Skip to content

Support for encoding nullable properties #30

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
ksztyber wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for encoding nullable properties #30

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
5 changes: 4 additions & 1 deletion rdebej/_internal_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
DICTIONARY_ENTRY_OFFSET = 2
DICTIONARY_ENTRY_CHILD_COUNT = 3
DICTIONARY_ENTRY_NAME = 4
DICTIONARY_ENTRY_NULLABLE_PROPERTY = 5

BEJ_DICTIONARY_SELECTOR_MAJOR_SCHEMA = 0x00
BEJ_DICTIONARY_SELECTOR_ANNOTATION = 0x01
Expand Down Expand Up @@ -71,8 +72,9 @@ def get_next_entry(self):
entry = []
current_entry = 0
if self._current_entry < self._child_count or self._child_count == -1:
format = self.get_int(1)

entry.append(self.get_int(1) >> 4) # format
entry.append(format >> 4) # value format
entry.append(self.get_int(2)) # sequence
entry.append(self.get_int(2)) # offset
entry.append(self.get_int(2)) # child_count
Expand All @@ -86,6 +88,7 @@ def get_next_entry(self):
name = "".join(map(chr, self._byte_array[name_offset:name_offset+name_length-1])) # -1 to skip null terminator

entry.append(name)
entry.append((format & (1 << 2)) != 0) # nullable_property flag

if self._child_count != -1:
self._current_entry += 1
Expand Down
14 changes: 12 additions & 2 deletions rdebej/encode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,9 @@ def bej_encode_sflv(output_stream, schema_dict, annot_dict, dict_to_use, dict_en

bej_pack_array_done(nested_stream, seq)

elif format == BEJ_FORMAT_NULL:
bej_pack_sfl(output_stream, seq, BEJ_FORMAT_NULL, 0)

else:
if verbose:
print('Failed to encode value:', json_value)
Expand Down Expand Up @@ -486,6 +489,14 @@ def bej_encode_stream(output_stream, json_data, schema_dict, annot_dict, dict_to
if dict_to_use == schema_dict else BEJ_DICTIONARY_SELECTOR_ANNOTATION
prop_format = entry[DICTIONARY_ENTRY_FORMAT]

json_value = json_data[prop]
if json_value is None:
if not entry[DICTIONARY_ENTRY_NULLABLE_PROPERTY]:
if verbose:
print('Property {} cannot be null'.format(prop))
return False
prop_format = BEJ_FORMAT_NULL

sequence_number_with_dictionary_selector = (entry[DICTIONARY_ENTRY_SEQUENCE_NUMBER] << 1) \
| dictionary_selector_bit_value

Expand All @@ -506,11 +517,10 @@ def bej_encode_stream(output_stream, json_data, schema_dict, annot_dict, dict_to

success = bej_encode_sflv(nested_stream, schema_dict, annot_dict, tmp_dict_to_use, entry,
sequence_number_with_dictionary_selector, entry[DICTIONARY_ENTRY_FORMAT],
json_data[prop], pdr_map, 0, verbose)
json_value, pdr_map, 0, verbose)

bej_pack_property_annotation_done(nested_stream, prop_seq)
else:
json_value = json_data[prop]
format_flags = 0
# Special handling for '@odata.id' deferred binding string
if prop == '@odata.id' and prop_format == BEJ_FORMAT_STRING:
Expand Down