Changed IStorage to non-generic

Content type is not enforced, and we use one common storage for heterogeneous data (events and configuration data).

Author: frankebersoll

src/configuration/Configuration.ts

@@ -76,7 +76,7 @@ export class Configuration implements IConfigurationSettings {
    */
   public settings: Object = {};
 
-  public storage: IStorage<Object>;
+  public storage: IStorage;
 
   public queue: IEventQueue;
 
@@ -106,7 +106,7 @@ export class Configuration implements IConfigurationSettings {
     this.submissionBatchSize = inject(configSettings.submissionBatchSize) || 50;
     this.submissionAdapter = inject(configSettings.submissionAdapter);
     this.submissionClient = inject(configSettings.submissionClient) || new DefaultSubmissionClient();
-    this.storage = inject(configSettings.storage) || new InMemoryStorage<any>();
+    this.storage = inject(configSettings.storage) || new InMemoryStorage();
     this.queue = inject(configSettings.queue) || new DefaultEventQueue(this);
 
     SettingsManager.applySavedServerSettings(this);

src/configuration/IConfigurationSettings.ts

@@ -21,6 +21,6 @@ export interface IConfigurationSettings {
   submissionBatchSize?: number;
   submissionClient?: ISubmissionClient;
   submissionAdapter?: ISubmissionAdapter;
-  storage?: IStorage<any>;
+  storage?: IStorage;
   queue?: IEventQueue;
 }

src/storage/IStorage.ts

@@ -1,8 +1,8 @@
 import { IStorageItem } from './IStorageItem';
 
-export interface IStorage<T> {
-  save(path: string, value: T): boolean;
-  get(path: string): T;
-  getList(searchPattern?: string, limit?: number): IStorageItem<T>[];
+export interface IStorage {
+  save(path: string, value: any): boolean;
+  get(path: string): any;
+  getList(searchPattern?: string, limit?: number): IStorageItem[];
   remove(path: string): void;
 }

src/storage/IStorageItem.ts

@@ -1,5 +1,5 @@
-export interface IStorageItem<T> {
+export interface IStorageItem {
   created: number;
   path: string;
-  value: T;
+  value: any;
 }

src/storage/InMemoryStorage-spec.ts

@@ -5,7 +5,7 @@ import { expect } from 'chai';
 
 describe('InMemoryStorage', () => {
   it('should save events', () => {
-    let storage = new InMemoryStorage<IEvent>();
+    let storage = new InMemoryStorage();
     let key = 'ex-q-';
     let event1: IEvent = { type: 'log', reference_id: key + '123454321' };
     let event2: IEvent = { type: 'log', reference_id: key + '098765432' };
@@ -20,15 +20,15 @@ describe('InMemoryStorage', () => {
   });
 
   it('should save once', () => {
-    let storage = new InMemoryStorage<number>();
+    let storage = new InMemoryStorage();
     storage.save('one', 1);
     expect(storage.getList().length).to.equal(1);
     storage.save('one', 1);
     expect(storage.getList().length).to.equal(1);
   });
 
   it('should get by key', () => {
-    let storage = new InMemoryStorage<any>();
+    let storage = new InMemoryStorage();
     storage.save('ex-server-settings.json-version', 1);
     storage.save('ex-server-settings.json', { exist: true });
     expect(storage.getList().length).to.equal(2);
@@ -37,7 +37,7 @@ describe('InMemoryStorage', () => {
   });
 
   it('should get saved events', () => {
-    let storage = new InMemoryStorage<IEvent>();
+    let storage = new InMemoryStorage();
     let key = 'ex-q-';
     let event1: IEvent = { type: 'log', reference_id: key + '11' };
     let event2: IEvent = { type: 'log', reference_id: key + '12' };
@@ -81,7 +81,7 @@ describe('InMemoryStorage', () => {
   });
 
   it('should clear all events', () => {
-    let storage = new InMemoryStorage<IEvent>();
+    let storage = new InMemoryStorage();
     let key = 'ex-q-';
     let event1: IEvent = { type: 'log', reference_id: key + '11' };
     let event2: IEvent = { type: 'log', reference_id: key + '12' };
@@ -111,7 +111,7 @@ describe('InMemoryStorage', () => {
   });
 
   it('should get with limit', () => {
-    let storage = new InMemoryStorage<IEvent>(250);
+    let storage = new InMemoryStorage(250);
     for (let index: number = 0; index < 260; index++) {
       storage.save('ex-q-' + index, { type: 'log', reference_id: index.toString() });
     }
@@ -127,7 +127,7 @@ describe('InMemoryStorage', () => {
     }
 
     const DATE: Date = new Date();
-    let storage = new InMemoryStorage<IEvent>();
+    let storage = new InMemoryStorage();
     for (let index: number = 0; index < 10; index++) {
       storage.save('ex-q-' + index, {
         date: getDate(DATE, index),
@@ -139,7 +139,7 @@ describe('InMemoryStorage', () => {
     }
 
     let offset: number = 0;
-    let events: IStorageItem<IEvent>[] = storage.getList('ex-q-', 2);
+    let events: IStorageItem[] = storage.getList('ex-q-', 2);
     while (events && events.length > 0) {
       expect(2).to.equal(events.length);
       for (let ei = 0; ei < 2; ei++) {
@@ -152,12 +152,12 @@ describe('InMemoryStorage', () => {
   });
 
   it('should respect max items limit', () => {
-    let storage = new InMemoryStorage<IEvent>(5);
+    let storage = new InMemoryStorage(5);
     for (let index: number = 0; index < 5; index++) {
       storage.save('ex-q-' + index, { type: 'log', reference_id: index.toString() });
     }
 
-    let events: IStorageItem<IEvent>[] = storage.getList();
+    let events: IStorageItem[] = storage.getList();
     expect(events.length).to.equal(5);
     expect(events[0].path).to.equal('ex-q-0');
     storage.save('ex-q-6', { type: 'log', reference_id: '6' });

src/storage/InMemoryStorage.ts

@@ -1,15 +1,15 @@
 import { IStorage } from './IStorage';
 import { IStorageItem } from './IStorageItem';
 
-export class InMemoryStorage<T> implements IStorage<T> {
-  private _items: IStorageItem<T>[] = [];
+export class InMemoryStorage implements IStorage {
+  private _items: IStorageItem[] = [];
   private _maxItems: number;
 
   constructor(maxItems?: number) {
     this._maxItems = maxItems > 0 ? maxItems : 250;
   }
 
-  public save(path: string, value: T): boolean {
+  public save(path: string, value: any): boolean {
     if (!path || !value) {
       return false;
     }
@@ -22,19 +22,19 @@ export class InMemoryStorage<T> implements IStorage<T> {
     return true;
   }
 
-  public get(path: string): T {
-    let item: IStorageItem<T> = path ? this.getList(`^${path}$`, 1)[0] : null;
+  public get(path: string): any {
+    let item: IStorageItem = path ? this.getList(`^${path}$`, 1)[0] : null;
     return item ? item.value : null;
   }
 
-  public getList(searchPattern?: string, limit?: number): IStorageItem<T>[] {
+  public getList(searchPattern?: string, limit?: number): IStorageItem[] {
     let items = this._items; // Optimization for minifier
     if (!searchPattern) {
       return items.slice(0, limit);
     }
 
     let regex = new RegExp(searchPattern);
-    let results: IStorageItem<T>[] = [];
+    let results: IStorageItem[] = [];
     for (let index = 0; index < items.length; index++) {
       if (regex.test(items[index].path)) {
         results.push(items[index]);