Skip to content

Commit 1f43436

Browse files
MaksimDzyubaAlmazNasibullin
authored andcommitted
G5V8DT-25913 Поддержка протокола WebSocket
1 parent 3ca4963 commit 1f43436

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

bundles/com.e1c.v8codestyle.bsl.ui/plugin.xml

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<modelClass eClass="IntegrationService" />
6767
<modelClass eClass="ExchangePlan" />
6868
<modelClass eClass="WebService" />
69+
<modelClass eClass="WebSocketClient" />
6970
<modelClass eClass="HTTPService" />
7071
<modelClass eClass="Constant" />
7172
<modelClass eClass="Document" />
@@ -146,6 +147,7 @@
146147
<modelClass eClass="IntegrationService" />
147148
<modelClass eClass="ExchangePlan" />
148149
<modelClass eClass="WebService" />
150+
<modelClass eClass="WebSocketClient" />
149151
<modelClass eClass="HTTPService" />
150152
<modelClass eClass="Constant" />
151153
<modelClass eClass="Document" />

bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/ModuleStructure.java

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public enum ModuleStructure
2727
{
2828

2929
BOT_MODULE(ModuleStructureSection.EVENT_HANDLERS, ModuleStructureSection.PRIVATE),
30+
WEB_SOCKET_CLIENT_MODULE(ModuleStructureSection.EVENT_HANDLERS, ModuleStructureSection.PRIVATE),
3031
COMMAND_MODULE(ModuleStructureSection.EVENT_HANDLERS, ModuleStructureSection.PRIVATE),
3132
COMMON_MODULE(ModuleStructureSection.PUBLIC, ModuleStructureSection.INTERNAL, ModuleStructureSection.PRIVATE),
3233
EXTERNAL_CONN_MODULE(ModuleStructureSection.EVENT_HANDLERS, ModuleStructureSection.PRIVATE),
@@ -93,6 +94,8 @@ public static Collection<ModuleStructureSection> getStructureByType(ModuleType m
9394
return VALUE_MANAGER_MODULE.getSections();
9495
case WEB_SERVICE_MODULE:
9596
return WEB_SERVICE_MODULE.getSections();
97+
case WEB_SOCKET_CLIENT_MODULE:
98+
return WEB_SOCKET_CLIENT_MODULE.getSections();
9699

97100
default:
98101
break;

bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/SelfReferenceCheck.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ protected void configureCheck(CheckConfigurer builder)
9797
.extension(ModuleTypeFilter.excludeTypes(ModuleType.ORDINARY_APP_MODULE, ModuleType.MANAGED_APP_MODULE,
9898
ModuleType.EXTERNAL_CONN_MODULE, ModuleType.SESSION_MODULE, ModuleType.MANAGER_MODULE,
9999
ModuleType.WEB_SERVICE_MODULE, ModuleType.HTTP_SERVICE_MODULE, ModuleType.INTEGRATION_SERVICE_MODULE,
100-
ModuleType.BOT_MODULE))
100+
ModuleType.BOT_MODULE, ModuleType.WEB_SOCKET_CLIENT_MODULE))
101101
.module()
102102
.checkedObjectType(DYNAMIC_FEATURE_ACCESS)
103103
.parameter(PARAMETER_CHECK_ONLY_EXISTING_FORM_PROPERTIES, Boolean.class, Boolean.TRUE.toString(),
@@ -137,18 +137,18 @@ private boolean isReferenceExcessive(DynamicFeatureAccess dynamicFeatureAccess,
137137
{
138138
return false;
139139
}
140-
140+
141141
Module module = EcoreUtil2.getContainerOfType(dynamicFeatureAccess, Module.class);
142142
if (!checkObjectModule && OBJECT_MODULE_TYPE_LIST.contains(module.getModuleType()))
143143
{
144144
return false;
145145
}
146-
146+
147147
if (!checkOnlyExistingFormProperties || (dynamicFeatureAccess.eContainer() instanceof Invocation))
148148
{
149149
return true;
150150
}
151-
151+
152152
return !(module.getModuleType() == ModuleType.FORM_MODULE
153153
&& isEmptySource(dynamicFeatureAccessComputer.resolveObject(dynamicFeatureAccess, module.environments())));
154154
}

docs/tools/module-structure.md

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ createModuleStructure=false
4949
- `http_service_module.bsl` - для модуля http-сервиса
5050
- `integration_service_module.bsl` - для модуля сервиса интеграции
5151
- `bot_module.bsl` - для модуля бота
52+
- `web_socket_client_module.bsl` - для модуля webSoket-клиента
5253

5354
## См. также
5455

0 commit comments

Comments
 (0)