Skip to content

Update imports in nodejs codecs #336

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

Merged
merged 3 commits into from
Aug 18, 2020
Merged

Update imports in nodejs codecs #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60f7a60
Update BitsUtil import
puzpuzpuz Aug 12, 2020
7973b94
Update paths for some classes
puzpuzpuz Aug 12, 2020
cfbc983
Change ClientMessage import
puzpuzpuz Aug 14, 2020
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
4 changes: 2 additions & 2 deletions ts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class PathHolders:
DataCodec = ImportPathHolder('DataCodec', 'builtin/DataCodec', is_builtin_codec=True)
ByteArrayCodec = ImportPathHolder('ByteArrayCodec', 'builtin/ByteArrayCodec', is_builtin_codec=True)
LongArrayCodec = ImportPathHolder('LongArrayCodec', 'builtin/LongArrayCodec', is_builtin_codec=True)
Address = ImportPathHolder('AddressImpl', 'Address')
Address = ImportPathHolder('AddressImpl', 'core/Address')
AddressCodec = ImportPathHolder('AddressCodec', 'custom/AddressCodec', is_custom_codec=True)
ErrorHolder = ImportPathHolder('ErrorHolder', 'protocol/ErrorHolder')
ErrorHolderCodec = ImportPathHolder('ErrorHolderCodec', 'custom/ErrorHolderCodec', is_custom_codec=True)
Expand All @@ -79,7 +79,7 @@ class PathHolders:
'custom/StackTraceElementCodec', is_custom_codec=True)
SimpleEntryView = ImportPathHolder('SimpleEntryView', 'core/SimpleEntryView')
SimpleEntryViewCodec = ImportPathHolder('SimpleEntryViewCodec', 'custom/SimpleEntryViewCodec', is_custom_codec=True)
DistributedObjectInfo = ImportPathHolder('DistributedObjectInfo', 'DistributedObjectInfo')
DistributedObjectInfo = ImportPathHolder('DistributedObjectInfo', 'core/DistributedObjectInfo')
DistributedObjectInfoCodec = ImportPathHolder('DistributedObjectInfoCodec',
'custom/DistributedObjectInfoCodec', is_custom_codec=True)
MemberInfo = ImportPathHolder('MemberInfo', 'core/MemberInfo')
Expand Down
4 changes: 2 additions & 2 deletions ts/codec-template.ts.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@
*/

/* eslint-disable max-len */
import {BitsUtil} from '../BitsUtil';
import {BitsUtil} from '../util/BitsUtil';
{% if request_fix_sized_params|length != 0 or response_fix_sized_params|length != 0 or event_fix_sized_params|length != 0 %}
import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec';
{% endif %}
import {ClientMessage, Frame, {% if response_fix_sized_params|length != 0 %}RESPONSE_BACKUP_ACKS_OFFSET, {% endif %}PARTITION_ID_OFFSET} from '../ClientMessage';
import {ClientMessage, Frame, {% if response_fix_sized_params|length != 0 %}RESPONSE_BACKUP_ACKS_OFFSET, {% endif %}PARTITION_ID_OFFSET} from '../protocol/ClientMessage';
{{ get_import_statements(request_fix_sized_params, request_var_sized_params, response_fix_sized_params, response_var_sized_params, event_fix_sized_params, event_var_sized_params) }}
// hex: {{ '0x%06X'|format(method.request.id) }}
const REQUEST_MESSAGE_TYPE = {{ method.request.id }};
Expand Down
4 changes: 2 additions & 2 deletions ts/custom-codec-template.ts.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@
{% set should_add_begin_frame = (fix_sized_params|length > fix_sized_new_params|length) or fix_sized_params|length == 0 %}
{% if fix_sized_params|length != 0 %}
import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec';
import {BitsUtil} from '../../BitsUtil';
import {BitsUtil} from '../../util/BitsUtil';
{% endif %}
import {ClientMessage, BEGIN_FRAME, END_FRAME{% if fix_sized_params|length != 0 %}, Frame, DEFAULT_FLAGS{% endif %}} from '../../ClientMessage';
import {ClientMessage, BEGIN_FRAME, END_FRAME{% if fix_sized_params|length != 0 %}, Frame, DEFAULT_FLAGS{% endif %}} from '../../protocol/ClientMessage';
import {CodecUtil} from '../builtin/CodecUtil';
{{ get_import_statements(fix_sized_params, var_sized_params) }}
{% for param in fix_sized_params %}
Expand Down