[FSSDK-10941] event processor files and directories cleanup - part 3

lib/core/decision_service/index.tests.js

@@ -32,7 +32,7 @@ import OptimizelyUserContext from '../../optimizely_user_context';
 import projectConfig, { createProjectConfig } from '../../project_config/project_config';
 import AudienceEvaluator from '../audience_evaluator';
 import errorHandler from '../../plugins/error_handler';
-import eventDispatcher from '../../event_processor/default_dispatcher.browser';
+import eventDispatcher from '../../event_processor/event_dispatcher/default_dispatcher.browser';
 import * as jsonSchemaValidator from '../../utils/json_schema_validator';
 import { getMockProjectConfigManager } from '../../tests/mock/mock_project_config_manager';
 

lib/event_processor/batch_event_processor.react_native.spec.ts

@@ -50,7 +50,7 @@ import { getMockRepeater } from '../tests/mock/mock_repeater';
 import { getMockAsyncCache } from '../tests/mock/mock_cache';
 
 import { EventWithId } from './batch_event_processor';
-import { buildLogEvent } from './event_builder/build_event_v1';
+import { buildLogEvent } from './event_builder/log_event';
 import { createImpressionEvent } from '../tests/mock/create_event';
 import { ProcessableEvent } from './event_processor';
 

lib/event_processor/batch_event_processor.spec.ts

@@ -19,7 +19,7 @@ import { EventWithId, BatchEventProcessor } from './batch_event_processor';
 import { getMockSyncCache } from '../tests/mock/mock_cache';
 import { createImpressionEvent } from '../tests/mock/create_event';
 import { ProcessableEvent } from './event_processor';
-import { buildLogEvent } from './event_builder/build_event_v1';
+import { buildLogEvent } from './event_builder/log_event';
 import { resolvablePromise } from '../utils/promise/resolvablePromise';
 import { advanceTimersByTime } from  '../../tests/testUtils';
 import { getMockLogger } from '../tests/mock/mock_logger';

lib/event_processor/batch_event_processor.ts

@@ -16,7 +16,7 @@
 
 import { EventProcessor, ProcessableEvent } from "./event_processor";
 import { Cache } from "../utils/cache/cache";
-import { EventDispatcher, EventDispatcherResponse, LogEvent } from "./event_dispatcher";
+import { EventDispatcher, EventDispatcherResponse, LogEvent } from "./event_dispatcher/event_dispatcher";
 import { buildLogEvent } from "./event_builder/log_event";
 import { BackoffController, ExponentialBackoff, IntervalRepeater, Repeater } from "../utils/repeater/repeater";
 import { LoggerFacade } from "../modules/logging";

lib/event_processor/event_builder/log_event.ts

@@ -20,7 +20,7 @@ import {
   UserEvent,
 } from './user_event';
 
-import { LogEvent } from '../event_dispatcher';
+import { LogEvent } from '../event_dispatcher/event_dispatcher';
 
 const ACTIVATE_EVENT_KEY = 'campaign_activated'
 const CUSTOM_ATTRIBUTE_FEATURE_TYPE = 'custom'

lib/event_processor/default_dispatcher.browser.spec.ts → lib/event_processor/event_dispatcher/default_dispatcher.browser.spec.ts

@@ -21,13 +21,13 @@ vi.mock('./default_dispatcher', () => {
   return { DefaultEventDispatcher };
 });
 
-vi.mock('../utils/http_request_handler/browser_request_handler', () => {
+vi.mock('../../utils/http_request_handler/browser_request_handler', () => {
   const BrowserRequestHandler = vi.fn();
   return { BrowserRequestHandler };
 });
 
 import { DefaultEventDispatcher } from './default_dispatcher';
-import { BrowserRequestHandler } from '../utils/http_request_handler/browser_request_handler';
+import { BrowserRequestHandler } from '../../utils/http_request_handler/browser_request_handler';
 import eventDispatcher from './default_dispatcher.browser';
 
 describe('eventDispatcher', () => {

lib/event_processor/default_dispatcher.browser.ts → lib/event_processor/event_dispatcher/default_dispatcher.browser.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { BrowserRequestHandler } from "../utils/http_request_handler/browser_request_handler";
+import { BrowserRequestHandler } from "../../utils/http_request_handler/browser_request_handler";
 import { EventDispatcher } from './event_dispatcher';
 import { DefaultEventDispatcher } from './default_dispatcher';
 

lib/event_processor/default_dispatcher.node.spec.ts → lib/event_processor/event_dispatcher/default_dispatcher.node.spec.ts

@@ -20,13 +20,13 @@ vi.mock('./default_dispatcher', () => {
   return { DefaultEventDispatcher };
 });
 
-vi.mock('../utils/http_request_handler/node_request_handler', () => {
+vi.mock('../../utils/http_request_handler/node_request_handler', () => {
   const NodeRequestHandler = vi.fn();
   return { NodeRequestHandler };
 });
 
 import { DefaultEventDispatcher } from './default_dispatcher';
-import { NodeRequestHandler } from '../utils/http_request_handler/node_request_handler';
+import { NodeRequestHandler } from '../../utils/http_request_handler/node_request_handler';
 import eventDispatcher from './default_dispatcher.node';
 
 describe('eventDispatcher', () => {

lib/event_processor/default_dispatcher.node.ts → lib/event_processor/event_dispatcher/default_dispatcher.node.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { EventDispatcher } from './event_dispatcher';
-import { NodeRequestHandler } from '../utils/http_request_handler/node_request_handler';
+import { NodeRequestHandler } from '../../utils/http_request_handler/node_request_handler';
 import { DefaultEventDispatcher } from './default_dispatcher';
 
 const eventDispatcher: EventDispatcher = new DefaultEventDispatcher(new NodeRequestHandler());

lib/event_processor/default_dispatcher.spec.ts → lib/event_processor/event_dispatcher/default_dispatcher.spec.ts

@@ -15,7 +15,7 @@
  */
 import { expect, vi, describe, it } from 'vitest';
 import { DefaultEventDispatcher } from './default_dispatcher';
-import { EventBatch } from './event_builder/build_event_v1';
+import { EventBatch } from '../event_builder/log_event';
 
 const getEvent = (): EventBatch => {
   return {

lib/event_processor/default_dispatcher.ts → lib/event_processor/event_dispatcher/default_dispatcher.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { RequestHandler } from '../utils/http_request_handler/http';
+import { RequestHandler } from '../../utils/http_request_handler/http';
 import { EventDispatcher, EventDispatcherResponse, LogEvent } from './event_dispatcher';
 
 export class DefaultEventDispatcher implements EventDispatcher {

lib/event_processor/event_dispatcher.ts → lib/event_processor/event_dispatcher/event_dispatcher.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { EventBatch } from "./event_builder/log_event";
+import { EventBatch } from "../event_builder/log_event";
 
 export type EventDispatcherResponse = {
   statusCode?: number  

lib/event_processor/event_processor.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ConversionEvent, ImpressionEvent } from './event_builder/user_event'
-import { LogEvent } from './event_dispatcher'
+import { LogEvent } from './event_dispatcher/event_dispatcher'
 import { getLogger } from '../modules/logging'
 import { Service } from '../service'
 import { Consumer, Fn } from '../utils/type';

lib/event_processor/event_processor_factory.browser.spec.ts

@@ -43,14 +43,14 @@ vi.mock('../utils/cache/cache', () => {
 });
 
 
-import defaultEventDispatcher from './default_dispatcher.browser';
+import defaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
 import { LocalStorageCache } from '../utils/cache/local_storage_cache.browser';
 import { SyncPrefixCache } from '../utils/cache/cache';
 import { createForwardingEventProcessor, createBatchEventProcessor } from './event_processor_factory.browser';
 import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_processor_factory';
-import sendBeaconEventDispatcher from './send_beacon_dispatcher.browser';
+import sendBeaconEventDispatcher from './event_dispatcher/send_beacon_dispatcher.browser';
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import browserDefaultEventDispatcher from './default_dispatcher.browser';
+import browserDefaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
 import { getBatchEventProcessor } from './event_processor_factory';
 
 describe('createForwardingEventProcessor', () => {

lib/event_processor/event_processor_factory.browser.ts

@@ -15,12 +15,12 @@
  */
 
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import { EventDispatcher } from './event_dispatcher';
+import { EventDispatcher } from './event_dispatcher/event_dispatcher';
 import { EventProcessor } from './event_processor';
 import { EventWithId } from './batch_event_processor';
 import { getBatchEventProcessor, BatchEventProcessorOptions } from './event_processor_factory';
-import defaultEventDispatcher from './default_dispatcher.browser';
-import sendBeaconEventDispatcher from './send_beacon_dispatcher.browser';
+import defaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
+import sendBeaconEventDispatcher from './event_dispatcher/send_beacon_dispatcher.browser';
 import { LocalStorageCache } from '../utils/cache/local_storage_cache.browser';
 import { SyncPrefixCache } from '../utils/cache/cache';
 import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_processor_factory';

lib/event_processor/event_processor_factory.node.spec.ts

@@ -42,7 +42,7 @@ vi.mock('../utils/cache/cache', () => {
 
 import { createBatchEventProcessor, createForwardingEventProcessor } from './event_processor_factory.node';
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import nodeDefaultEventDispatcher from './default_dispatcher.node';
+import nodeDefaultEventDispatcher from './event_dispatcher/default_dispatcher.node';
 import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_processor_factory';
 import { getBatchEventProcessor } from './event_processor_factory';
 import { AsyncCache, AsyncPrefixCache, SyncCache, SyncPrefixCache } from '../utils/cache/cache';

lib/event_processor/event_processor_factory.node.ts

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import { EventDispatcher } from './event_dispatcher';
+import { EventDispatcher } from './event_dispatcher/event_dispatcher';
 import { EventProcessor } from './event_processor';
-import defaultEventDispatcher from './default_dispatcher.node';
+import defaultEventDispatcher from './event_dispatcher/default_dispatcher.node';
 import { BatchEventProcessorOptions, FAILED_EVENT_RETRY_INTERVAL, getBatchEventProcessor, getPrefixEventStore } from './event_processor_factory';
 
 export const createForwardingEventProcessor = (

lib/event_processor/event_processor_factory.react_native.spec.ts

@@ -67,7 +67,7 @@ async function mockRequireNetInfo() {
 
 import { createForwardingEventProcessor, createBatchEventProcessor } from './event_processor_factory.react_native';
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import defaultEventDispatcher from './default_dispatcher.browser';
+import defaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
 import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_processor_factory';
 import { getBatchEventProcessor } from './event_processor_factory';
 import { AsyncCache, AsyncPrefixCache, SyncCache, SyncPrefixCache } from '../utils/cache/cache';

lib/event_processor/event_processor_factory.react_native.ts

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import { EventDispatcher } from './event_dispatcher';
+import { EventDispatcher } from './event_dispatcher/event_dispatcher';
 import { EventProcessor } from './event_processor';
-import defaultEventDispatcher from './default_dispatcher.browser';
+import defaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
 import { BatchEventProcessorOptions, getBatchEventProcessor, getPrefixEventStore } from './event_processor_factory';
 import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_processor_factory';
 import { AsyncPrefixCache } from '../utils/cache/cache';

lib/event_processor/event_processor_factory.ts

@@ -17,7 +17,7 @@
 import { LogLevel } from "../common_exports";
 import { StartupLog } from "../service";
 import { ExponentialBackoff, IntervalRepeater } from "../utils/repeater/repeater";
-import { EventDispatcher } from "./event_dispatcher";
+import { EventDispatcher } from "./event_dispatcher/event_dispatcher";
 import { EventProcessor } from "./event_processor";
 import { BatchEventProcessor, EventWithId, RetryConfig } from "./batch_event_processor";
 import { AsyncPrefixCache, Cache, SyncPrefixCache } from "../utils/cache/cache";

lib/event_processor/forwarding_event_processor.spec.ts

@@ -16,8 +16,8 @@
 import { expect, describe, it, vi } from 'vitest';
 
 import { getForwardingEventProcessor } from './forwarding_event_processor';
-import { EventDispatcher } from './event_dispatcher';
-import { buildLogEvent, makeEventBatch } from './event_builder/build_event_v1';
+import { EventDispatcher } from './event_dispatcher/event_dispatcher';
+import { buildLogEvent, makeEventBatch } from './event_builder/log_event';
 import { createImpressionEvent } from '../tests/mock/create_event';
 import { ServiceState } from '../service';
 

lib/event_processor/forwarding_event_processor.ts

@@ -15,7 +15,7 @@
  */
 
 
-import { LogEvent } from './event_dispatcher';
+import { LogEvent } from './event_dispatcher/event_dispatcher';
 import { EventProcessor, ProcessableEvent } from './event_processor';
 
 import { EventDispatcher } from '../shared_types';

lib/index.browser.ts

@@ -18,8 +18,8 @@ import logHelper from './modules/logging/logger';
 import { getLogger, setErrorHandler, getErrorHandler, LogLevel } from './modules/logging';
 import configValidator from './utils/config_validator';
 import defaultErrorHandler from './plugins/error_handler';
-import defaultEventDispatcher from './event_processor/default_dispatcher.browser';
-import sendBeaconEventDispatcher from './event_processor/send_beacon_dispatcher.browser';
+import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.browser';
+import sendBeaconEventDispatcher from './event_processor/event_dispatcher/send_beacon_dispatcher.browser';
 import * as enums from './utils/enums';
 import * as loggerPlugin from './plugins/logger';
 import { createNotificationCenter } from './core/notification_center';

lib/index.node.ts

@@ -20,7 +20,7 @@ import * as enums from './utils/enums';
 import * as loggerPlugin from './plugins/logger';
 import configValidator from './utils/config_validator';
 import defaultErrorHandler from './plugins/error_handler';
-import defaultEventDispatcher from './event_processor/default_dispatcher.node';
+import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.node';
 import { createNotificationCenter } from './core/notification_center';
 import { OptimizelyDecideOption, Client, Config } from './shared_types';
 import { NodeOdpManager } from './plugins/odp_manager/index.node';

lib/index.react_native.ts

@@ -20,7 +20,7 @@ import Optimizely from './optimizely';
 import configValidator from './utils/config_validator';
 import defaultErrorHandler from './plugins/error_handler';
 import * as loggerPlugin from './plugins/logger/index.react_native';
-import defaultEventDispatcher from './event_processor/default_dispatcher.browser';
+import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.browser';
 import { createNotificationCenter } from './core/notification_center';
 import { OptimizelyDecideOption, Client, Config } from './shared_types';
 import { BrowserOdpManager } from './plugins/odp_manager/index.browser';

lib/shared_types.ts

@@ -38,10 +38,10 @@ import { IUserAgentParser } from './core/odp/user_agent_parser';
 import PersistentCache from './plugins/key_value_cache/persistentKeyValueCache';
 import { ProjectConfig } from './project_config/project_config';
 import { ProjectConfigManager } from './project_config/project_config_manager';
-import { EventDispatcher } from './event_processor/event_dispatcher';
+import { EventDispatcher } from './event_processor/event_dispatcher/event_dispatcher';
 import { EventProcessor } from './event_processor/event_processor';
 
-export { EventDispatcher } from './event_processor/event_dispatcher';
+export { EventDispatcher } from './event_processor/event_dispatcher/event_dispatcher';
 export { EventProcessor } from './event_processor/event_processor';
 export interface BucketerParams {
   experimentId: string;