diff --git a/assets/layouts/layout-default.vue b/assets/layouts/layout-default.vue index cc13bd4..b09802e 100644 --- a/assets/layouts/layout-default.vue +++ b/assets/layouts/layout-default.vue @@ -6,9 +6,8 @@ import { onBeforeMount, ref } from 'vue'; import get from 'lodash.get'; -import { DashboardDocument, GroupDocument, WidgetDataSourceDocument, WidgetDisplayDocument, WidgetDocument } from '@fastybird/metadata-library'; - import { useDashboards, useGroups, useWidgets, useWidgetDataSources, useWidgetDisplay } from '../models'; +import { DashboardDocument, GroupDocument, WidgetDataSourceDocument, WidgetDisplayDocument, WidgetDocument } from '../types'; defineOptions({ name: 'LayoutDefault', diff --git a/assets/models/dashboards/store.ts b/assets/models/dashboards/store.ts index f912836..2503e58 100644 --- a/assets/models/dashboards/store.ts +++ b/assets/models/dashboards/store.ts @@ -1,4 +1,4 @@ -import { DashboardDocument, UiModuleRoutes as RoutingKeys, ModulePrefix } from '@fastybird/metadata-library'; +import { ModulePrefix } from '@fastybird/metadata-library'; import addFormats from 'ajv-formats'; import Ajv from 'ajv/dist/2020'; import axios from 'axios'; @@ -19,6 +19,7 @@ import { IDashboardsLoadRecordActionPayload, IPlainRelation, } from '../../models/types'; +import { DashboardDocument, RoutingKeys } from '../../types'; import { addRecord, getAllRecords, getRecord, removeRecord, DB_TABLE_DASHBOARDS } from '../../utilities/database'; import { diff --git a/assets/models/dashboards/types.ts b/assets/models/dashboards/types.ts index ebf7739..edc335a 100644 --- a/assets/models/dashboards/types.ts +++ b/assets/models/dashboards/types.ts @@ -1,9 +1,8 @@ import { TJsonaModel, TJsonApiBody, TJsonApiData, TJsonApiRelation, TJsonApiRelationships } from 'jsona/lib/JsonaTypes'; import { _GettersTree } from 'pinia'; -import { DashboardDocument } from '@fastybird/metadata-library'; - import { ITabResponseData, ITabResponseModel, IEntityMeta, IPlainRelation } from '../../models/types'; +import { DashboardDocument } from '../../types'; export interface IDashboardMeta extends IEntityMeta { entity: 'dashboard'; diff --git a/assets/models/groups/store.ts b/assets/models/groups/store.ts index 84fe7bd..a756cee 100644 --- a/assets/models/groups/store.ts +++ b/assets/models/groups/store.ts @@ -1,4 +1,4 @@ -import { GroupDocument, UiModuleRoutes as RoutingKeys, ModulePrefix } from '@fastybird/metadata-library'; +import { ModulePrefix } from '@fastybird/metadata-library'; import addFormats from 'ajv-formats'; import Ajv from 'ajv/dist/2020'; import axios from 'axios'; @@ -13,6 +13,7 @@ import exchangeDocumentSchema from '../../../resources/schemas/document.group.js import { ApiError } from '../../errors'; import { JsonApiJsonPropertiesMapper, JsonApiModelPropertiesMapper } from '../../jsonapi'; import { IGroupDatabaseRecord, IGroupMeta, IGroupsInsertDataActionPayload, IGroupsLoadRecordActionPayload, IPlainRelation } from '../../models/types'; +import { GroupDocument, RoutingKeys } from '../../types'; import { addRecord, getAllRecords, getRecord, removeRecord, DB_TABLE_GROUPS } from '../../utilities/database'; import { diff --git a/assets/models/groups/types.ts b/assets/models/groups/types.ts index a6c33f9..d1d60da 100644 --- a/assets/models/groups/types.ts +++ b/assets/models/groups/types.ts @@ -1,9 +1,8 @@ import { TJsonaModel, TJsonApiBody, TJsonApiData, TJsonApiRelation, TJsonApiRelationships } from 'jsona/lib/JsonaTypes'; import { _GettersTree } from 'pinia'; -import { GroupDocument } from '@fastybird/metadata-library'; - import { IWidgetResponseData, IWidgetResponseModel, IEntityMeta, IPlainRelation } from '../../models/types'; +import { GroupDocument } from '../../types'; export interface IGroupMeta extends IEntityMeta { entity: 'group'; diff --git a/assets/models/tabs/store.ts b/assets/models/tabs/store.ts index 893049f..40bf6b7 100644 --- a/assets/models/tabs/store.ts +++ b/assets/models/tabs/store.ts @@ -1,4 +1,4 @@ -import { TabDocument, UiModuleRoutes as RoutingKeys, ModulePrefix, ModuleSource } from '@fastybird/metadata-library'; +import { ModulePrefix, ModuleSource } from '@fastybird/metadata-library'; import addFormats from 'ajv-formats'; import Ajv from 'ajv/dist/2020'; import axios from 'axios'; @@ -13,6 +13,7 @@ import exchangeDocumentSchema from '../../../resources/schemas/document.tab.json import { ApiError } from '../../errors'; import { JsonApiJsonPropertiesMapper, JsonApiModelPropertiesMapper } from '../../jsonapi'; import { ITabDatabaseRecord, ITabMeta, ITabsInsertDataActionPayload, ITabsLoadRecordActionPayload, IPlainRelation } from '../../models/types'; +import { RoutingKeys, TabDocument } from '../../types'; import { addRecord, getAllRecords, getRecord, removeRecord, DB_TABLE_TABS } from '../../utilities/database'; import { diff --git a/assets/models/tabs/types.ts b/assets/models/tabs/types.ts index 11168d9..7e4a5d7 100644 --- a/assets/models/tabs/types.ts +++ b/assets/models/tabs/types.ts @@ -1,8 +1,6 @@ import { TJsonaModel, TJsonApiBody, TJsonApiData, TJsonApiRelation, TJsonApiRelationships } from 'jsona/lib/JsonaTypes'; import { _GettersTree } from 'pinia'; -import { TabDocument } from '@fastybird/metadata-library'; - import { IDashboardResponseData, IDashboardResponseModel, @@ -11,6 +9,7 @@ import { IEntityMeta, IPlainRelation, } from '../../models/types'; +import { TabDocument } from '../../types'; export interface ITabMeta extends IEntityMeta { entity: 'tab'; diff --git a/assets/models/widgets-data-sources/store.ts b/assets/models/widgets-data-sources/store.ts index 04c1d50..38e495a 100644 --- a/assets/models/widgets-data-sources/store.ts +++ b/assets/models/widgets-data-sources/store.ts @@ -1,4 +1,4 @@ -import { ActionRoutes, ExchangeCommand, ModulePrefix, UiModuleRoutes as RoutingKeys, WidgetDataSourceDocument } from '@fastybird/metadata-library'; +import { ModulePrefix } from '@fastybird/metadata-library'; import { useWampV1Client } from '@fastybird/vue-wamp-v1'; import addFormats from 'ajv-formats'; import Ajv from 'ajv/dist/2020'; @@ -14,6 +14,7 @@ import exchangeDocumentSchema from '../../../resources/schemas/document.widget.d import { ApiError } from '../../errors'; import { JsonApiJsonPropertiesMapper, JsonApiModelPropertiesMapper } from '../../jsonapi'; import { useWidgets } from '../../models'; +import { ActionRoutes, ExchangeCommand, RoutingKeys, WidgetDataSourceDocument } from '../../types'; import { addRecord, DB_TABLE_WIDGETS_DATA_SOURCES, getAllRecords, getRecord, removeRecord } from '../../utilities/database'; import { IWidget } from '../widgets/types'; diff --git a/assets/models/widgets-data-sources/types.ts b/assets/models/widgets-data-sources/types.ts index e1177aa..0ffdb9f 100644 --- a/assets/models/widgets-data-sources/types.ts +++ b/assets/models/widgets-data-sources/types.ts @@ -1,8 +1,8 @@ -import { WidgetDataSourceDocument } from '@fastybird/metadata-library'; import { TJsonaModel, TJsonApiBody, TJsonApiData, TJsonApiRelation, TJsonApiRelationships } from 'jsona/lib/JsonaTypes'; import { _GettersTree } from 'pinia'; import { IWidget, IWidgetResponseData, IPlainRelation, IWidgetResponseModel, IEntityMeta } from '../../models/types'; +import { WidgetDataSourceDocument } from '../../types'; export interface IWidgetDataSourceMeta extends IEntityMeta { type: string; diff --git a/assets/models/widgets-display/store.ts b/assets/models/widgets-display/store.ts index 13beab8..70fa6a4 100644 --- a/assets/models/widgets-display/store.ts +++ b/assets/models/widgets-display/store.ts @@ -1,4 +1,4 @@ -import { ModulePrefix, UiModuleRoutes as RoutingKeys, WidgetDisplayDocument } from '@fastybird/metadata-library'; +import { ModulePrefix } from '@fastybird/metadata-library'; import addFormats from 'ajv-formats'; import Ajv from 'ajv/dist/2020'; import axios from 'axios'; @@ -13,6 +13,7 @@ import exchangeDocumentSchema from '../../../resources/schemas/document.widget.d import { ApiError } from '../../errors'; import { JsonApiJsonPropertiesMapper, JsonApiModelPropertiesMapper } from '../../jsonapi'; import { useWidgets } from '../../models'; +import { RoutingKeys, WidgetDisplayDocument } from '../../types'; import { addRecord, DB_TABLE_WIDGETS_DATA_SOURCES, getAllRecords, getRecord, removeRecord } from '../../utilities/database'; import { IWidget } from '../widgets/types'; diff --git a/assets/models/widgets-display/types.ts b/assets/models/widgets-display/types.ts index 2079ea5..4b3c24e 100644 --- a/assets/models/widgets-display/types.ts +++ b/assets/models/widgets-display/types.ts @@ -1,8 +1,8 @@ -import { WidgetDisplayDocument } from '@fastybird/metadata-library'; import { TJsonaModel, TJsonApiBody, TJsonApiData, TJsonApiRelation, TJsonApiRelationships } from 'jsona/lib/JsonaTypes'; import { _GettersTree } from 'pinia'; import { IWidget, IWidgetResponseData, IPlainRelation, IWidgetResponseModel, IEntityMeta } from '../../models/types'; +import { WidgetDisplayDocument } from '../../types'; export interface IWidgetDisplayMeta extends IEntityMeta { type: string; diff --git a/assets/models/widgets/store.ts b/assets/models/widgets/store.ts index 0779bab..c00faa5 100644 --- a/assets/models/widgets/store.ts +++ b/assets/models/widgets/store.ts @@ -1,4 +1,4 @@ -import { WidgetDocument, UiModuleRoutes as RoutingKeys, ModulePrefix, ModuleSource } from '@fastybird/metadata-library'; +import { ModulePrefix, ModuleSource } from '@fastybird/metadata-library'; import addFormats from 'ajv-formats'; import Ajv from 'ajv/dist/2020'; import axios from 'axios'; @@ -22,6 +22,7 @@ import { IWidgetDataSourceResponseModel, IWidgetDisplayResponseModel, } from '../../models/types'; +import { RoutingKeys, WidgetDocument } from '../../types'; import { addRecord, getAllRecords, getRecord, removeRecord, DB_TABLE_WIDGETS } from '../../utilities/database'; import { diff --git a/assets/models/widgets/types.ts b/assets/models/widgets/types.ts index cb0e144..337ee21 100644 --- a/assets/models/widgets/types.ts +++ b/assets/models/widgets/types.ts @@ -1,8 +1,6 @@ import { TJsonaModel, TJsonApiBody, TJsonApiData, TJsonApiRelation, TJsonApiRelationships } from 'jsona/lib/JsonaTypes'; import { _GettersTree } from 'pinia'; -import { WidgetDocument } from '@fastybird/metadata-library'; - import { IWidgetDataSourceResponseModel, ITabResponseModel, @@ -14,6 +12,7 @@ import { ITabResponseData, IWidgetDisplayResponseData, } from '../../models/types'; +import { WidgetDocument } from '../../types'; export interface IWidgetMeta extends IEntityMeta { type: string; diff --git a/assets/types/exchange.ts b/assets/types/exchange.ts new file mode 100644 index 0000000..e0f7ec9 --- /dev/null +++ b/assets/types/exchange.ts @@ -0,0 +1,47 @@ +export enum ActionRoutes { + WIDGET_DATA_SOURCE = 'fb.exchange.action.widget.data-source', +} + +export enum RoutingKeys { + // Dashboards + DASHBOARD_DOCUMENT_REPORTED = 'fb.exchange.module.document.reported.dashboard', + DASHBOARD_DOCUMENT_CREATED = 'fb.exchange.module.document.created.dashboard', + DASHBOARD_DOCUMENT_UPDATED = 'fb.exchange.module.document.updated.dashboard', + DASHBOARD_DOCUMENT_DELETED = 'fb.exchange.module.document.deleted.dashboard', + + // Tabs + TAB_DOCUMENT_REPORTED = 'fb.exchange.module.document.reported.tab', + TAB_DOCUMENT_CREATED = 'fb.exchange.module.document.created.tab', + TAB_DOCUMENT_UPDATED = 'fb.exchange.module.document.updated.tab', + TAB_DOCUMENT_DELETED = 'fb.exchange.module.document.deleted.tab', + + // Groups + GROUP_DOCUMENT_REPORTED = 'fb.exchange.module.document.reported.group', + GROUP_DOCUMENT_CREATED = 'fb.exchange.module.document.created.group', + GROUP_DOCUMENT_UPDATED = 'fb.exchange.module.document.updated.group', + GROUP_DOCUMENT_DELETED = 'fb.exchange.module.document.deleted.group', + + // Widgets + WIDGET_DOCUMENT_REPORTED = 'fb.exchange.module.document.reported.widget', + WIDGET_DOCUMENT_CREATED = 'fb.exchange.module.document.created.widget', + WIDGET_DOCUMENT_UPDATED = 'fb.exchange.module.document.updated.widget', + WIDGET_DOCUMENT_DELETED = 'fb.exchange.module.document.deleted.widget', + + // Widget's display + WIDGET_DISPLAY_DOCUMENT_REPORTED = 'fb.exchange.module.document.reported.widget.display', + WIDGET_DISPLAY_DOCUMENT_CREATED = 'fb.exchange.module.document.created.widget.display', + WIDGET_DISPLAY_DOCUMENT_UPDATED = 'fb.exchange.module.document.updated.widget.display', + WIDGET_DISPLAY_DOCUMENT_DELETED = 'fb.exchange.module.document.deleted.widget.display', + + // Widget's data sources + WIDGET_DATA_SOURCE_DOCUMENT_REPORTED = 'fb.exchange.module.document.reported.widget.data-source', + WIDGET_DATA_SOURCE_DOCUMENT_CREATED = 'fb.exchange.module.document.created.widget.data-source', + WIDGET_DATA_SOURCE_DOCUMENT_UPDATED = 'fb.exchange.module.document.updated.widget.data-source', + WIDGET_DATA_SOURCE_DOCUMENT_DELETED = 'fb.exchange.module.document.deleted.widget.data-source', +} + +export enum ExchangeCommand { + SET = 'set', + GET = 'get', + REPORT = 'report', +} diff --git a/assets/types/index.ts b/assets/types/index.ts index 292a9d5..da514ff 100644 --- a/assets/types/index.ts +++ b/assets/types/index.ts @@ -4,6 +4,8 @@ import { I18n } from 'vue-i18n'; import { Router } from 'vue-router'; import { Client } from '@fastybird/vue-wamp-v1'; +export * from './exchange'; + export type InstallFunction = Plugin & { installed?: boolean }; export interface IUiModuleOptions { @@ -57,3 +59,82 @@ export enum FormResultTypes { } export type FormResultType = FormResultTypes.NONE | FormResultTypes.WORKING | FormResultTypes.ERROR | FormResultTypes.OK; +export interface DashboardDocument { + id: string; + source: string; + identifier: string; + name: string | null; + comment: string | null; + priority: number; + tabs: TabDocument['id'][]; + owner: string | null; + createdAt: Date | null; + updatedAt: Date | null; +} + +export interface TabDocument { + id: string; + source: string; + identifier: string; + name: string | null; + comment: string | null; + priority: number; + dashboard: DashboardDocument['id']; + widgets: WidgetDocument['id'][]; + owner: string | null; + createdAt: Date | null; + updatedAt: Date | null; +} + +export interface GroupDocument { + id: string; + source: string; + identifier: string; + name: string | null; + comment: string | null; + priority: number; + widgets: WidgetDocument['id'][]; + owner: string | null; + createdAt: Date | null; + updatedAt: Date | null; +} + +export interface WidgetDocument { + id: string; + type: string; + source: string; + identifier: string; + name: string | null; + comment: string | null; + display: WidgetDisplayDocument['id']; + data_sources: WidgetDataSourceDocument['id'][]; + tabs: TabDocument['id'][]; + groups: GroupDocument['id'][]; + owner: string | null; + createdAt: Date | null; + updatedAt: Date | null; +} + +export interface WidgetDisplayDocument { + id: string; + type: string; + source: string; + identifier: string; + params: object; + widget: WidgetDocument['id']; + owner: string | null; + createdAt: Date | null; + updatedAt: Date | null; +} + +export interface WidgetDataSourceDocument { + id: string; + type: string; + source: string; + identifier: string; + params: object; + widget: WidgetDocument['id']; + owner: string | null; + createdAt: Date | null; + updatedAt: Date | null; +} diff --git a/composer.json b/composer.json index b236810..eb9699a 100644 --- a/composer.json +++ b/composer.json @@ -44,12 +44,12 @@ "contributte/monolog": "^0.5", "contributte/translation": "^2.0", "cweagans/composer-patches": "^1.7", - "fastybird/application-library": "dev-main", - "fastybird/exchange-library": "dev-main", + "fastybird/application": "dev-main", + "fastybird/exchange": "dev-main", "fastybird/json-api": "^0.19", "fastybird/metadata-library": "dev-main", "fastybird/simple-auth": "^0.14", - "fastybird/tools-library": "dev-main", + "fastybird/tools": "dev-main", "ipub/slim-router": "^0.2", "nettrine/dbal": "^0.8", "nettrine/orm": "^0.8", diff --git a/config/example.neon b/config/example.neon index 17aca2d..961ad68 100644 --- a/config/example.neon +++ b/config/example.neon @@ -29,8 +29,8 @@ extensions: fbJsonApi : FastyBird\JsonApi\DI\JsonApiExtension fbSimpleAuth : FastyBird\SimpleAuth\DI\SimpleAuthExtension fbWebServer : FastyBird\WebServer\DI\WebServerExtension - fbMetadataLibrary : FastyBird\Library\Metadata\DI\MetadataExtension - fbExchangeLibrary : FastyBird\Library\Exchange\DI\ExchangeExtension + fbTools : FastyBird\Core\Tools\DI\ToolsExtension + fbExchange : FastyBird\Core\Exchange\DI\ExchangeExtension contributteTranslation: locales: diff --git a/package.json b/package.json index 7d148a5..fe3076d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@fastybird/ui-module", - "version": "1.0.0-dev.23", + "version": "1.0.0-dev.24", "type": "module", "description" : "FastyBird IoT module for managing visual components", "keywords": [ @@ -58,10 +58,10 @@ "pretty:write": "prettier assets --write" }, "dependencies": { - "@fastybird/metadata-library": "1.0.0-dev.23", + "@fastybird/metadata-library": "1.0.0-dev.24", "@fastybird/vue-wamp-v1": "^1.2", - "@fastybird/web-ui-icons": "1.0.0-dev.23", - "@fastybird/web-ui-library": "1.0.0-dev.23", + "@fastybird/web-ui-icons": "1.0.0-dev.24", + "@fastybird/web-ui-library": "1.0.0-dev.24", "@sentry/vue": "^7.113", "ajv": "^8.12", "ajv-formats": "^3.0", @@ -118,7 +118,7 @@ "stylelint-config-standard-scss": "^13.1", "stylelint-order": "^6.0", "stylelint-prettier": "^5.0", - "typescript": "^5.4", + "typescript": "5.6.2", "typescript-eslint": "^7.8", "unocss": "^0.59", "vite": "^5.2", diff --git a/src/Commands/Install.php b/src/Commands/Install.php index 904bbbe..31c126b 100644 --- a/src/Commands/Install.php +++ b/src/Commands/Install.php @@ -15,7 +15,7 @@ namespace FastyBird\Module\Ui\Commands; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use Nette\Localization; @@ -104,7 +104,7 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $ [ 'source' => MetadataTypes\Sources\Module::UI->value, 'type' => 'install-cmd', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); diff --git a/src/Consumers/SocketsBridge.php b/src/Consumers/SocketsBridge.php index b444521..7a3bc3a 100644 --- a/src/Consumers/SocketsBridge.php +++ b/src/Consumers/SocketsBridge.php @@ -15,9 +15,9 @@ namespace FastyBird\Module\Ui\Consumers; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; -use FastyBird\Library\Exchange\Consumers as ExchangeConsumer; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; +use FastyBird\Core\Application\Documents as ApplicationDocuments; +use FastyBird\Core\Exchange\Consumers as ExchangeConsumers; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use IPub\WebSockets; @@ -34,7 +34,7 @@ * * @author Adam Kadlec */ -final readonly class SocketsBridge implements ExchangeConsumer\Consumer +final readonly class SocketsBridge implements ExchangeConsumers\Consumer { public function __construct( @@ -48,7 +48,7 @@ public function __construct( public function consume( MetadataTypes\Sources\Source $source, string $routingKey, - MetadataDocuments\Document|null $document, + ApplicationDocuments\Document|null $document, ): void { if (!in_array($routingKey, Ui\Constants::MESSAGE_BUS_ROUTING_KEYS, true)) { @@ -136,7 +136,7 @@ private function sendMessage(array $data): bool [ 'source' => MetadataTypes\Sources\Module::DEVICES->value, 'type' => 'sockets-consumer', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -146,7 +146,7 @@ private function sendMessage(array $data): bool [ 'source' => MetadataTypes\Sources\Module::DEVICES->value, 'type' => 'sockets-consumer', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); } diff --git a/src/Controllers/BaseV1.php b/src/Controllers/BaseV1.php index 37a5c17..a38e966 100644 --- a/src/Controllers/BaseV1.php +++ b/src/Controllers/BaseV1.php @@ -18,10 +18,10 @@ use Doctrine\DBAL\Connection; use Doctrine\Persistence; use Exception; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\JsonApi\Builder as JsonApiBuilder; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; use FastyBird\JsonApi\Hydrators as JsonApiHydrators; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; use FastyBird\Module\Ui; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Router; @@ -208,14 +208,14 @@ protected function getOrmConnection(): Connection } /** - * @param DoctrineCrud\Entities\IEntity|MetadataDocuments\Document|ResultSet|array $data + * @param DoctrineCrud\Entities\IEntity|ApplicationDocuments\Document|ResultSet|array $data * * @throws Exception */ protected function buildResponse( Message\ServerRequestInterface $request, ResponseInterface $response, - ResultSet|DoctrineCrud\Entities\IEntity|MetadataDocuments\Document|array $data, + ResultSet|DoctrineCrud\Entities\IEntity|ApplicationDocuments\Document|array $data, ): ResponseInterface { $totalCount = null; diff --git a/src/Controllers/DashboardsV1.php b/src/Controllers/DashboardsV1.php index d28786e..e254e95 100644 --- a/src/Controllers/DashboardsV1.php +++ b/src/Controllers/DashboardsV1.php @@ -17,9 +17,10 @@ use Doctrine; use Exception; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui\Controllers; use FastyBird\Module\Ui\Exceptions; @@ -181,7 +182,7 @@ public function create( [ 'source' => MetadataTypes\Sources\Module::UI->value, 'type' => 'dashboards-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -276,7 +277,7 @@ public function update( [ 'source' => MetadataTypes\Sources\Module::UI->value, 'type' => 'dashboards-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -315,6 +316,7 @@ public function update( * @throws InvalidArgumentException * @throws JsonApiExceptions\JsonApi * @throws JsonApiExceptions\JsonApiError + * @throws ToolsExceptions\InvalidState * * @Secured\Role(manager,administrator) */ @@ -342,7 +344,7 @@ public function delete( [ 'source' => MetadataTypes\Sources\Module::UI->value, 'type' => 'dashboards-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); diff --git a/src/Controllers/DataSourcesV1.php b/src/Controllers/DataSourcesV1.php index ae8799e..894cc9f 100644 --- a/src/Controllers/DataSourcesV1.php +++ b/src/Controllers/DataSourcesV1.php @@ -17,9 +17,10 @@ use Doctrine; use Exception; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui\Controllers; use FastyBird\Module\Ui\Entities; @@ -194,7 +195,7 @@ public function create( [ 'source' => MetadataTypes\Sources\Module::DEVICES->value, 'type' => 'dataSources-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -271,7 +272,7 @@ public function update( [ 'source' => MetadataTypes\Sources\Module::DEVICES->value, 'type' => 'dataSources-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -310,6 +311,7 @@ public function update( * @throws InvalidArgumentException * @throws JsonApiExceptions\JsonApi * @throws JsonApiExceptions\JsonApiError + * @throws ToolsExceptions\InvalidState * * @Secured\Role(manager,administrator) */ @@ -340,7 +342,7 @@ public function delete( [ 'source' => MetadataTypes\Sources\Module::DEVICES->value, 'type' => 'dataSources-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -386,8 +388,8 @@ public function readRelationship( } /** - * @throws ApplicationExceptions\InvalidState * @throws JsonApiExceptions\JsonApi + * @throws ToolsExceptions\InvalidState */ protected function findDataSource( string $id, diff --git a/src/Controllers/DisplayV1.php b/src/Controllers/DisplayV1.php index 7715ec3..4322dc4 100644 --- a/src/Controllers/DisplayV1.php +++ b/src/Controllers/DisplayV1.php @@ -17,8 +17,8 @@ use Doctrine; use Exception; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui\Controllers; use FastyBird\Module\Ui\Models; @@ -110,7 +110,7 @@ public function update( [ 'source' => MetadataTypes\Sources\Module::DEVICES->value, 'type' => 'display-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); diff --git a/src/Controllers/ExchangeV1.php b/src/Controllers/ExchangeV1.php index 76173b1..e8ba601 100644 --- a/src/Controllers/ExchangeV1.php +++ b/src/Controllers/ExchangeV1.php @@ -15,9 +15,9 @@ namespace FastyBird\Module\Ui\Controllers; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; -use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Core\Application\Documents as ApplicationDocuments; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use FastyBird\Module\Ui\Documents; @@ -48,7 +48,7 @@ final class ExchangeV1 extends WebSockets\Application\Controller\Controller public function __construct( private readonly Models\Configuration\Widgets\DataSources\Repository $dataSourcesConfigurationRepository, private readonly Ui\Logger $logger, - private readonly MetadataDocuments\DocumentFactory $documentFactory, + private readonly ApplicationDocuments\DocumentFactory $documentFactory, private readonly EventDispatcher\EventDispatcherInterface|null $dispatcher = null, ) { @@ -95,7 +95,7 @@ public function actionSubscribe( [ 'source' => MetadataTypes\Sources\Module::UI->value, 'type' => 'exchange-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); } @@ -107,10 +107,10 @@ public function actionSubscribe( * * @throws Exceptions\InvalidArgument * @throws Exceptions\InvalidState - * @throws MetadataExceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState - * @throws MetadataExceptions\Mapping - * @throws MetadataExceptions\MalformedInput + * @throws ApplicationExceptions\InvalidArgument + * @throws ApplicationExceptions\InvalidState + * @throws ApplicationExceptions\Mapping + * @throws ApplicationExceptions\MalformedInput * @throws Utils\JsonException */ public function actionCall( diff --git a/src/Controllers/Finders/TDashboard.php b/src/Controllers/Finders/TDashboard.php index 82c3ab2..7276f06 100644 --- a/src/Controllers/Finders/TDashboard.php +++ b/src/Controllers/Finders/TDashboard.php @@ -15,8 +15,8 @@ namespace FastyBird\Module\Ui\Controllers\Finders; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Models; use FastyBird\Module\Ui\Queries; @@ -33,8 +33,8 @@ trait TDashboard { /** - * @throws ApplicationExceptions\InvalidState * @throws JsonApiExceptions\JsonApi + * @throws ToolsExceptions\InvalidState */ protected function findDashboard(string $id): Entities\Dashboards\Dashboard { diff --git a/src/Controllers/Finders/TGroup.php b/src/Controllers/Finders/TGroup.php index 3876387..18368c7 100644 --- a/src/Controllers/Finders/TGroup.php +++ b/src/Controllers/Finders/TGroup.php @@ -15,8 +15,8 @@ namespace FastyBird\Module\Ui\Controllers\Finders; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Models; use Fig\Http\Message\StatusCodeInterface; @@ -32,8 +32,8 @@ trait TGroup { /** - * @throws ApplicationExceptions\InvalidState * @throws JsonApiExceptions\JsonApi + * @throws ToolsExceptions\InvalidState */ protected function findGroup(string $id): Entities\Groups\Group { diff --git a/src/Controllers/Finders/TTab.php b/src/Controllers/Finders/TTab.php index ee46d97..4c0089a 100644 --- a/src/Controllers/Finders/TTab.php +++ b/src/Controllers/Finders/TTab.php @@ -15,8 +15,8 @@ namespace FastyBird\Module\Ui\Controllers\Finders; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Models; use FastyBird\Module\Ui\Queries; @@ -33,8 +33,8 @@ trait TTab { /** - * @throws ApplicationExceptions\InvalidState * @throws JsonApiExceptions\JsonApi + * @throws ToolsExceptions\InvalidState */ protected function findTab( string $id, diff --git a/src/Controllers/Finders/TWidget.php b/src/Controllers/Finders/TWidget.php index 9dd6155..ead0d2c 100644 --- a/src/Controllers/Finders/TWidget.php +++ b/src/Controllers/Finders/TWidget.php @@ -15,8 +15,8 @@ namespace FastyBird\Module\Ui\Controllers\Finders; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Models; use FastyBird\Module\Ui\Queries; @@ -33,8 +33,8 @@ trait TWidget { /** - * @throws ApplicationExceptions\InvalidState * @throws JsonApiExceptions\JsonApi + * @throws ToolsExceptions\InvalidState */ protected function findWidget(string $id): Entities\Widgets\Widget { diff --git a/src/Controllers/GroupsV1.php b/src/Controllers/GroupsV1.php index 66527df..a861d91 100644 --- a/src/Controllers/GroupsV1.php +++ b/src/Controllers/GroupsV1.php @@ -17,9 +17,10 @@ use Doctrine; use Exception; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui\Controllers; use FastyBird\Module\Ui\Exceptions; @@ -182,7 +183,7 @@ public function create( [ 'source' => MetadataTypes\Sources\Module::DEVICES->value, 'type' => 'groups-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -253,7 +254,7 @@ public function update( [ 'source' => MetadataTypes\Sources\Module::DEVICES->value, 'type' => 'groups-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -292,6 +293,7 @@ public function update( * @throws InvalidArgumentException * @throws JsonApiExceptions\JsonApi * @throws JsonApiExceptions\JsonApiError + * @throws ToolsExceptions\InvalidState * * @Secured\Role(manager,administrator) */ @@ -319,7 +321,7 @@ public function delete( [ 'source' => MetadataTypes\Sources\Module::DEVICES->value, 'type' => 'groups-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); diff --git a/src/Controllers/TabsV1.php b/src/Controllers/TabsV1.php index 321857c..cc92994 100644 --- a/src/Controllers/TabsV1.php +++ b/src/Controllers/TabsV1.php @@ -17,9 +17,10 @@ use Doctrine; use Exception; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui\Controllers; use FastyBird\Module\Ui\Exceptions; @@ -202,7 +203,7 @@ public function create( [ 'source' => MetadataTypes\Sources\Module::UI->value, 'type' => 'tabs-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -276,7 +277,7 @@ public function update( [ 'source' => MetadataTypes\Sources\Module::UI->value, 'type' => 'tabs-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -315,6 +316,7 @@ public function update( * @throws InvalidArgumentException * @throws JsonApiExceptions\JsonApi * @throws JsonApiExceptions\JsonApiError + * @throws ToolsExceptions\InvalidState * * @Secured\Role(manager,administrator) */ @@ -345,7 +347,7 @@ public function delete( [ 'source' => MetadataTypes\Sources\Module::UI->value, 'type' => 'tabs-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); diff --git a/src/Controllers/WidgetsV1.php b/src/Controllers/WidgetsV1.php index 478ff85..e9b0e62 100644 --- a/src/Controllers/WidgetsV1.php +++ b/src/Controllers/WidgetsV1.php @@ -17,9 +17,10 @@ use Doctrine; use Exception; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui\Controllers; use FastyBird\Module\Ui\Exceptions; @@ -184,7 +185,7 @@ public function create( [ 'source' => MetadataTypes\Sources\Module::UI->value, 'type' => 'widgets-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -279,7 +280,7 @@ public function update( [ 'source' => MetadataTypes\Sources\Module::UI->value, 'type' => 'widgets-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); @@ -318,6 +319,7 @@ public function update( * @throws InvalidArgumentException * @throws JsonApiExceptions\JsonApi * @throws JsonApiExceptions\JsonApiError + * @throws ToolsExceptions\InvalidState * * @Secured\Role(manager,administrator) */ @@ -352,7 +354,7 @@ public function delete( [ 'source' => MetadataTypes\Sources\Module::UI->value, 'type' => 'widgets-controller', - 'exception' => ApplicationHelpers\Logger::buildException($ex), + 'exception' => ToolsHelpers\Logger::buildException($ex), ], ); diff --git a/src/DI/UiExtension.php b/src/DI/UiExtension.php index 1ef4b9c..d6b4175 100644 --- a/src/DI/UiExtension.php +++ b/src/DI/UiExtension.php @@ -17,11 +17,11 @@ use Contributte\Translation; use Doctrine\Persistence; -use FastyBird\Library\Application\Boot as ApplicationBoot; -use FastyBird\Library\Exchange\Consumers as ExchangeConsumers; -use FastyBird\Library\Exchange\DI as ExchangeDI; -use FastyBird\Library\Metadata; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; +use FastyBird\Core\Application\Boot as ApplicationBoot; +use FastyBird\Core\Application\DI as ApplicationDI; +use FastyBird\Core\Application\Documents as ApplicationDocuments; +use FastyBird\Core\Exchange\Consumers as ExchangeConsumers; +use FastyBird\Core\Exchange\DI as ExchangeDI; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use FastyBird\Module\Ui\Caching; @@ -505,7 +505,7 @@ public function beforeCompile(): void * APPLICATION DOCUMENTS */ - $services = $builder->findByTag(Metadata\DI\MetadataExtension::DRIVER_TAG); + $services = $builder->findByTag(ApplicationDI\ApplicationExtension::DRIVER_TAG); if ($services !== []) { $services = array_keys($services); @@ -520,7 +520,7 @@ public function beforeCompile(): void ); $documentAttributeDriverChainService = $builder->getDefinitionByType( - MetadataDocuments\Mapping\Driver\MappingDriverChain::class, + ApplicationDocuments\Mapping\Driver\MappingDriverChain::class, ); if ($documentAttributeDriverChainService instanceof DI\Definitions\ServiceDefinition) { diff --git a/src/Documents/Dashboards/Dashboard.php b/src/Documents/Dashboards/Dashboard.php index cd81f97..3881f5d 100644 --- a/src/Documents/Dashboards/Dashboard.php +++ b/src/Documents/Dashboards/Dashboard.php @@ -16,10 +16,9 @@ namespace FastyBird\Module\Ui\Documents\Dashboards; use DateTimeInterface; -use FastyBird\Library\Application\ObjectMapper as ApplicationObjectMapper; -use FastyBird\Library\Exchange\Documents\Mapping as EXCHANGE; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; +use FastyBird\Core\Application\ObjectMapper as ApplicationObjectMapper; +use FastyBird\Core\Exchange\Documents as ExchangeDocuments; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use FastyBird\Module\Ui\Documents; @@ -36,19 +35,19 @@ * * @author Adam Kadlec */ -#[DOC\Document(entity: Entities\Dashboards\Dashboard::class)] -#[EXCHANGE\RoutingMap([ +#[ApplicationDocuments\Mapping\Document(entity: Entities\Dashboards\Dashboard::class)] +#[ExchangeDocuments\Mapping\RoutingMap([ Ui\Constants::MESSAGE_BUS_DASHBOARD_DOCUMENT_REPORTED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_DASHBOARD_DOCUMENT_CREATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_DASHBOARD_DOCUMENT_UPDATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_DASHBOARD_DOCUMENT_DELETED_ROUTING_KEY, ])] -final class Dashboard implements Documents\Document, MetadataDocuments\Owner, MetadataDocuments\CreatedAt, MetadataDocuments\UpdatedAt +final class Dashboard implements Documents\Document, ApplicationDocuments\Owner, ApplicationDocuments\CreatedAt, ApplicationDocuments\UpdatedAt { - use MetadataDocuments\TOwner; - use MetadataDocuments\TCreatedAt; - use MetadataDocuments\TUpdatedAt; + use ApplicationDocuments\TOwner; + use ApplicationDocuments\TCreatedAt; + use ApplicationDocuments\TUpdatedAt; /** * @param array $tabs diff --git a/src/Documents/Dashboards/Tabs/Tab.php b/src/Documents/Dashboards/Tabs/Tab.php index 41faf8b..f6451e1 100644 --- a/src/Documents/Dashboards/Tabs/Tab.php +++ b/src/Documents/Dashboards/Tabs/Tab.php @@ -16,10 +16,9 @@ namespace FastyBird\Module\Ui\Documents\Dashboards\Tabs; use DateTimeInterface; -use FastyBird\Library\Application\ObjectMapper as ApplicationObjectMapper; -use FastyBird\Library\Exchange\Documents\Mapping as EXCHANGE; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; +use FastyBird\Core\Application\ObjectMapper as ApplicationObjectMapper; +use FastyBird\Core\Exchange\Documents as ExchangeDocuments; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use FastyBird\Module\Ui\Documents; @@ -36,19 +35,19 @@ * * @author Adam Kadlec */ -#[DOC\Document(entity: Entities\Dashboards\Tabs\Tab::class)] -#[EXCHANGE\RoutingMap([ +#[ApplicationDocuments\Mapping\Document(entity: Entities\Dashboards\Tabs\Tab::class)] +#[ExchangeDocuments\Mapping\RoutingMap([ Ui\Constants::MESSAGE_BUS_DASHBOARD_TAB_DOCUMENT_REPORTED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_DASHBOARD_TAB_DOCUMENT_CREATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_DASHBOARD_TAB_DOCUMENT_UPDATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_DASHBOARD_TAB_DOCUMENT_DELETED_ROUTING_KEY, ])] -final class Tab implements Documents\Document, MetadataDocuments\Owner, MetadataDocuments\CreatedAt, MetadataDocuments\UpdatedAt +final class Tab implements Documents\Document, ApplicationDocuments\Owner, ApplicationDocuments\CreatedAt, ApplicationDocuments\UpdatedAt { - use MetadataDocuments\TOwner; - use MetadataDocuments\TCreatedAt; - use MetadataDocuments\TUpdatedAt; + use ApplicationDocuments\TOwner; + use ApplicationDocuments\TCreatedAt; + use ApplicationDocuments\TUpdatedAt; /** * @param array $widgets diff --git a/src/Documents/Document.php b/src/Documents/Document.php index 855c973..4e9956e 100644 --- a/src/Documents/Document.php +++ b/src/Documents/Document.php @@ -15,7 +15,7 @@ namespace FastyBird\Module\Ui\Documents; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Library\Metadata\Types as MetadataTypes; use Ramsey\Uuid; @@ -27,7 +27,7 @@ * * @author Adam Kadlec */ -interface Document extends MetadataDocuments\Document +interface Document extends ApplicationDocuments\Document { public function getId(): Uuid\UuidInterface; diff --git a/src/Documents/Groups/Group.php b/src/Documents/Groups/Group.php index db20658..5b3320c 100644 --- a/src/Documents/Groups/Group.php +++ b/src/Documents/Groups/Group.php @@ -16,10 +16,9 @@ namespace FastyBird\Module\Ui\Documents\Groups; use DateTimeInterface; -use FastyBird\Library\Application\ObjectMapper as ApplicationObjectMapper; -use FastyBird\Library\Exchange\Documents\Mapping as EXCHANGE; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; +use FastyBird\Core\Application\ObjectMapper as ApplicationObjectMapper; +use FastyBird\Core\Exchange\Documents as ExchangeDocuments; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use FastyBird\Module\Ui\Documents; @@ -36,19 +35,19 @@ * * @author Adam Kadlec */ -#[DOC\Document(entity: Entities\Groups\Group::class)] -#[EXCHANGE\RoutingMap([ +#[ApplicationDocuments\Mapping\Document(entity: Entities\Groups\Group::class)] +#[ExchangeDocuments\Mapping\RoutingMap([ Ui\Constants::MESSAGE_BUS_GROUP_DOCUMENT_REPORTED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_GROUP_DOCUMENT_CREATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_GROUP_DOCUMENT_UPDATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_GROUP_DOCUMENT_DELETED_ROUTING_KEY, ])] -final class Group implements Documents\Document, MetadataDocuments\Owner, MetadataDocuments\CreatedAt, MetadataDocuments\UpdatedAt +final class Group implements Documents\Document, ApplicationDocuments\Owner, ApplicationDocuments\CreatedAt, ApplicationDocuments\UpdatedAt { - use MetadataDocuments\TOwner; - use MetadataDocuments\TCreatedAt; - use MetadataDocuments\TUpdatedAt; + use ApplicationDocuments\TOwner; + use ApplicationDocuments\TCreatedAt; + use ApplicationDocuments\TUpdatedAt; /** * @param array $widgets diff --git a/src/Documents/Widgets/AnalogActuator.php b/src/Documents/Widgets/AnalogActuator.php index 8863073..5dd9cd2 100644 --- a/src/Documents/Widgets/AnalogActuator.php +++ b/src/Documents/Widgets/AnalogActuator.php @@ -15,12 +15,12 @@ namespace FastyBird\Module\Ui\Documents\Widgets; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; -#[DOC\Document(entity: Entities\Widgets\AnalogActuator::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\AnalogActuator::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\AnalogActuator::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\AnalogActuator::TYPE)] class AnalogActuator extends Documents\Widgets\Widget { diff --git a/src/Documents/Widgets/AnalogSensor.php b/src/Documents/Widgets/AnalogSensor.php index 29b5ae5..3a33e4f 100644 --- a/src/Documents/Widgets/AnalogSensor.php +++ b/src/Documents/Widgets/AnalogSensor.php @@ -15,12 +15,12 @@ namespace FastyBird\Module\Ui\Documents\Widgets; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; -#[DOC\Document(entity: Entities\Widgets\AnalogSensor::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\AnalogSensor::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\AnalogSensor::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\AnalogSensor::TYPE)] class AnalogSensor extends Documents\Widgets\Widget { diff --git a/src/Documents/Widgets/DataSources/Actions/Action.php b/src/Documents/Widgets/DataSources/Actions/Action.php index c2d00f4..ad2a0be 100644 --- a/src/Documents/Widgets/DataSources/Actions/Action.php +++ b/src/Documents/Widgets/DataSources/Actions/Action.php @@ -15,9 +15,9 @@ namespace FastyBird\Module\Ui\Documents\Widgets\DataSources\Actions; -use FastyBird\Library\Application\ObjectMapper as ApplicationObjectMapper; -use FastyBird\Library\Exchange\Documents\Mapping as EXCHANGE; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; +use FastyBird\Core\Application\ObjectMapper as ApplicationObjectMapper; +use FastyBird\Core\Exchange\Documents as ExchangeDocuments; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use FastyBird\Module\Ui\Documents; @@ -33,8 +33,8 @@ * * @author Adam Kadlec */ -#[DOC\Document] -#[EXCHANGE\RoutingMap([ +#[ApplicationDocuments\Mapping\Document] +#[ExchangeDocuments\Mapping\RoutingMap([ Ui\Constants::MESSAGE_BUS_WIDGET_DATA_SOURCE_ACTION_ROUTING_KEY, ])] final readonly class Action implements Documents\Document diff --git a/src/Documents/Widgets/DataSources/DataSource.php b/src/Documents/Widgets/DataSources/DataSource.php index 5409ba4..3de5832 100644 --- a/src/Documents/Widgets/DataSources/DataSource.php +++ b/src/Documents/Widgets/DataSources/DataSource.php @@ -16,10 +16,9 @@ namespace FastyBird\Module\Ui\Documents\Widgets\DataSources; use DateTimeInterface; -use FastyBird\Library\Application\ObjectMapper as ApplicationObjectMapper; -use FastyBird\Library\Exchange\Documents\Mapping as EXCHANGE; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; +use FastyBird\Core\Application\ObjectMapper as ApplicationObjectMapper; +use FastyBird\Core\Exchange\Documents as ExchangeDocuments; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use FastyBird\Module\Ui\Documents; @@ -35,22 +34,22 @@ * * @author Adam Kadlec */ -#[DOC\Document(entity: Entities\Widgets\DataSources\DataSource::class)] -#[DOC\InheritanceType('JOINED_TABLE')] -#[DOC\DiscriminatorColumn(name: 'type', type: 'string')] -#[DOC\MappedSuperclass] -#[EXCHANGE\RoutingMap([ +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\DataSources\DataSource::class)] +#[ApplicationDocuments\Mapping\InheritanceType('JOINED_TABLE')] +#[ApplicationDocuments\Mapping\DiscriminatorColumn(name: 'type', type: 'string')] +#[ApplicationDocuments\Mapping\MappedSuperclass] +#[ExchangeDocuments\Mapping\RoutingMap([ Ui\Constants::MESSAGE_BUS_WIDGET_DATA_SOURCE_DOCUMENT_REPORTED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_WIDGET_DATA_SOURCE_DOCUMENT_CREATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_WIDGET_DATA_SOURCE_DOCUMENT_UPDATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_WIDGET_DATA_SOURCE_DOCUMENT_DELETED_ROUTING_KEY, ])] -abstract class DataSource implements Documents\Document, MetadataDocuments\Owner, MetadataDocuments\CreatedAt, MetadataDocuments\UpdatedAt +abstract class DataSource implements Documents\Document, ApplicationDocuments\Owner, ApplicationDocuments\CreatedAt, ApplicationDocuments\UpdatedAt { - use MetadataDocuments\TOwner; - use MetadataDocuments\TCreatedAt; - use MetadataDocuments\TUpdatedAt; + use ApplicationDocuments\TOwner; + use ApplicationDocuments\TCreatedAt; + use ApplicationDocuments\TUpdatedAt; public function __construct( #[ApplicationObjectMapper\Rules\UuidValue()] diff --git a/src/Documents/Widgets/DataSources/Generic.php b/src/Documents/Widgets/DataSources/Generic.php index 0fa6557..8dc7da5 100644 --- a/src/Documents/Widgets/DataSources/Generic.php +++ b/src/Documents/Widgets/DataSources/Generic.php @@ -15,12 +15,12 @@ namespace FastyBird\Module\Ui\Documents\Widgets\DataSources; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; -#[DOC\Document(entity: Entities\Widgets\DataSources\Generic::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\DataSources\Generic::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\DataSources\Generic::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\DataSources\Generic::TYPE)] class Generic extends Documents\Widgets\DataSources\DataSource { diff --git a/src/Documents/Widgets/DigitalActuator.php b/src/Documents/Widgets/DigitalActuator.php index 9c2f53f..f801563 100644 --- a/src/Documents/Widgets/DigitalActuator.php +++ b/src/Documents/Widgets/DigitalActuator.php @@ -15,12 +15,12 @@ namespace FastyBird\Module\Ui\Documents\Widgets; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; -#[DOC\Document(entity: Entities\Widgets\DigitalActuator::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\DigitalActuator::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\DigitalActuator::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\DigitalActuator::TYPE)] class DigitalActuator extends Documents\Widgets\Widget { diff --git a/src/Documents/Widgets/DigitalSensor.php b/src/Documents/Widgets/DigitalSensor.php index 70b895f..8a9a997 100644 --- a/src/Documents/Widgets/DigitalSensor.php +++ b/src/Documents/Widgets/DigitalSensor.php @@ -15,12 +15,12 @@ namespace FastyBird\Module\Ui\Documents\Widgets; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; -#[DOC\Document(entity: Entities\Widgets\DigitalSensor::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\DigitalSensor::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\DigitalSensor::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\DigitalSensor::TYPE)] class DigitalSensor extends Documents\Widgets\Widget { diff --git a/src/Documents/Widgets/Displays/AnalogValue.php b/src/Documents/Widgets/Displays/AnalogValue.php index 7e24ce6..feaaa2d 100644 --- a/src/Documents/Widgets/Displays/AnalogValue.php +++ b/src/Documents/Widgets/Displays/AnalogValue.php @@ -16,15 +16,15 @@ namespace FastyBird\Module\Ui\Documents\Widgets\Displays; use DateTimeInterface; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; use Orisai\ObjectMapper; use Ramsey\Uuid; use function array_merge; -#[DOC\Document(entity: Entities\Widgets\Displays\AnalogValue::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\Displays\AnalogValue::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\Displays\AnalogValue::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\Displays\AnalogValue::TYPE)] class AnalogValue extends Documents\Widgets\Displays\Display { diff --git a/src/Documents/Widgets/Displays/Button.php b/src/Documents/Widgets/Displays/Button.php index 46d14c4..9dc24fa 100644 --- a/src/Documents/Widgets/Displays/Button.php +++ b/src/Documents/Widgets/Displays/Button.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Documents\Widgets\Displays; use DateTimeInterface; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Types; @@ -24,8 +24,8 @@ use Ramsey\Uuid; use function array_merge; -#[DOC\Document(entity: Entities\Widgets\Displays\Button::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\Displays\Button::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\Displays\Button::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\Displays\Button::TYPE)] class Button extends Documents\Widgets\Displays\Display { diff --git a/src/Documents/Widgets/Displays/ChartGraph.php b/src/Documents/Widgets/Displays/ChartGraph.php index 04fb94a..3225dd2 100644 --- a/src/Documents/Widgets/Displays/ChartGraph.php +++ b/src/Documents/Widgets/Displays/ChartGraph.php @@ -16,15 +16,15 @@ namespace FastyBird\Module\Ui\Documents\Widgets\Displays; use DateTimeInterface; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; use Orisai\ObjectMapper; use Ramsey\Uuid; use function array_merge; -#[DOC\Document(entity: Entities\Widgets\Displays\ChartGraph::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\Displays\ChartGraph::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\Displays\ChartGraph::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\Displays\ChartGraph::TYPE)] class ChartGraph extends Documents\Widgets\Displays\Display { diff --git a/src/Documents/Widgets/Displays/DigitalValue.php b/src/Documents/Widgets/Displays/DigitalValue.php index 2c4fc8d..0088900 100644 --- a/src/Documents/Widgets/Displays/DigitalValue.php +++ b/src/Documents/Widgets/Displays/DigitalValue.php @@ -15,12 +15,12 @@ namespace FastyBird\Module\Ui\Documents\Widgets\Displays; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; -#[DOC\Document(entity: Entities\Widgets\Displays\DigitalValue::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\Displays\DigitalValue::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\Displays\DigitalValue::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\Displays\DigitalValue::TYPE)] class DigitalValue extends Documents\Widgets\Displays\Display { diff --git a/src/Documents/Widgets/Displays/Display.php b/src/Documents/Widgets/Displays/Display.php index 5445ffb..796fdbc 100644 --- a/src/Documents/Widgets/Displays/Display.php +++ b/src/Documents/Widgets/Displays/Display.php @@ -16,10 +16,9 @@ namespace FastyBird\Module\Ui\Documents\Widgets\Displays; use DateTimeInterface; -use FastyBird\Library\Application\ObjectMapper as ApplicationObjectMapper; -use FastyBird\Library\Exchange\Documents\Mapping as EXCHANGE; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; +use FastyBird\Core\Application\ObjectMapper as ApplicationObjectMapper; +use FastyBird\Core\Exchange\Documents as ExchangeDocuments; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use FastyBird\Module\Ui\Documents; @@ -35,22 +34,22 @@ * * @author Adam Kadlec */ -#[DOC\Document(entity: Entities\Widgets\Displays\Display::class)] -#[DOC\InheritanceType('SINGLE_TABLE')] -#[DOC\DiscriminatorColumn(name: 'type', type: 'string')] -#[DOC\MappedSuperclass] -#[EXCHANGE\RoutingMap([ +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\Displays\Display::class)] +#[ApplicationDocuments\Mapping\InheritanceType('SINGLE_TABLE')] +#[ApplicationDocuments\Mapping\DiscriminatorColumn(name: 'type', type: 'string')] +#[ApplicationDocuments\Mapping\MappedSuperclass] +#[ExchangeDocuments\Mapping\RoutingMap([ Ui\Constants::MESSAGE_BUS_WIDGET_DISPLAY_DOCUMENT_REPORTED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_WIDGET_DISPLAY_DOCUMENT_CREATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_WIDGET_DISPLAY_DOCUMENT_UPDATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_WIDGET_DISPLAY_DOCUMENT_DELETED_ROUTING_KEY, ])] -abstract class Display implements Documents\Document, MetadataDocuments\Owner, MetadataDocuments\CreatedAt, MetadataDocuments\UpdatedAt +abstract class Display implements Documents\Document, ApplicationDocuments\Owner, ApplicationDocuments\CreatedAt, ApplicationDocuments\UpdatedAt { - use MetadataDocuments\TOwner; - use MetadataDocuments\TCreatedAt; - use MetadataDocuments\TUpdatedAt; + use ApplicationDocuments\TOwner; + use ApplicationDocuments\TCreatedAt; + use ApplicationDocuments\TUpdatedAt; public function __construct( #[ApplicationObjectMapper\Rules\UuidValue()] diff --git a/src/Documents/Widgets/Displays/Gauge.php b/src/Documents/Widgets/Displays/Gauge.php index 189a8ec..ece2125 100644 --- a/src/Documents/Widgets/Displays/Gauge.php +++ b/src/Documents/Widgets/Displays/Gauge.php @@ -16,15 +16,15 @@ namespace FastyBird\Module\Ui\Documents\Widgets\Displays; use DateTimeInterface; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; use Orisai\ObjectMapper; use Ramsey\Uuid; use function array_merge; -#[DOC\Document(entity: Entities\Widgets\Displays\Gauge::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\Displays\Gauge::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\Displays\Gauge::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\Displays\Gauge::TYPE)] class Gauge extends Documents\Widgets\Displays\Display { diff --git a/src/Documents/Widgets/Displays/GroupedButton.php b/src/Documents/Widgets/Displays/GroupedButton.php index 9b35b57..a466902 100644 --- a/src/Documents/Widgets/Displays/GroupedButton.php +++ b/src/Documents/Widgets/Displays/GroupedButton.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Documents\Widgets\Displays; use DateTimeInterface; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Types; @@ -24,8 +24,8 @@ use Ramsey\Uuid; use function array_merge; -#[DOC\Document(entity: Entities\Widgets\Displays\GroupedButton::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\Displays\GroupedButton::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\Displays\GroupedButton::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\Displays\GroupedButton::TYPE)] class GroupedButton extends Documents\Widgets\Displays\Display { diff --git a/src/Documents/Widgets/Displays/Slider.php b/src/Documents/Widgets/Displays/Slider.php index 3538260..fd7b1b6 100644 --- a/src/Documents/Widgets/Displays/Slider.php +++ b/src/Documents/Widgets/Displays/Slider.php @@ -16,15 +16,15 @@ namespace FastyBird\Module\Ui\Documents\Widgets\Displays; use DateTimeInterface; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Entities; use Orisai\ObjectMapper; use Ramsey\Uuid; use function array_merge; -#[DOC\Document(entity: Entities\Widgets\Displays\Slider::class)] -#[DOC\DiscriminatorEntry(name: Entities\Widgets\Displays\Slider::TYPE)] +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\Displays\Slider::class)] +#[ApplicationDocuments\Mapping\DiscriminatorEntry(name: Entities\Widgets\Displays\Slider::TYPE)] class Slider extends Documents\Widgets\Displays\Display { diff --git a/src/Documents/Widgets/Widget.php b/src/Documents/Widgets/Widget.php index 73e5b6b..0a43e16 100644 --- a/src/Documents/Widgets/Widget.php +++ b/src/Documents/Widgets/Widget.php @@ -16,10 +16,9 @@ namespace FastyBird\Module\Ui\Documents\Widgets; use DateTimeInterface; -use FastyBird\Library\Application\ObjectMapper as ApplicationObjectMapper; -use FastyBird\Library\Exchange\Documents\Mapping as EXCHANGE; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; -use FastyBird\Library\Metadata\Documents\Mapping as DOC; +use FastyBird\Core\Application\Documents as ApplicationDocuments; +use FastyBird\Core\Application\ObjectMapper as ApplicationObjectMapper; +use FastyBird\Core\Exchange\Documents as ExchangeDocuments; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use FastyBird\Module\Ui\Documents; @@ -36,22 +35,22 @@ * * @author Adam Kadlec */ -#[DOC\Document(entity: Entities\Widgets\Widget::class)] -#[DOC\InheritanceType('SINGLE_TABLE')] -#[DOC\DiscriminatorColumn(name: 'type', type: 'string')] -#[DOC\MappedSuperclass] -#[EXCHANGE\RoutingMap([ +#[ApplicationDocuments\Mapping\Document(entity: Entities\Widgets\Widget::class)] +#[ApplicationDocuments\Mapping\InheritanceType('SINGLE_TABLE')] +#[ApplicationDocuments\Mapping\DiscriminatorColumn(name: 'type', type: 'string')] +#[ApplicationDocuments\Mapping\MappedSuperclass] +#[ExchangeDocuments\Mapping\RoutingMap([ Ui\Constants::MESSAGE_BUS_WIDGET_DOCUMENT_REPORTED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_WIDGET_DOCUMENT_CREATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_WIDGET_DOCUMENT_UPDATED_ROUTING_KEY, Ui\Constants::MESSAGE_BUS_WIDGET_DOCUMENT_DELETED_ROUTING_KEY, ])] -abstract class Widget implements Documents\Document, MetadataDocuments\Owner, MetadataDocuments\CreatedAt, MetadataDocuments\UpdatedAt +abstract class Widget implements Documents\Document, ApplicationDocuments\Owner, ApplicationDocuments\CreatedAt, ApplicationDocuments\UpdatedAt { - use MetadataDocuments\TOwner; - use MetadataDocuments\TCreatedAt; - use MetadataDocuments\TUpdatedAt; + use ApplicationDocuments\TOwner; + use ApplicationDocuments\TCreatedAt; + use ApplicationDocuments\TUpdatedAt; /** * @param array $dataSources diff --git a/src/Entities/Widgets/AnalogActuator.php b/src/Entities/Widgets/AnalogActuator.php index 7842d4c..6a3949d 100644 --- a/src/Entities/Widgets/AnalogActuator.php +++ b/src/Entities/Widgets/AnalogActuator.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; use FastyBird\Module\Ui\Entities; #[ORM\Entity] diff --git a/src/Entities/Widgets/AnalogSensor.php b/src/Entities/Widgets/AnalogSensor.php index ba34052..a7d366a 100644 --- a/src/Entities/Widgets/AnalogSensor.php +++ b/src/Entities/Widgets/AnalogSensor.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; use FastyBird\Module\Ui\Entities; #[ORM\Entity] diff --git a/src/Entities/Widgets/DataSources/Generic.php b/src/Entities/Widgets/DataSources/Generic.php index 03c5202..453c3cf 100644 --- a/src/Entities/Widgets/DataSources/Generic.php +++ b/src/Entities/Widgets/DataSources/Generic.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets\DataSources; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui\Schemas; use IPub\DoctrineCrud; diff --git a/src/Entities/Widgets/DigitalActuator.php b/src/Entities/Widgets/DigitalActuator.php index 8c2eefa..65952e9 100644 --- a/src/Entities/Widgets/DigitalActuator.php +++ b/src/Entities/Widgets/DigitalActuator.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; use FastyBird\Module\Ui\Entities; #[ORM\Entity] diff --git a/src/Entities/Widgets/DigitalSensor.php b/src/Entities/Widgets/DigitalSensor.php index c07ff94..ea279ed 100644 --- a/src/Entities/Widgets/DigitalSensor.php +++ b/src/Entities/Widgets/DigitalSensor.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; use FastyBird\Module\Ui\Entities; #[ORM\Entity] diff --git a/src/Entities/Widgets/Displays/AnalogValue.php b/src/Entities/Widgets/Displays/AnalogValue.php index 1379223..e3b81e3 100644 --- a/src/Entities/Widgets/Displays/AnalogValue.php +++ b/src/Entities/Widgets/Displays/AnalogValue.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets\Displays; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; use FastyBird\Module\Ui\Entities; use function array_merge; diff --git a/src/Entities/Widgets/Displays/Button.php b/src/Entities/Widgets/Displays/Button.php index 46ce08c..b450c9f 100644 --- a/src/Entities/Widgets/Displays/Button.php +++ b/src/Entities/Widgets/Displays/Button.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets\Displays; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; use FastyBird\Module\Ui\Entities; use function array_merge; diff --git a/src/Entities/Widgets/Displays/ChartGraph.php b/src/Entities/Widgets/Displays/ChartGraph.php index 0ea6597..6fcf9d9 100644 --- a/src/Entities/Widgets/Displays/ChartGraph.php +++ b/src/Entities/Widgets/Displays/ChartGraph.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets\Displays; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; use FastyBird\Module\Ui\Entities; use IPub\DoctrineCrud\Mapping\Attribute as IPubDoctrine; use function array_merge; diff --git a/src/Entities/Widgets/Displays/DigitalValue.php b/src/Entities/Widgets/Displays/DigitalValue.php index ff21dd3..2f76328 100644 --- a/src/Entities/Widgets/Displays/DigitalValue.php +++ b/src/Entities/Widgets/Displays/DigitalValue.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets\Displays; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; #[ORM\Entity] #[ApplicationMapping\DiscriminatorEntry(name: self::TYPE)] diff --git a/src/Entities/Widgets/Displays/Gauge.php b/src/Entities/Widgets/Displays/Gauge.php index a3d62d9..b0eb5ee 100644 --- a/src/Entities/Widgets/Displays/Gauge.php +++ b/src/Entities/Widgets/Displays/Gauge.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets\Displays; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; use FastyBird\Module\Ui\Entities; use function array_merge; diff --git a/src/Entities/Widgets/Displays/GroupedButton.php b/src/Entities/Widgets/Displays/GroupedButton.php index d4efe6f..c0bbda9 100644 --- a/src/Entities/Widgets/Displays/GroupedButton.php +++ b/src/Entities/Widgets/Displays/GroupedButton.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets\Displays; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; use FastyBird\Module\Ui\Entities; use function array_merge; diff --git a/src/Entities/Widgets/Displays/Slider.php b/src/Entities/Widgets/Displays/Slider.php index 358e4f5..4516e33 100644 --- a/src/Entities/Widgets/Displays/Slider.php +++ b/src/Entities/Widgets/Displays/Slider.php @@ -16,7 +16,7 @@ namespace FastyBird\Module\Ui\Entities\Widgets\Displays; use Doctrine\ORM\Mapping as ORM; -use FastyBird\Library\Application\Entities\Mapping as ApplicationMapping; +use FastyBird\Core\Application\Entities\Mapping as ApplicationMapping; use FastyBird\Module\Ui\Entities; use Ramsey\Uuid; use function array_merge; diff --git a/src/Hydrators/Widgets/Widget.php b/src/Hydrators/Widgets/Widget.php index 1ad0bb4..a686ba7 100644 --- a/src/Hydrators/Widgets/Widget.php +++ b/src/Hydrators/Widgets/Widget.php @@ -17,10 +17,10 @@ use Contributte\Translation; use Doctrine\Persistence; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; use FastyBird\JsonApi\Exceptions as JsonApiExceptions; use FastyBird\JsonApi\Hydrators as JsonApiHydrators; use FastyBird\JsonApi\JsonApi as JsonApiJsonApi; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Hydrators; use FastyBird\Module\Ui\Models; @@ -331,8 +331,8 @@ protected function hydrateDataSourcesRelationship( /** * @return array|null * - * @throws ApplicationExceptions\InvalidState * @throws JsonApiExceptions\JsonApiError + * @throws ToolsExceptions\InvalidState */ protected function hydrateTabsRelationship( JsonAPIDocument\Objects\IRelationshipObject $relationship, @@ -375,8 +375,8 @@ protected function hydrateTabsRelationship( /** * @return array|null * - * @throws ApplicationExceptions\InvalidState * @throws JsonApiExceptions\JsonApiError + * @throws ToolsExceptions\InvalidState */ protected function hydrateGroupsRelationship( JsonAPIDocument\Objects\IRelationshipObject $relationship, diff --git a/src/Models/Configuration/Builder.php b/src/Models/Configuration/Builder.php index 4d36b50..8f8b169 100644 --- a/src/Models/Configuration/Builder.php +++ b/src/Models/Configuration/Builder.php @@ -15,7 +15,7 @@ namespace FastyBird\Module\Ui\Models\Configuration; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; use FastyBird\Module\Ui\Caching; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Models; @@ -76,7 +76,7 @@ public function load(Types\ConfigurationType $type, bool $force = false): JSONPa /** * @return array * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ private function build(Types\ConfigurationType $type): array { diff --git a/src/Models/Configuration/Dashboards/Repository.php b/src/Models/Configuration/Dashboards/Repository.php index 3213b05..f1ad81f 100644 --- a/src/Models/Configuration/Dashboards/Repository.php +++ b/src/Models/Configuration/Dashboards/Repository.php @@ -15,7 +15,7 @@ namespace FastyBird\Module\Ui\Models\Configuration\Dashboards; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Caching; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Exceptions; @@ -43,7 +43,7 @@ final class Repository extends Models\Configuration\Repository public function __construct( private readonly Caching\Container $moduleCaching, private readonly Models\Configuration\Builder $builder, - private readonly MetadataDocuments\DocumentFactory $documentFactory, + private readonly ApplicationDocuments\DocumentFactory $documentFactory, ) { } diff --git a/src/Models/Configuration/Dashboards/Tabs/Repository.php b/src/Models/Configuration/Dashboards/Tabs/Repository.php index 97b3fc8..6185fd9 100644 --- a/src/Models/Configuration/Dashboards/Tabs/Repository.php +++ b/src/Models/Configuration/Dashboards/Tabs/Repository.php @@ -15,7 +15,7 @@ namespace FastyBird\Module\Ui\Models\Configuration\Dashboards\Tabs; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Caching; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Exceptions; @@ -42,7 +42,7 @@ final class Repository extends Models\Configuration\Repository public function __construct( private readonly Caching\Container $moduleCaching, private readonly Models\Configuration\Builder $builder, - private readonly MetadataDocuments\DocumentFactory $documentFactory, + private readonly ApplicationDocuments\DocumentFactory $documentFactory, ) { } diff --git a/src/Models/Configuration/Groups/Repository.php b/src/Models/Configuration/Groups/Repository.php index 3cf233d..f1ab52b 100644 --- a/src/Models/Configuration/Groups/Repository.php +++ b/src/Models/Configuration/Groups/Repository.php @@ -15,7 +15,7 @@ namespace FastyBird\Module\Ui\Models\Configuration\Groups; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Caching; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Exceptions; @@ -43,7 +43,7 @@ final class Repository extends Models\Configuration\Repository public function __construct( private readonly Caching\Container $moduleCaching, private readonly Models\Configuration\Builder $builder, - private readonly MetadataDocuments\DocumentFactory $documentFactory, + private readonly ApplicationDocuments\DocumentFactory $documentFactory, ) { } diff --git a/src/Models/Configuration/Repository.php b/src/Models/Configuration/Repository.php index c7d0caa..d0609d2 100644 --- a/src/Models/Configuration/Repository.php +++ b/src/Models/Configuration/Repository.php @@ -15,7 +15,7 @@ namespace FastyBird\Module\Ui\Models\Configuration; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Models; use FastyBird\Module\Ui\Queries; @@ -31,7 +31,7 @@ abstract class Repository { /** - * @template T of MetadataDocuments\Document + * @template T of ApplicationDocuments\Document * * @param Queries\Configuration\QueryObject $queryObject */ @@ -41,7 +41,7 @@ protected function createKeyOne(Queries\Configuration\QueryObject $queryObject): } /** - * @template T of MetadataDocuments\Document + * @template T of ApplicationDocuments\Document * * @param Queries\Configuration\QueryObject $queryObject */ diff --git a/src/Models/Configuration/Widgets/DataSources/Repository.php b/src/Models/Configuration/Widgets/DataSources/Repository.php index d31d1cc..f6a630e 100644 --- a/src/Models/Configuration/Widgets/DataSources/Repository.php +++ b/src/Models/Configuration/Widgets/DataSources/Repository.php @@ -15,7 +15,7 @@ namespace FastyBird\Module\Ui\Models\Configuration\Widgets\DataSources; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Caching; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Exceptions; @@ -44,8 +44,8 @@ final class Repository extends Models\Configuration\Repository public function __construct( private readonly Caching\Container $moduleCaching, private readonly Models\Configuration\Builder $builder, - private readonly MetadataDocuments\Mapping\ClassMetadataFactory $classMetadataFactory, - private readonly MetadataDocuments\DocumentFactory $documentFactory, + private readonly ApplicationDocuments\Mapping\ClassMetadataFactory $classMetadataFactory, + private readonly ApplicationDocuments\DocumentFactory $documentFactory, ) { } diff --git a/src/Models/Configuration/Widgets/Displays/Repository.php b/src/Models/Configuration/Widgets/Displays/Repository.php index c88eeee..96846be 100644 --- a/src/Models/Configuration/Widgets/Displays/Repository.php +++ b/src/Models/Configuration/Widgets/Displays/Repository.php @@ -15,7 +15,7 @@ namespace FastyBird\Module\Ui\Models\Configuration\Widgets\Displays; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Caching; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Exceptions; @@ -44,8 +44,8 @@ final class Repository extends Models\Configuration\Repository public function __construct( private readonly Caching\Container $moduleCaching, private readonly Models\Configuration\Builder $builder, - private readonly MetadataDocuments\Mapping\ClassMetadataFactory $classMetadataFactory, - private readonly MetadataDocuments\DocumentFactory $documentFactory, + private readonly ApplicationDocuments\Mapping\ClassMetadataFactory $classMetadataFactory, + private readonly ApplicationDocuments\DocumentFactory $documentFactory, ) { } diff --git a/src/Models/Configuration/Widgets/Repository.php b/src/Models/Configuration/Widgets/Repository.php index a224cab..2f702c5 100644 --- a/src/Models/Configuration/Widgets/Repository.php +++ b/src/Models/Configuration/Widgets/Repository.php @@ -15,7 +15,7 @@ namespace FastyBird\Module\Ui\Models\Configuration\Widgets; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use FastyBird\Module\Ui\Caching; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Exceptions; @@ -45,8 +45,8 @@ final class Repository extends Models\Configuration\Repository public function __construct( private readonly Caching\Container $moduleCaching, private readonly Models\Configuration\Builder $builder, - private readonly MetadataDocuments\Mapping\ClassMetadataFactory $classMetadataFactory, - private readonly MetadataDocuments\DocumentFactory $documentFactory, + private readonly ApplicationDocuments\Mapping\ClassMetadataFactory $classMetadataFactory, + private readonly ApplicationDocuments\DocumentFactory $documentFactory, ) { } diff --git a/src/Models/Entities/Dashboards/Repository.php b/src/Models/Entities/Dashboards/Repository.php index bab371c..286e0ca 100644 --- a/src/Models/Entities/Dashboards/Repository.php +++ b/src/Models/Entities/Dashboards/Repository.php @@ -17,8 +17,8 @@ use Doctrine\ORM; use Doctrine\Persistence; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Queries; @@ -45,7 +45,7 @@ final class Repository private array $repository = []; public function __construct( - private readonly ApplicationHelpers\Database $database, + private readonly ToolsHelpers\Database $database, private readonly Persistence\ManagerRegistry $managerRegistry, ) { @@ -58,7 +58,7 @@ public function __construct( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function find( Uuid\UuidInterface $id, @@ -78,7 +78,7 @@ public function find( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findOneBy( Queries\Entities\FindDashboards $queryObject, @@ -97,7 +97,7 @@ public function findOneBy( * * @return array * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findAll(string $type = Entities\Dashboards\Dashboard::class): array { @@ -139,8 +139,8 @@ public function findAllBy( * * @return DoctrineOrmQuery\ResultSet * - * @throws ApplicationExceptions\InvalidState * @throws Exceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function getResultSet( Queries\Entities\FindDashboards $queryObject, diff --git a/src/Models/Entities/Dashboards/Tabs/Repository.php b/src/Models/Entities/Dashboards/Tabs/Repository.php index c764e6c..f62133d 100644 --- a/src/Models/Entities/Dashboards/Tabs/Repository.php +++ b/src/Models/Entities/Dashboards/Tabs/Repository.php @@ -17,8 +17,8 @@ use Doctrine\ORM; use Doctrine\Persistence; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Queries; @@ -45,7 +45,7 @@ final class Repository private array $repository = []; public function __construct( - private readonly ApplicationHelpers\Database $database, + private readonly ToolsHelpers\Database $database, private readonly Persistence\ManagerRegistry $managerRegistry, ) { @@ -58,7 +58,7 @@ public function __construct( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function find( Uuid\UuidInterface $id, @@ -78,7 +78,7 @@ public function find( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findOneBy( Queries\Entities\FindDashboardTabs $queryObject, @@ -97,7 +97,7 @@ public function findOneBy( * * @return array * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findAll(string $type = Entities\Dashboards\Tabs\Tab::class): array { @@ -139,8 +139,8 @@ public function findAllBy( * * @return DoctrineOrmQuery\ResultSet * - * @throws ApplicationExceptions\InvalidState * @throws Exceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function getResultSet( Queries\Entities\FindDashboardTabs $queryObject, diff --git a/src/Models/Entities/Groups/Repository.php b/src/Models/Entities/Groups/Repository.php index 703177b..1e59d65 100644 --- a/src/Models/Entities/Groups/Repository.php +++ b/src/Models/Entities/Groups/Repository.php @@ -17,8 +17,8 @@ use Doctrine\ORM; use Doctrine\Persistence; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Queries; @@ -45,7 +45,7 @@ final class Repository private array $repository = []; public function __construct( - private readonly ApplicationHelpers\Database $database, + private readonly ToolsHelpers\Database $database, private readonly Persistence\ManagerRegistry $managerRegistry, ) { @@ -58,7 +58,7 @@ public function __construct( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function find( Uuid\UuidInterface $id, @@ -78,7 +78,7 @@ public function find( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findOneBy( Queries\Entities\FindGroups $queryObject, @@ -97,7 +97,7 @@ public function findOneBy( * * @return array * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findAll(string $type = Entities\Groups\Group::class): array { @@ -139,8 +139,8 @@ public function findAllBy( * * @return DoctrineOrmQuery\ResultSet * - * @throws ApplicationExceptions\InvalidState * @throws Exceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function getResultSet( Queries\Entities\FindGroups $queryObject, diff --git a/src/Models/Entities/Widgets/DataSources/Repository.php b/src/Models/Entities/Widgets/DataSources/Repository.php index 4eea61d..722d372 100644 --- a/src/Models/Entities/Widgets/DataSources/Repository.php +++ b/src/Models/Entities/Widgets/DataSources/Repository.php @@ -17,8 +17,8 @@ use Doctrine\ORM; use Doctrine\Persistence; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Queries; @@ -45,7 +45,7 @@ final class Repository private array $repository = []; public function __construct( - private readonly ApplicationHelpers\Database $database, + private readonly ToolsHelpers\Database $database, private readonly Persistence\ManagerRegistry $managerRegistry, ) { @@ -58,7 +58,7 @@ public function __construct( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function find( Uuid\UuidInterface $id, @@ -78,7 +78,7 @@ public function find( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findOneBy( Queries\Entities\FindWidgetDataSources $queryObject, @@ -97,7 +97,7 @@ public function findOneBy( * * @return array * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findAll(string $type = Entities\Widgets\DataSources\DataSource::class): array { @@ -139,8 +139,8 @@ public function findAllBy( * * @return DoctrineOrmQuery\ResultSet * - * @throws ApplicationExceptions\InvalidState * @throws Exceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function getResultSet( Queries\Entities\FindWidgetDataSources $queryObject, diff --git a/src/Models/Entities/Widgets/Displays/Repository.php b/src/Models/Entities/Widgets/Displays/Repository.php index 9699098..d90e390 100644 --- a/src/Models/Entities/Widgets/Displays/Repository.php +++ b/src/Models/Entities/Widgets/Displays/Repository.php @@ -17,8 +17,8 @@ use Doctrine\ORM; use Doctrine\Persistence; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Queries; @@ -45,7 +45,7 @@ final class Repository private array $repository = []; public function __construct( - private readonly ApplicationHelpers\Database $database, + private readonly ToolsHelpers\Database $database, private readonly Persistence\ManagerRegistry $managerRegistry, ) { @@ -58,7 +58,7 @@ public function __construct( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function find( Uuid\UuidInterface $id, @@ -78,7 +78,7 @@ public function find( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findOneBy( Queries\Entities\FindWidgetDisplays $queryObject, @@ -97,7 +97,7 @@ public function findOneBy( * * @return array * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findAll(string $type = Entities\Widgets\Displays\Display::class): array { @@ -139,8 +139,8 @@ public function findAllBy( * * @return DoctrineOrmQuery\ResultSet * - * @throws ApplicationExceptions\InvalidState * @throws Exceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function getResultSet( Queries\Entities\FindWidgetDisplays $queryObject, diff --git a/src/Models/Entities/Widgets/Repository.php b/src/Models/Entities/Widgets/Repository.php index 87abb8f..6c539e2 100644 --- a/src/Models/Entities/Widgets/Repository.php +++ b/src/Models/Entities/Widgets/Repository.php @@ -17,8 +17,8 @@ use Doctrine\ORM; use Doctrine\Persistence; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Application\Helpers as ApplicationHelpers; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; +use FastyBird\Core\Tools\Helpers as ToolsHelpers; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Queries; @@ -45,7 +45,7 @@ final class Repository private array $repository = []; public function __construct( - private readonly ApplicationHelpers\Database $database, + private readonly ToolsHelpers\Database $database, private readonly Persistence\ManagerRegistry $managerRegistry, ) { @@ -58,7 +58,7 @@ public function __construct( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function find( Uuid\UuidInterface $id, @@ -78,7 +78,7 @@ public function find( * * @return T|null * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findOneBy( Queries\Entities\FindWidgets $queryObject, @@ -97,7 +97,7 @@ public function findOneBy( * * @return array * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function findAll(string $type = Entities\Widgets\Widget::class): array { @@ -139,8 +139,8 @@ public function findAllBy( * * @return DoctrineOrmQuery\ResultSet * - * @throws ApplicationExceptions\InvalidState * @throws Exceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function getResultSet( Queries\Entities\FindWidgets $queryObject, diff --git a/src/Queries/Configuration/QueryObject.php b/src/Queries/Configuration/QueryObject.php index c0125dd..e455036 100644 --- a/src/Queries/Configuration/QueryObject.php +++ b/src/Queries/Configuration/QueryObject.php @@ -15,13 +15,13 @@ namespace FastyBird\Module\Ui\Queries\Configuration; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; +use FastyBird\Core\Application\Documents as ApplicationDocuments; use Flow\JSONPath; /** * Configuration query object * - * @template T of MetadataDocuments\Document + * @template T of ApplicationDocuments\Document * * @package FastyBird:UIModule! * @subpackage Queries diff --git a/src/Subscribers/DashboardEntity.php b/src/Subscribers/DashboardEntity.php index 69f5c78..7b3c1d7 100644 --- a/src/Subscribers/DashboardEntity.php +++ b/src/Subscribers/DashboardEntity.php @@ -18,7 +18,7 @@ use Doctrine\Common; use Doctrine\ORM; use Doctrine\Persistence; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; use FastyBird\Module\Ui\Entities; use FastyBird\Module\Ui\Models; use FastyBird\Module\Ui\Queries; @@ -56,7 +56,7 @@ public function getSubscribedEvents(): array /** * @param Persistence\Event\LifecycleEventArgs $eventArgs * - * @throws ApplicationExceptions\InvalidState + * @throws ToolsExceptions\InvalidState */ public function prePersist(Persistence\Event\LifecycleEventArgs $eventArgs): void { diff --git a/src/Subscribers/ModuleEntities.php b/src/Subscribers/ModuleEntities.php index 300632d..5a63ee0 100644 --- a/src/Subscribers/ModuleEntities.php +++ b/src/Subscribers/ModuleEntities.php @@ -18,11 +18,11 @@ use Doctrine\Common; use Doctrine\ORM; use Doctrine\Persistence; -use FastyBird\Library\Application\Utilities as ApplicationUtilities; -use FastyBird\Library\Exchange\Documents as ExchangeDocuments; -use FastyBird\Library\Exchange\Exceptions as ExchangeExceptions; -use FastyBird\Library\Exchange\Publisher as ExchangePublisher; -use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Core\Application\EventLoop\Status; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Exchange\Documents as ExchangeDocuments; +use FastyBird\Core\Exchange\Exceptions as ExchangeExceptions; +use FastyBird\Core\Exchange\Publisher as ExchangePublisher; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui; use FastyBird\Module\Ui\Entities; @@ -54,7 +54,7 @@ final class ModuleEntities implements Common\EventSubscriber public function __construct( private readonly ORM\EntityManagerInterface $entityManager, - private readonly ApplicationUtilities\EventLoopStatus $eventLoopStatus, + private readonly Status $eventLoopStatus, private readonly ExchangeDocuments\DocumentFactory $documentFactory, private readonly ExchangePublisher\Publisher $publisher, private readonly ExchangePublisher\Async\Publisher $asyncPublisher, @@ -74,11 +74,11 @@ public function getSubscribedEvents(): array /** * @param Persistence\Event\LifecycleEventArgs $eventArgs * + * @throws ApplicationExceptions\InvalidArgument + * @throws ApplicationExceptions\InvalidState + * @throws ApplicationExceptions\MalformedInput + * @throws ApplicationExceptions\Mapping * @throws ExchangeExceptions\InvalidState - * @throws MetadataExceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState - * @throws MetadataExceptions\MalformedInput - * @throws MetadataExceptions\Mapping */ public function postPersist(Persistence\Event\LifecycleEventArgs $eventArgs): void { @@ -96,11 +96,11 @@ public function postPersist(Persistence\Event\LifecycleEventArgs $eventArgs): vo /** * @param Persistence\Event\LifecycleEventArgs $eventArgs * + * @throws ApplicationExceptions\InvalidArgument + * @throws ApplicationExceptions\InvalidState + * @throws ApplicationExceptions\MalformedInput + * @throws ApplicationExceptions\Mapping * @throws ExchangeExceptions\InvalidState - * @throws MetadataExceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState - * @throws MetadataExceptions\MalformedInput - * @throws MetadataExceptions\Mapping */ public function postUpdate(Persistence\Event\LifecycleEventArgs $eventArgs): void { @@ -132,11 +132,11 @@ public function postUpdate(Persistence\Event\LifecycleEventArgs $eventArgs): voi /** * @param Persistence\Event\LifecycleEventArgs $eventArgs * + * @throws ApplicationExceptions\InvalidArgument + * @throws ApplicationExceptions\InvalidState + * @throws ApplicationExceptions\MalformedInput + * @throws ApplicationExceptions\Mapping * @throws ExchangeExceptions\InvalidState - * @throws MetadataExceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState - * @throws MetadataExceptions\MalformedInput - * @throws MetadataExceptions\Mapping */ public function postRemove(Persistence\Event\LifecycleEventArgs $eventArgs): void { @@ -152,11 +152,11 @@ public function postRemove(Persistence\Event\LifecycleEventArgs $eventArgs): voi } /** + * @throws ApplicationExceptions\InvalidArgument + * @throws ApplicationExceptions\InvalidState + * @throws ApplicationExceptions\MalformedInput + * @throws ApplicationExceptions\Mapping * @throws ExchangeExceptions\InvalidState - * @throws MetadataExceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState - * @throws MetadataExceptions\MalformedInput - * @throws MetadataExceptions\Mapping */ private function publishEntity(Entities\Entity $entity, string $action): void { diff --git a/tests/cases/unit/BaseTestCase.php b/tests/cases/unit/BaseTestCase.php index 67a2434..cd962cf 100644 --- a/tests/cases/unit/BaseTestCase.php +++ b/tests/cases/unit/BaseTestCase.php @@ -3,8 +3,8 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit; use Error; -use FastyBird\Library\Application\Boot as ApplicationBoot; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Boot as ApplicationBoot; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\DI; use Nette; use PHPUnit\Framework\TestCase; diff --git a/tests/cases/unit/Controllers/DashboardsV1Test.php b/tests/cases/unit/Controllers/DashboardsV1Test.php index c72d7a2..328249f 100644 --- a/tests/cases/unit/Controllers/DashboardsV1Test.php +++ b/tests/cases/unit/Controllers/DashboardsV1Test.php @@ -3,7 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Controllers; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Library\Metadata; use FastyBird\Module\Ui\Tests; use Fig\Http\Message\RequestMethodInterface; diff --git a/tests/cases/unit/Controllers/DataSourcesV1Test.php b/tests/cases/unit/Controllers/DataSourcesV1Test.php index 1e438a9..a679468 100644 --- a/tests/cases/unit/Controllers/DataSourcesV1Test.php +++ b/tests/cases/unit/Controllers/DataSourcesV1Test.php @@ -3,7 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Controllers; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Library\Metadata; use FastyBird\Module\Ui\Tests; use Fig\Http\Message\RequestMethodInterface; diff --git a/tests/cases/unit/Controllers/DisplayV1Test.php b/tests/cases/unit/Controllers/DisplayV1Test.php index 1d963ad..77ec318 100644 --- a/tests/cases/unit/Controllers/DisplayV1Test.php +++ b/tests/cases/unit/Controllers/DisplayV1Test.php @@ -3,7 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Controllers; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Library\Metadata; use FastyBird\Module\Ui\Tests; use Fig\Http\Message\RequestMethodInterface; diff --git a/tests/cases/unit/Controllers/GroupsV1Test.php b/tests/cases/unit/Controllers/GroupsV1Test.php index b3b35fa..422c6e5 100644 --- a/tests/cases/unit/Controllers/GroupsV1Test.php +++ b/tests/cases/unit/Controllers/GroupsV1Test.php @@ -3,7 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Controllers; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Library\Metadata; use FastyBird\Module\Ui\Tests; use Fig\Http\Message\RequestMethodInterface; diff --git a/tests/cases/unit/Controllers/TabsV1Test.php b/tests/cases/unit/Controllers/TabsV1Test.php index 0d101a4..1d63647 100644 --- a/tests/cases/unit/Controllers/TabsV1Test.php +++ b/tests/cases/unit/Controllers/TabsV1Test.php @@ -3,7 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Controllers; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Library\Metadata; use FastyBird\Module\Ui\Tests; use Fig\Http\Message\RequestMethodInterface; diff --git a/tests/cases/unit/Controllers/WidgetsV1Test.php b/tests/cases/unit/Controllers/WidgetsV1Test.php index d370461..d19dbd6 100644 --- a/tests/cases/unit/Controllers/WidgetsV1Test.php +++ b/tests/cases/unit/Controllers/WidgetsV1Test.php @@ -3,7 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Controllers; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Library\Metadata; use FastyBird\Module\Ui\Tests; use Fig\Http\Message\RequestMethodInterface; diff --git a/tests/cases/unit/DI/UiExtensionTest.php b/tests/cases/unit/DI/UiExtensionTest.php index 93f7efb..f628b3d 100644 --- a/tests/cases/unit/DI/UiExtensionTest.php +++ b/tests/cases/unit/DI/UiExtensionTest.php @@ -3,7 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\DI; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Controllers; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Hydrators; diff --git a/tests/cases/unit/DbTestCase.php b/tests/cases/unit/DbTestCase.php index 003e82e..1462622 100644 --- a/tests/cases/unit/DbTestCase.php +++ b/tests/cases/unit/DbTestCase.php @@ -5,8 +5,8 @@ use Doctrine\DBAL; use Doctrine\ORM; use Error; -use FastyBird\Library\Application\Boot as ApplicationBoot; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Boot as ApplicationBoot; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\DI; use FastyBird\Module\Ui\Exceptions; use IPub\DoctrineCrud; diff --git a/tests/cases/unit/Documents/WidgetDocumentTest.php b/tests/cases/unit/Documents/WidgetDocumentTest.php index a8e0b9e..acef0e0 100644 --- a/tests/cases/unit/Documents/WidgetDocumentTest.php +++ b/tests/cases/unit/Documents/WidgetDocumentTest.php @@ -3,9 +3,8 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Documents; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Metadata\Documents as MetadataDocuments; -use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Core\Application\Documents as ApplicationDocuments; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Library\Metadata\Types as MetadataTypes; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Tests; @@ -17,23 +16,21 @@ final class WidgetDocumentTest extends Tests\Cases\Unit\BaseTestCase { /** - * @param class-string $class + * @param class-string $class * @param array $fixture * * @throws ApplicationExceptions\InvalidArgument * @throws ApplicationExceptions\InvalidState + * @throws ApplicationExceptions\MalformedInput + * @throws ApplicationExceptions\Mapping * @throws Error - * @throws MetadataExceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState - * @throws MetadataExceptions\MalformedInput - * @throws MetadataExceptions\Mapping * @throws Nette\DI\MissingServiceException * * @dataProvider widget */ public function testCreateDocument(string $data, string $class, array $fixture): void { - $factory = $this->getContainer()->getByType(MetadataDocuments\DocumentFactory::class); + $factory = $this->getContainer()->getByType(ApplicationDocuments\DocumentFactory::class); $document = $factory->create($class, $data); @@ -44,24 +41,22 @@ public function testCreateDocument(string $data, string $class, array $fixture): } /** - * @param class-string $class + * @param class-string $class * * @throws ApplicationExceptions\InvalidArgument * @throws ApplicationExceptions\InvalidState + * @throws ApplicationExceptions\MalformedInput + * @throws ApplicationExceptions\Mapping * @throws Error - * @throws MetadataExceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState - * @throws MetadataExceptions\MalformedInput - * @throws MetadataExceptions\Mapping * @throws Nette\DI\MissingServiceException * * @dataProvider widgetInvalid */ public function testCreateDocumentInvalid(string $data, string $class): void { - $factory = $this->getContainer()->getByType(MetadataDocuments\DocumentFactory::class); + $factory = $this->getContainer()->getByType(ApplicationDocuments\DocumentFactory::class); - $this->expectException(MetadataExceptions\InvalidArgument::class); + $this->expectException(ApplicationExceptions\InvalidArgument::class); $factory->create($class, $data); } diff --git a/tests/cases/unit/Models/Configuration/Repositories/DashboardTabsRepositoryTest.php b/tests/cases/unit/Models/Configuration/Repositories/DashboardTabsRepositoryTest.php index bf1441a..254d690 100644 --- a/tests/cases/unit/Models/Configuration/Repositories/DashboardTabsRepositoryTest.php +++ b/tests/cases/unit/Models/Configuration/Repositories/DashboardTabsRepositoryTest.php @@ -3,8 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Models\Configuration\Repositories; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Models; @@ -24,7 +23,6 @@ final class DashboardTabsRepositoryTest extends Tests\Cases\Unit\DbTestCase /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error @@ -68,7 +66,6 @@ public function testReadOne(): void /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error @@ -87,7 +84,6 @@ public function testReadAll(): void /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error diff --git a/tests/cases/unit/Models/Configuration/Repositories/DashboardsRepositoryTest.php b/tests/cases/unit/Models/Configuration/Repositories/DashboardsRepositoryTest.php index fc38b95..a96d277 100644 --- a/tests/cases/unit/Models/Configuration/Repositories/DashboardsRepositoryTest.php +++ b/tests/cases/unit/Models/Configuration/Repositories/DashboardsRepositoryTest.php @@ -3,8 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Models\Configuration\Repositories; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Models; use FastyBird\Module\Ui\Queries; @@ -23,7 +22,6 @@ final class DashboardsRepositoryTest extends Tests\Cases\Unit\DbTestCase /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error @@ -76,7 +74,6 @@ public function testReadOne(): void /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error diff --git a/tests/cases/unit/Models/Configuration/Repositories/GroupsRepositoryTest.php b/tests/cases/unit/Models/Configuration/Repositories/GroupsRepositoryTest.php index 029cadb..f81ae0f 100644 --- a/tests/cases/unit/Models/Configuration/Repositories/GroupsRepositoryTest.php +++ b/tests/cases/unit/Models/Configuration/Repositories/GroupsRepositoryTest.php @@ -3,8 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Models\Configuration\Repositories; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Models; use FastyBird\Module\Ui\Queries; @@ -23,7 +22,6 @@ final class GroupsRepositoryTest extends Tests\Cases\Unit\DbTestCase /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error @@ -67,7 +65,6 @@ public function testReadOne(): void /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error diff --git a/tests/cases/unit/Models/Configuration/Repositories/WidgetDataSourcesRepositoryTest.php b/tests/cases/unit/Models/Configuration/Repositories/WidgetDataSourcesRepositoryTest.php index 1b30de6..0ce2943 100644 --- a/tests/cases/unit/Models/Configuration/Repositories/WidgetDataSourcesRepositoryTest.php +++ b/tests/cases/unit/Models/Configuration/Repositories/WidgetDataSourcesRepositoryTest.php @@ -3,8 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Models\Configuration\Repositories; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Models; @@ -24,7 +23,6 @@ final class WidgetDataSourcesRepositoryTest extends Tests\Cases\Unit\DbTestCase /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error @@ -60,7 +58,6 @@ public function testReadOne(): void /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error @@ -79,7 +76,6 @@ public function testReadAll(): void /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error diff --git a/tests/cases/unit/Models/Configuration/Repositories/WidgetDisplayRepositoryTest.php b/tests/cases/unit/Models/Configuration/Repositories/WidgetDisplayRepositoryTest.php index 75cbd53..43ff18e 100644 --- a/tests/cases/unit/Models/Configuration/Repositories/WidgetDisplayRepositoryTest.php +++ b/tests/cases/unit/Models/Configuration/Repositories/WidgetDisplayRepositoryTest.php @@ -3,8 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Models\Configuration\Repositories; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Models; @@ -24,7 +23,6 @@ final class WidgetDisplayRepositoryTest extends Tests\Cases\Unit\DbTestCase /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error @@ -60,7 +58,6 @@ public function testReadOne(): void /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error @@ -79,7 +76,6 @@ public function testReadAll(): void /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error diff --git a/tests/cases/unit/Models/Configuration/Repositories/WidgetsRepositoryTest.php b/tests/cases/unit/Models/Configuration/Repositories/WidgetsRepositoryTest.php index cd4291e..3d8addb 100644 --- a/tests/cases/unit/Models/Configuration/Repositories/WidgetsRepositoryTest.php +++ b/tests/cases/unit/Models/Configuration/Repositories/WidgetsRepositoryTest.php @@ -3,8 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Models\Configuration\Repositories; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; -use FastyBird\Library\Metadata\Exceptions as MetadataExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Documents; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Models; @@ -24,7 +23,6 @@ final class WidgetsRepositoryTest extends Tests\Cases\Unit\DbTestCase /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error @@ -71,7 +69,6 @@ public function testReadOne(): void /** * @throws ApplicationExceptions\InvalidArgument * @throws Exceptions\InvalidArgument - * @throws MetadataExceptions\InvalidState * @throws Nette\DI\MissingServiceException * @throws RuntimeException * @throws Error diff --git a/tests/cases/unit/Models/Entities/Repositories/DashboardsRepositoryTest.php b/tests/cases/unit/Models/Entities/Repositories/DashboardsRepositoryTest.php index 751ca78..c33899a 100644 --- a/tests/cases/unit/Models/Entities/Repositories/DashboardsRepositoryTest.php +++ b/tests/cases/unit/Models/Entities/Repositories/DashboardsRepositoryTest.php @@ -3,7 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Models\Entities\Repositories; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Models; use FastyBird\Module\Ui\Queries; diff --git a/tests/cases/unit/Models/Entities/Repositories/GroupsRepositoryTest.php b/tests/cases/unit/Models/Entities/Repositories/GroupsRepositoryTest.php index 1938d0e..8d78839 100644 --- a/tests/cases/unit/Models/Entities/Repositories/GroupsRepositoryTest.php +++ b/tests/cases/unit/Models/Entities/Repositories/GroupsRepositoryTest.php @@ -3,7 +3,7 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Models\Entities\Repositories; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Models; use FastyBird\Module\Ui\Queries; diff --git a/tests/cases/unit/Models/Entities/Repositories/WidgetsRepositoryTest.phpt b/tests/cases/unit/Models/Entities/Repositories/WidgetsRepositoryTest.phpt index 5188cff..448b5ae 100644 --- a/tests/cases/unit/Models/Entities/Repositories/WidgetsRepositoryTest.phpt +++ b/tests/cases/unit/Models/Entities/Repositories/WidgetsRepositoryTest.phpt @@ -3,7 +3,8 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Models\Entities\Repositories; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Models; use FastyBird\Module\Ui\Queries; diff --git a/tests/cases/unit/Router/RouterTest.phpt b/tests/cases/unit/Router/RouterTest.phpt index 6c681e1..3e9a7ff 100644 --- a/tests/cases/unit/Router/RouterTest.phpt +++ b/tests/cases/unit/Router/RouterTest.phpt @@ -3,7 +3,8 @@ namespace FastyBird\Module\Ui\Tests\Cases\Unit\Router; use Error; -use FastyBird\Library\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Application\Exceptions as ApplicationExceptions; +use FastyBird\Core\Tools\Exceptions as ToolsExceptions; use FastyBird\Library\Metadata; use FastyBird\Module\Ui\Exceptions; use FastyBird\Module\Ui\Tests; diff --git a/tests/common.neon b/tests/common.neon index cbe4686..eecd316 100644 --- a/tests/common.neon +++ b/tests/common.neon @@ -27,8 +27,8 @@ extensions: fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension fbJsonApi : FastyBird\JsonApi\DI\JsonApiExtension fbSimpleAuth : FastyBird\SimpleAuth\DI\SimpleAuthExtension - fbMetadataLibrary : FastyBird\Library\Metadata\DI\MetadataExtension - fbExchangeLibrary : FastyBird\Library\Exchange\DI\ExchangeExtension + fbTools : FastyBird\Core\Tools\DI\ToolsExtension + fbExchange : FastyBird\Core\Exchange\DI\ExchangeExtension services: - {factory: IPub\SlimRouter\Http\ResponseFactory} @@ -82,10 +82,6 @@ nettrineOrm: nettrineOrmAttributes: mapping: [] -fbMetadataLibrary: - documents: - mapping: [] - fbSimpleAuth: token: issuer: com.fastybird.auth-module @@ -105,3 +101,7 @@ fbJsonApi: fbDateTimeFactory: frozen: DateTimeImmutable('2020-04-01T12:00:00+00:00') + +fbApplication: + documents: + mapping: [] \ No newline at end of file