Skip to content

Commit 86a442a

Browse files
committed
[FSSDK-10950] restructure odp directories
1 parent 25a374d commit 86a442a

22 files changed

+72
-82
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import { createNotificationCenter } from './notification_center';
2626
import { OptimizelyDecideOption, Client, Config, OptimizelyOptions } from './shared_types';
2727
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 './odp/ua_parser.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/odp/event_manager/odp_event_manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { OdpEvent } from './odp_event';
2323
import { OdpConfig } from '../odp_config';
2424
import { IOdpEventApiManager } from './odp_event_api_manager';
2525
import { invalidOdpDataFound } from '../odp_utils';
26-
import { IUserAgentParser } from '../user_agent_parser';
26+
import { IUserAgentParser } from '../ua_parser/user_agent_parser';
2727
import { scheduleMicrotask } from '../../utils/microtask';
2828

2929
const MAX_RETRIES = 3;

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/odp/odp_manager.browser.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,18 @@ import { getLogger, LogHandler, LogLevel } from '../modules/logging';
2828
import { BrowserRequestHandler } from '../utils/http_request_handler/browser_request_handler';
2929

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

3433
import { VuidManager } from '../plugins/vuid_manager/index';
3534

36-
import { OdpManager } from '../../core/odp/odp_manager';
37-
import { OdpEvent } from '../../core/odp/odp_event';
35+
import { OdpManager } from './odp_manager';
36+
import { OdpEvent } from './event_manager/odp_event';
3837
import { IOdpEventManager, OdpOptions } from '../shared_types';
39-
import { BrowserOdpEventApiManager } from '../plugins/odp/event_api_manager/event_api_manager.browser';
40-
import { BrowserOdpEventManager } from '../plugins/odp/event_manager/event_manager.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';
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/odp/odp_manager.node.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import {
2626
REQUEST_TIMEOUT_ODP_SEGMENTS_MS,
2727
} from '../utils/enums';
2828

29-
import { OdpManager } from '../../core/odp/odp_manager';
29+
import { OdpManager } from './odp_manager';
3030
import { IOdpEventManager, OdpOptions } from '../shared_types';
31-
import { NodeOdpEventApiManager } from '../plugins/odp/event_api_manager/event_api_manager.node';
32-
import { NodeOdpEventManager } from '../plugins/odp/event_manager/event_manager.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';
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/odp/odp_manager.ts

Lines changed: 6 additions & 7 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';
22+
import { OdpIntegrationConfig, odpIntegrationsAreEqual } from './odp_config';
2423
import { IOdpEventManager } from './event_manager/odp_event_manager';
2524
import { IOdpSegmentManager } from './segment_manager/odp_segment_manager';
26-
import { OptimizelySegmentOption } from './optimizely_segment_option';
25+
import { OptimizelySegmentOption } from './segment_manager/optimizely_segment_option';
2726
import { invalidOdpDataFound } from './odp_utils';
2827
import { OdpEvent } from './event_manager/odp_event';
29-
import { resolvablePromise, ResolvablePromise } from '../../utils/promise/resolvablePromise';
28+
import { resolvablePromise, ResolvablePromise } from '../utils/promise/resolvablePromise';
3029

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

lib/odp/segment_manager/odp_segment_manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import { getLogger, LogHandler, LogLevel } from '../../modules/logging';
1818
import { ERROR_MESSAGES, ODP_USER_KEY } from '../../utils/enums';
1919
import { ICache } from '../../utils/lru_cache';
20-
import { IOdpSegmentApiManager } from '../odp_segment_api_manager';
20+
import { IOdpSegmentApiManager } from './odp_segment_api_manager';
2121
import { OdpConfig } from '../odp_config';
22-
import { OptimizelySegmentOption } from '../optimizely_segment_option';
22+
import { OptimizelySegmentOption } from './optimizely_segment_option';
2323

2424
export interface IOdpSegmentManager {
2525
fetchQualifiedSegments(

lib/odp/ua_parser.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 {

0 commit comments

Comments
 (0)