Skip to content

Commit 16e638a

Browse files
raju-optiraju-opti
authored
[FSSDK-10950] restructure odp directories (#971)
1 parent 5929210 commit 16e638a

34 files changed

+117
-129
lines changed

‎lib/index.browser.tests.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import configValidator from './utils/config_validator';
2626
import OptimizelyUserContext from './optimizely_user_context';
2727

2828
import { LOG_MESSAGES, ODP_EVENT_ACTION } from './utils/enums';
29-
import { BrowserOdpManager } from './plugins/odp_manager/index.browser';
30-
import { OdpConfig } from './core/odp/odp_config';
31-
import { BrowserOdpEventManager } from './plugins/odp/event_manager/index.browser';
32-
import { BrowserOdpEventApiManager } from './plugins/odp/event_api_manager/index.browser';
33-
import { OdpEvent } from './core/odp/odp_event';
29+
import { BrowserOdpManager } from './odp/odp_manager.browser';
30+
import { OdpConfig } from './odp/odp_config';
31+
import { BrowserOdpEventManager } from './odp/event_manager/event_manager.browser';
32+
import { BrowserOdpEventApiManager } from './odp/event_manager/event_api_manager.browser';
33+
import { OdpEvent } from './odp/event_manager/odp_event';
3434
import { getMockProjectConfigManager } from './tests/mock/mock_project_config_manager';
3535
import { createProjectConfig } from './project_config/project_config';
3636

‎lib/index.browser.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import * as enums from './utils/enums';
2424
import * as loggerPlugin from './plugins/logger';
2525
import { createNotificationCenter } from './notification_center';
2626
import { OptimizelyDecideOption, Client, Config, OptimizelyOptions } from './shared_types';
27-
import { BrowserOdpManager } from './plugins/odp_manager/index.browser';
27+
import { BrowserOdpManager } from './odp/odp_manager.browser';
2828
import Optimizely from './optimizely';
29-
import { IUserAgentParser } from './core/odp/user_agent_parser';
30-
import { getUserAgentParser } from './plugins/odp/user_agent_parser/index.browser';
29+
import { IUserAgentParser } from './odp/ua_parser/user_agent_parser';
30+
import { getUserAgentParser } from './odp/ua_parser/ua_parser.browser';
3131
import * as commonExports from './common_exports';
3232
import { PollingConfigManagerConfig } from './project_config/config_manager_factory';
3333
import { createPollingProjectConfigManager } from './project_config/config_manager_factory.browser';

‎lib/index.node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import defaultErrorHandler from './plugins/error_handler';
2323
import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.node';
2424
import { createNotificationCenter } from './notification_center';
2525
import { OptimizelyDecideOption, Client, Config } from './shared_types';
26-
import { NodeOdpManager } from './plugins/odp_manager/index.node';
26+
import { NodeOdpManager } from './odp/odp_manager.node';
2727
import * as commonExports from './common_exports';
2828
import { createPollingProjectConfigManager } from './project_config/config_manager_factory.node';
2929
import { createForwardingEventProcessor, createBatchEventProcessor } from './event_processor/event_processor_factory.node';

‎lib/index.react_native.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import * as loggerPlugin from './plugins/logger/index.react_native';
2323
import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.browser';
2424
import { createNotificationCenter } from './notification_center';
2525
import { OptimizelyDecideOption, Client, Config } from './shared_types';
26-
import { BrowserOdpManager } from './plugins/odp_manager/index.browser';
26+
import { BrowserOdpManager } from './odp/odp_manager.browser';
2727
import * as commonExports from './common_exports';
2828
import { createPollingProjectConfigManager } from './project_config/config_manager_factory.react_native';
2929
import { createBatchEventProcessor, createForwardingEventProcessor } from './event_processor/event_processor_factory.react_native';

‎lib/plugins/odp/event_api_manager/index.browser.ts renamed to ‎lib/odp/event_manager/event_api_manager.browser.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { OdpEvent } from '../../../core/odp/odp_event';
18-
import { OdpEventApiManager } from '../../../core/odp/odp_event_api_manager';
19-
import { LogLevel } from '../../../modules/logging';
20-
import { OdpConfig, OdpIntegrationConfig } from '../../../core/odp/odp_config';
21-
import { HttpMethod } from '../../../utils/http_request_handler/http';
17+
import { OdpEvent } from './odp_event';
18+
import { OdpEventApiManager } from './odp_event_api_manager';
19+
import { LogLevel } from '../../modules/logging';
20+
import { OdpConfig } from '../odp_config';
21+
import { HttpMethod } from '../../utils/http_request_handler/http';
2222

2323
const EVENT_SENDING_FAILURE_MESSAGE = 'ODP event send failed';
2424

‎lib/plugins/odp/event_api_manager/index.node.ts renamed to ‎lib/odp/event_manager/event_api_manager.node.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
import { OdpConfig } from '../odp_config';
17+
import { OdpEvent } from './odp_event'
18+
import { OdpEventApiManager } from './odp_event_api_manager';
19+
import { HttpMethod } from '../../utils/http_request_handler/http';
1620

17-
import { OdpConfig, OdpIntegrationConfig } from '../../../core/odp/odp_config';
18-
import { OdpEvent } from '../../../core/odp/odp_event';
19-
import { OdpEventApiManager } from '../../../core/odp/odp_event_api_manager';
20-
import { LogLevel } from '../../../modules/logging';
21-
import { HttpMethod } from '../../../utils/http_request_handler/http';
2221
export class NodeOdpEventApiManager extends OdpEventApiManager {
2322
protected shouldSendEvents(events: OdpEvent[]): boolean {
2423
return true;

‎lib/plugins/odp/event_manager/index.browser.ts renamed to ‎lib/odp/event_manager/event_manager.browser.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { IOdpEventManager, OdpEventManager } from '../../../core/odp/odp_event_manager';
18-
import { LogLevel } from '../../../modules/logging';
19-
import { OdpEvent } from "../../../core/odp/odp_event";
17+
import { IOdpEventManager, OdpEventManager } from './odp_event_manager';
18+
import { LogLevel } from '../../modules/logging';
19+
import { OdpEvent } from './odp_event';
2020

2121
const DEFAULT_BROWSER_QUEUE_SIZE = 100;
2222

‎lib/plugins/odp/event_manager/index.node.ts renamed to ‎lib/odp/event_manager/event_manager.node.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { OdpEvent } from '../../../core/odp/odp_event';
18-
import { IOdpEventManager, OdpEventManager } from '../../../core/odp/odp_event_manager';
19-
import { LogLevel } from '../../../modules/logging';
17+
import { OdpEvent } from './odp_event';
18+
import { IOdpEventManager, OdpEventManager } from './odp_event_manager';
19+
import { LogLevel } from '../../modules/logging';
2020

2121
const DEFAULT_BATCH_SIZE = 10;
2222
const DEFAULT_FLUSH_INTERVAL_MSECS = 1000;

‎lib/core/odp/odp_event.ts renamed to ‎lib/odp/event_manager/odp_event.ts

File renamed without changes.

‎lib/core/odp/odp_event_api_manager.ts renamed to ‎lib/odp/event_manager/odp_event_api_manager.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
import { LogHandler, LogLevel } from '../../modules/logging';
1818
import { OdpEvent } from './odp_event';
1919
import { HttpMethod, RequestHandler } from '../../utils/http_request_handler/http';
20-
import { OdpConfig } from './odp_config';
21-
import { ERROR_MESSAGES } from '../../utils/enums';
20+
import { OdpConfig } from '../odp_config';
2221

2322
const EVENT_SENDING_FAILURE_MESSAGE = 'ODP event send failed';
2423

‎lib/core/odp/odp_event_manager.ts renamed to ‎lib/odp/event_manager/odp_event_manager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import { uuid } from '../../utils/fns';
2020
import { ERROR_MESSAGES, ODP_USER_KEY, ODP_DEFAULT_EVENT_TYPE, ODP_EVENT_ACTION } from '../../utils/enums';
2121

2222
import { OdpEvent } from './odp_event';
23-
import { OdpConfig } from './odp_config';
23+
import { OdpConfig } from '../odp_config';
2424
import { IOdpEventApiManager } from './odp_event_api_manager';
25-
import { invalidOdpDataFound } from './odp_utils';
26-
import { IUserAgentParser } from './user_agent_parser';
25+
import { invalidOdpDataFound } from '../odp_utils';
26+
import { IUserAgentParser } from '../ua_parser/user_agent_parser';
2727
import { scheduleMicrotask } from '../../utils/microtask';
2828

2929
const MAX_RETRIES = 3;

‎lib/core/odp/odp_config.ts renamed to ‎lib/odp/odp_config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { checkArrayEquality } from '../../utils/fns';
17+
import { checkArrayEquality } from '../utils/fns';
1818

1919
export class OdpConfig {
2020
/**

‎lib/plugins/odp_manager/index.browser.ts renamed to ‎lib/odp/odp_manager.browser.ts

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,24 @@ import {
2222
REQUEST_TIMEOUT_ODP_SEGMENTS_MS,
2323
REQUEST_TIMEOUT_ODP_EVENTS_MS,
2424
LOG_MESSAGES,
25-
} from '../../utils/enums';
26-
import { getLogger, LogHandler, LogLevel } from '../../modules/logging';
25+
} from '../utils/enums';
26+
import { getLogger, LogHandler, LogLevel } from '../modules/logging';
2727

28-
import { BrowserRequestHandler } from './../../utils/http_request_handler/browser_request_handler';
28+
import { BrowserRequestHandler } from '../utils/http_request_handler/browser_request_handler';
2929

30-
import BrowserAsyncStorageCache from '../key_value_cache/browserAsyncStorageCache';
31-
import PersistentKeyValueCache from '../key_value_cache/persistentKeyValueCache';
32-
import { BrowserLRUCache } from '../../utils/lru_cache';
30+
import BrowserAsyncStorageCache from '../plugins/key_value_cache/browserAsyncStorageCache';
31+
import { BrowserLRUCache } from '../utils/lru_cache';
3332

34-
import { VuidManager } from './../vuid_manager/index';
33+
import { VuidManager } from '../plugins/vuid_manager/index';
3534

36-
import { OdpManager } from '../../core/odp/odp_manager';
37-
import { OdpEvent } from '../../core/odp/odp_event';
38-
import { IOdpEventManager, OdpOptions } from '../../shared_types';
39-
import { BrowserOdpEventApiManager } from '../odp/event_api_manager/index.browser';
40-
import { BrowserOdpEventManager } from '../odp/event_manager/index.browser';
41-
import { IOdpSegmentManager, OdpSegmentManager } from '../../core/odp/odp_segment_manager';
42-
import { OdpSegmentApiManager } from '../../core/odp/odp_segment_api_manager';
43-
import { OdpConfig, OdpIntegrationConfig } from '../../core/odp/odp_config';
35+
import { OdpManager } from './odp_manager';
36+
import { OdpEvent } from './event_manager/odp_event';
37+
import { IOdpEventManager, OdpOptions } from '../shared_types';
38+
import { BrowserOdpEventApiManager } from './event_manager/event_api_manager.browser';
39+
import { BrowserOdpEventManager } from './event_manager/event_manager.browser';
40+
import { IOdpSegmentManager, OdpSegmentManager } from './segment_manager/odp_segment_manager';
41+
import { OdpSegmentApiManager } from './segment_manager/odp_segment_api_manager';
42+
import { OdpConfig, OdpIntegrationConfig } from './odp_config';
4443

4544
interface BrowserOdpManagerConfig {
4645
clientEngine?: string,

‎lib/plugins/odp_manager/index.node.ts renamed to ‎lib/odp/odp_manager.node.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { NodeRequestHandler } from '../../utils/http_request_handler/node_request_handler';
17+
import { NodeRequestHandler } from '../utils/http_request_handler/node_request_handler';
1818

19-
import { ServerLRUCache } from './../../utils/lru_cache/server_lru_cache';
19+
import { ServerLRUCache } from '../utils/lru_cache/server_lru_cache';
2020

21-
import { getLogger, LogHandler, LogLevel } from '../../modules/logging';
21+
import { getLogger, LogHandler, LogLevel } from '../modules/logging';
2222
import {
2323
NODE_CLIENT_ENGINE,
2424
CLIENT_VERSION,
2525
REQUEST_TIMEOUT_ODP_EVENTS_MS,
2626
REQUEST_TIMEOUT_ODP_SEGMENTS_MS,
27-
} from '../../utils/enums';
28-
29-
import { OdpManager } from '../../core/odp/odp_manager';
30-
import { IOdpEventManager, OdpOptions } from '../../shared_types';
31-
import { NodeOdpEventApiManager } from '../odp/event_api_manager/index.node';
32-
import { NodeOdpEventManager } from '../odp/event_manager/index.node';
33-
import { IOdpSegmentManager, OdpSegmentManager } from '../../core/odp/odp_segment_manager';
34-
import { OdpSegmentApiManager } from '../../core/odp/odp_segment_api_manager';
35-
import { OdpConfig, OdpIntegrationConfig } from '../../core/odp/odp_config';
27+
} from '../utils/enums';
28+
29+
import { OdpManager } from './odp_manager';
30+
import { IOdpEventManager, OdpOptions } from '../shared_types';
31+
import { NodeOdpEventApiManager } from './event_manager/event_api_manager.node';
32+
import { NodeOdpEventManager } from './event_manager/event_manager.node';
33+
import { IOdpSegmentManager, OdpSegmentManager } from './segment_manager/odp_segment_manager';
34+
import { OdpSegmentApiManager } from './segment_manager/odp_segment_api_manager';
35+
import { OdpConfig, OdpIntegrationConfig } from './odp_config';
3636

3737
interface NodeOdpManagerConfig {
3838
clientEngine?: string,

‎lib/core/odp/odp_manager.ts renamed to ‎lib/odp/odp_manager.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,18 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { LOG_MESSAGES } from './../../utils/enums/index';
18-
import { getLogger, LogHandler, LogLevel } from '../../modules/logging';
19-
import { ERROR_MESSAGES, ODP_USER_KEY } from '../../utils/enums';
17+
import { LogHandler, LogLevel } from '../modules/logging';
18+
import { ERROR_MESSAGES, ODP_USER_KEY } from '../utils/enums';
2019

21-
import { VuidManager } from '../../plugins/vuid_manager';
20+
import { VuidManager } from '../plugins/vuid_manager';
2221

23-
import { OdpConfig, OdpIntegrationConfig, odpIntegrationsAreEqual } from './odp_config';
24-
import { IOdpEventManager } from './odp_event_manager';
25-
import { IOdpSegmentManager } from './odp_segment_manager';
26-
import { OptimizelySegmentOption } from './optimizely_segment_option';
22+
import { OdpIntegrationConfig, odpIntegrationsAreEqual } from './odp_config';
23+
import { IOdpEventManager } from './event_manager/odp_event_manager';
24+
import { IOdpSegmentManager } from './segment_manager/odp_segment_manager';
25+
import { OptimizelySegmentOption } from './segment_manager/optimizely_segment_option';
2726
import { invalidOdpDataFound } from './odp_utils';
28-
import { OdpEvent } from './odp_event';
29-
import { resolvablePromise, ResolvablePromise } from '../../utils/promise/resolvablePromise';
27+
import { OdpEvent } from './event_manager/odp_event';
28+
import { resolvablePromise, ResolvablePromise } from '../utils/promise/resolvablePromise';
3029

3130
/**
3231
* Manager for handling internal all business logic related to

‎lib/core/odp/odp_response_schema.ts renamed to ‎lib/odp/odp_response_schema.ts

File renamed without changes.

‎lib/core/odp/odp_types.ts renamed to ‎lib/odp/odp_types.ts

File renamed without changes.

‎lib/core/odp/odp_utils.ts renamed to ‎lib/odp/odp_utils.ts

File renamed without changes.

‎lib/core/odp/odp_segment_api_manager.ts renamed to ‎lib/odp/segment_manager/odp_segment_api_manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
import { LogHandler, LogLevel } from '../../modules/logging';
1818
import { validate } from '../../utils/json_schema_validator';
19-
import { OdpResponseSchema } from './odp_response_schema';
19+
import { OdpResponseSchema } from '../odp_response_schema';
2020
import { ODP_USER_KEY } from '../../utils/enums';
2121
import { RequestHandler, Response as HttpResponse } from '../../utils/http_request_handler/http';
22-
import { Response as GraphQLResponse } from './odp_types';
22+
import { Response as GraphQLResponse } from '../odp_types';
2323

2424
/**
2525
* Expected value for a qualified/valid segment

‎lib/core/odp/odp_segment_manager.ts renamed to ‎lib/odp/segment_manager/odp_segment_manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { getLogger, LogHandler, LogLevel } from '../../modules/logging';
1818
import { ERROR_MESSAGES, ODP_USER_KEY } from '../../utils/enums';
1919
import { ICache } from '../../utils/lru_cache';
2020
import { IOdpSegmentApiManager } from './odp_segment_api_manager';
21-
import { OdpConfig } from './odp_config';
21+
import { OdpConfig } from '../odp_config';
2222
import { OptimizelySegmentOption } from './optimizely_segment_option';
2323

2424
export interface IOdpSegmentManager {

‎lib/core/odp/optimizely_segment_option.ts renamed to ‎lib/odp/segment_manager/optimizely_segment_option.ts

File renamed without changes.

‎lib/plugins/odp/user_agent_parser/index.browser.ts renamed to ‎lib/odp/ua_parser/ua_parser.browser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616

1717
import { UAParser } from 'ua-parser-js';
18-
import { UserAgentInfo } from "../../../core/odp/user_agent_info";
19-
import { IUserAgentParser } from '../../../core/odp/user_agent_parser';
18+
import { UserAgentInfo } from './user_agent_info';
19+
import { IUserAgentParser } from './user_agent_parser';
2020

2121
const userAgentParser: IUserAgentParser = {
2222
parseUserAgentInfo(): UserAgentInfo {

‎lib/core/odp/user_agent_info.ts renamed to ‎lib/odp/ua_parser/user_agent_info.ts

File renamed without changes.

‎lib/core/odp/user_agent_parser.ts renamed to ‎lib/odp/ua_parser/user_agent_parser.ts

File renamed without changes.

‎lib/optimizely/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import { sprintf, objectValues } from '../utils/fns';
1919
import { NotificationCenter } from '../notification_center';
2020
import { EventProcessor } from '../event_processor/event_processor';
2121

22-
import { IOdpManager } from '../core/odp/odp_manager';
23-
import { OdpEvent } from '../core/odp/odp_event';
24-
import { OptimizelySegmentOption } from '../core/odp/optimizely_segment_option';
22+
import { IOdpManager } from '../odp/odp_manager';
23+
import { OdpEvent } from '../odp/event_manager/odp_event';
24+
import { OptimizelySegmentOption } from '../odp/segment_manager/optimizely_segment_option';
2525

2626
import {
2727
UserAttributes,

‎lib/optimizely_user_context/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
UserAttributes,
2525
} from '../shared_types';
2626
import { CONTROL_ATTRIBUTES } from '../utils/enums';
27-
import { OptimizelySegmentOption } from '../core/odp/optimizely_segment_option';
27+
import { OptimizelySegmentOption } from '../odp/segment_manager/optimizely_segment_option';
2828

2929
interface OptimizelyUserContextConfig {
3030
optimizely: Optimizely;

‎lib/project_config/project_config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import {
3434
Integration,
3535
FeatureVariableValue,
3636
} from '../shared_types';
37-
import { OdpConfig, OdpIntegrationConfig } from '../core/odp/odp_config';
37+
import { OdpConfig, OdpIntegrationConfig } from '../odp/odp_config';
3838
import { Transformer } from '../utils/type';
3939

4040
interface TryCreatingProjectConfigConfig {

‎lib/shared_types.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ import { IOptimizelyUserContext as OptimizelyUserContext } from './optimizely_us
2828

2929
import { ICache } from './utils/lru_cache';
3030
import { RequestHandler } from './utils/http_request_handler/http';
31-
import { OptimizelySegmentOption } from './core/odp/optimizely_segment_option';
32-
import { IOdpSegmentApiManager } from './core/odp/odp_segment_api_manager';
33-
import { IOdpSegmentManager } from './core/odp/odp_segment_manager';
34-
import { IOdpEventApiManager } from './core/odp/odp_event_api_manager';
35-
import { IOdpEventManager } from './core/odp/odp_event_manager';
36-
import { IOdpManager } from './core/odp/odp_manager';
37-
import { IUserAgentParser } from './core/odp/user_agent_parser';
31+
import { OptimizelySegmentOption } from './odp/segment_manager/optimizely_segment_option';
32+
import { IOdpSegmentApiManager } from './odp/segment_manager/odp_segment_api_manager';
33+
import { IOdpSegmentManager } from './odp/segment_manager/odp_segment_manager';
34+
import { IOdpEventApiManager } from './odp/event_manager/odp_event_api_manager';
35+
import { IOdpEventManager } from './odp/event_manager/odp_event_manager';
36+
import { IOdpManager } from './odp/odp_manager';
37+
import { IUserAgentParser } from './odp/ua_parser/user_agent_parser';
3838
import PersistentCache from './plugins/key_value_cache/persistentKeyValueCache';
3939
import { ProjectConfig } from './project_config/project_config';
4040
import { ProjectConfigManager } from './project_config/project_config_manager';

‎tests/odpEventApiManager.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import { describe, beforeEach, beforeAll, it, expect } from 'vitest';
1818

1919
import { anyString, anything, capture, instance, mock, resetCalls, verify, when } from 'ts-mockito';
2020
import { LogHandler, LogLevel } from '../lib/modules/logging';
21-
import { NodeOdpEventApiManager } from '../lib/plugins/odp/event_api_manager/index.node';
22-
import { OdpEvent } from '../lib/core/odp/odp_event';
21+
import { NodeOdpEventApiManager } from '../lib/odp/event_manager/event_api_manager.node';
22+
import { OdpEvent } from '../lib/odp/event_manager/odp_event';
2323
import { RequestHandler } from '../lib/utils/http_request_handler/http';
24-
import { OdpConfig } from '../lib/core/odp/odp_config';
24+
import { OdpConfig } from '../lib/odp/odp_config';
2525

2626
const data1 = new Map<string, unknown>();
2727
data1.set('key11', 'value-1');

‎tests/odpEventManager.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
import { describe, beforeEach, afterEach, beforeAll, it, vi, expect } from 'vitest';
1717

1818
import { ODP_EVENT_ACTION, ODP_DEFAULT_EVENT_TYPE, ERROR_MESSAGES } from '../lib/utils/enums';
19-
import { OdpConfig } from '../lib/core/odp/odp_config';
20-
import { Status } from '../lib/core/odp/odp_event_manager';
21-
import { BrowserOdpEventManager } from "../lib/plugins/odp/event_manager/index.browser";
22-
import { NodeOdpEventManager } from '../lib/plugins/odp/event_manager/index.node';
23-
import { OdpEventManager } from '../lib/core/odp/odp_event_manager';
19+
import { OdpConfig } from '../lib/odp/odp_config';
20+
import { Status } from '../lib/odp/event_manager/odp_event_manager';
21+
import { BrowserOdpEventManager } from '../lib/odp/event_manager/event_manager.browser';
22+
import { NodeOdpEventManager } from '../lib/odp/event_manager/event_manager.node';
23+
import { OdpEventManager } from '../lib/odp/event_manager/odp_event_manager';
2424
import { anything, capture, instance, mock, resetCalls, spy, verify, when } from 'ts-mockito';
25-
import { IOdpEventApiManager } from '../lib/core/odp/odp_event_api_manager';
25+
import { IOdpEventApiManager } from '../lib/odp/event_manager/odp_event_api_manager';
2626
import { LogHandler, LogLevel } from '../lib/modules/logging';
27-
import { OdpEvent } from '../lib/core/odp/odp_event';
28-
import { IUserAgentParser } from '../lib/core/odp/user_agent_parser';
29-
import { UserAgentInfo } from '../lib/core/odp/user_agent_info';
27+
import { OdpEvent } from '../lib/odp/event_manager/odp_event';
28+
import { IUserAgentParser } from '../lib/odp/ua_parser/user_agent_parser';
29+
import { UserAgentInfo } from '../lib/odp/ua_parser/user_agent_info';
3030
import { resolve } from 'path';
3131
import { advanceTimersByTime } from './testUtils';
3232

0 commit comments

Comments
 (0)