@adonoustech/bacon-core 5.0.0 → 6.0.0

package/src/base/BaconBaseActorInitTrigSvc.ts

@@ -1,48 +1,48 @@
-import { BaconBaseActor } from "./BaconBaseActor";
-
-export abstract class BaconBaseActorInitTriggerService {
-
-    actor: BaconBaseActor | undefined;
-
-    /**
-     *
-     * @override
-     * @memberof BaconBaseActorInitializer
-     */
-    cacheActor(): void {}
-
-    /**
-     * @override
-     * @memberof BaconBaseActorInitializer
-     */
-    logActorAccess(): void {}
-
-    /**
-     *
-     * @override
-     * @memberof BaconBaseActorInitializer
-     */
-    storeActorOIDC(): void {}
-
-    /**
-     *
-     * @override
-     * @memberof BaconBaseActorInitializer
-     */
-    logActorFederatedId(): void {}
-
-    /**
-     *
-     * @override
-     * @memberof BaconBaseActorInitializer
-     */
-    sendActorWelcomeEmail(): void {}
-
-    /**
-     *
-     * @override
-     * @memberof BaconBaseActorInitializer
-     */
-    setActorInitializationFlag(): void {}
-
+import { BaconBaseActor } from "./BaconBaseActor";
+
+export abstract class BaconBaseActorInitTriggerService {
+
+    actor: BaconBaseActor | undefined;
+
+    /**
+     *
+     * @override
+     * @memberof BaconBaseActorInitializer
+     */
+    cacheActor(): void {}
+
+    /**
+     * @override
+     * @memberof BaconBaseActorInitializer
+     */
+    logActorAccess(): void {}
+
+    /**
+     *
+     * @override
+     * @memberof BaconBaseActorInitializer
+     */
+    storeActorOIDC(): void {}
+
+    /**
+     *
+     * @override
+     * @memberof BaconBaseActorInitializer
+     */
+    logActorFederatedId(): void {}
+
+    /**
+     *
+     * @override
+     * @memberof BaconBaseActorInitializer
+     */
+    sendActorWelcomeEmail(): void {}
+
+    /**
+     *
+     * @override
+     * @memberof BaconBaseActorInitializer
+     */
+    setActorInitializationFlag(): void {}
+
 }

package/src/base/BaconBaseBrokerRequestEvent.ts

@@ -1,14 +1,14 @@
-import { BaconBusinessLayerKinds } from "../enums";
-
-export abstract class BaconBaseBrokerRequestEvent {
-
-    kind: BaconBusinessLayerKinds | undefined;
-    inputCommand: any
-    
-    constructor(kind: BaconBusinessLayerKinds,
-                inputCommand: any) {
-                    this.kind = kind;
-                    this.inputCommand = inputCommand;
-                }
-
+import { BaconBusinessLayerKinds } from "../enums";
+
+export abstract class BaconBaseBrokerRequestEvent {
+
+    kind: BaconBusinessLayerKinds | undefined;
+    inputCommand: any
+    
+    constructor(kind: BaconBusinessLayerKinds,
+                inputCommand: any) {
+                    this.kind = kind;
+                    this.inputCommand = inputCommand;
+                }
+
 }

package/src/base/BaconBaseLoggerEvt.ts

@@ -1,16 +1,16 @@
-import { BaconLoggerCodes } from "../enums/bacon-logger-codes";
-import { BaconLoggerEventTypes } from "../enums/bacon-logger-evt-types";
-import { BaconBaseActor } from "./BaconBaseActor";
-import { BaconBusinessLayerKinds } from "../enums/bacon-bl-kinds";
-
-export abstract class BaconBaseLoggerEvent {
-    
-    actor: BaconBaseActor | undefined;
-    explanation: BaconLoggerCodes | undefined;
-    eventType: BaconLoggerEventTypes | undefined;
-    kind: BaconBusinessLayerKinds | undefined;
-    timestamp: string | undefined;
-
-    constructor() {}
-
+import { BaconLoggerCodes } from "../enums/bacon-logger-codes";
+import { BaconLoggerEventTypes } from "../enums/bacon-logger-evt-types";
+import { BaconBaseActor } from "./BaconBaseActor";
+import { BaconBusinessLayerKinds } from "../enums/bacon-bl-kinds";
+
+export abstract class BaconBaseLoggerEvent {
+    
+    actor: BaconBaseActor | undefined;
+    explanation: BaconLoggerCodes | undefined;
+    eventType: BaconLoggerEventTypes | undefined;
+    kind: BaconBusinessLayerKinds | undefined;
+    timestamp: string | undefined;
+
+    constructor() {}
+
 }

package/src/base/BaconBaseLoggerEvtFact.ts

@@ -1,22 +1,22 @@
-import { BaconGenericLoggerEvent } from "../concrete/BaconGenericLoggerEvent";
-import { BaconLoggerEventTypes } from "../enums/bacon-logger-evt-types";
-import { BaconBaseLoggerEvent } from "./BaconBaseLoggerEvt";
-
-export abstract class BaconBaseLoggerEventFactory {
-    
-    constructor() {}
-
-    /**
-     * By default, returns
-     * a constructed generic logger event. Individual factories
-     * extend this class to create specific instances of concrete
-     * logger events. See BaconGenericLoggerEventFactory 
-     * @returns {BaconBaseLoggerEvent}
-     * @memberof BaconBaseLoggerEventFactory
-     */
-    createLoggerEvent(): BaconBaseLoggerEvent {
-
-        return new BaconGenericLoggerEvent();
-
-    }
+import { BaconGenericLoggerEvent } from "../concrete/BaconGenericLoggerEvent";
+import { BaconLoggerEventTypes } from "../enums/bacon-logger-evt-types";
+import { BaconBaseLoggerEvent } from "./BaconBaseLoggerEvt";
+
+export abstract class BaconBaseLoggerEventFactory {
+    
+    constructor() {}
+
+    /**
+     * By default, returns
+     * a constructed generic logger event. Individual factories
+     * extend this class to create specific instances of concrete
+     * logger events. See BaconGenericLoggerEventFactory 
+     * @returns {BaconBaseLoggerEvent}
+     * @memberof BaconBaseLoggerEventFactory
+     */
+    createLoggerEvent(): BaconBaseLoggerEvent {
+
+        return new BaconGenericLoggerEvent();
+
+    }
 }

package/src/base/index.ts

@@ -1,7 +1,7 @@
-export * from './BaconBaseActor';
-export * from './BaconBaseActorFactory';
-export * from './BaconBaseActorInitTrigSvc';
-export * from './BaconBaseAWSObjectStrategyEvt';
-export * from './BaconBaseBrokerRequestEvent';
-export * from './BaconBaseLoggerEvt';
+export * from './BaconBaseActor';
+export * from './BaconBaseActorFactory';
+export * from './BaconBaseActorInitTrigSvc';
+export * from './BaconBaseAWSObjectStrategyEvt';
+export * from './BaconBaseBrokerRequestEvent';
+export * from './BaconBaseLoggerEvt';
 export * from './BaconBaseLoggerEvtFact';

package/src/concrete/Bacon3PClient.ts

@@ -1,10 +1,10 @@
-import { BaconBaseActor } from "../base/BaconBaseActor";
-import { IOIDCProfile } from "../interfaces/i-oidc-profile";
-
-export class Bacon3PClient extends BaconBaseActor {
-    constructor(profile: IOIDCProfile) {
-        super(profile)
-    }
-
-    //TODO: Implement
+import { BaconBaseActor } from "../base/BaconBaseActor";
+import { IOIDCProfile } from "../interfaces/i-oidc-profile";
+
+export class Bacon3PClient extends BaconBaseActor {
+    constructor(profile: IOIDCProfile) {
+        super(profile)
+    }
+
+    //TODO: Implement
 }

package/src/concrete/BaconAccessLoggerEvent.ts

@@ -1,10 +1,10 @@
-import { BaconBaseLoggerEvent } from "../base/BaconBaseLoggerEvt";
-import { BaconBusinessLayerKinds, BaconLoggerEventTypes } from "../enums";
-
-export class BaconAccessLoggerEvent extends BaconBaseLoggerEvent {
-    constructor() {
-        super();
-        this.eventType = BaconLoggerEventTypes.ACCESS;
-        this.kind = BaconBusinessLayerKinds.BaconAccessLoggerEvent;
-    }
+import { BaconBaseLoggerEvent } from "../base/BaconBaseLoggerEvt";
+import { BaconBusinessLayerKinds, BaconLoggerEventTypes } from "../enums";
+
+export class BaconAccessLoggerEvent extends BaconBaseLoggerEvent {
+    constructor() {
+        super();
+        this.eventType = BaconLoggerEventTypes.ACCESS;
+        this.kind = BaconBusinessLayerKinds.BaconAccessLoggerEvent;
+    }
 }

package/src/concrete/BaconActionItem.ts

@@ -1,38 +1,38 @@
-import { IBaconActionItemSettings } from "../interfaces";
-
-export class BaconActionItem {
-    acknowledgedEntryTime?: string;
-    acknowledgedExitTime?: string;
-    actor?: string;
-    actorSub?: string;
-    actionExplanation?: string;
-    actionId?: string;
-    actionInstanceId?: string;
-    actionInstruction?: string;
-    actionName?: string;
-    actionRecipient?: any;
-    correspondence?: any[];
-    completedEntryTime?: string;
-    completedExitTime?: string;
-    createdEntryTime?: string;
-    createdExitTime?: string;
-    creator?: string;
-    draftStateEntryTime?: string;
-    draftStateExitTime?: string;
-    emailCustomSnippet?: string;
-    emailDataTemplate?: any;
-    emailFrom?: string;
-    emailTemplate?: string;
-    FromDate?: string;
-    lifeCycle?: "Draft" | "Created" | "Acknowledged" | "Submitted" | "Completed";
-    serviceId?: string;
-    serviceName?: string;
-    selectionCondition?: string;
-    severity?: "Low" | "Normal" | "High" | "Critical";
-    settings?: IBaconActionItemSettings;
-    submittedEntryTime?: string;
-    submittedExitTime?: string;
-    ToDate?: string;
-    Transactions?: any[];
-    TransactionAmount?: number;
+import { IBaconActionItemSettings } from "../interfaces";
+
+export class BaconActionItem {
+    acknowledgedEntryTime?: string;
+    acknowledgedExitTime?: string;
+    actor?: string;
+    actorSub?: string;
+    actionExplanation?: string;
+    actionId?: string;
+    actionInstanceId?: string;
+    actionInstruction?: string;
+    actionName?: string;
+    actionRecipient?: any;
+    correspondence?: any[];
+    completedEntryTime?: string;
+    completedExitTime?: string;
+    createdEntryTime?: string;
+    createdExitTime?: string;
+    creator?: string;
+    draftStateEntryTime?: string;
+    draftStateExitTime?: string;
+    emailCustomSnippet?: string;
+    emailDataTemplate?: any;
+    emailFrom?: string;
+    emailTemplate?: string;
+    FromDate?: string;
+    lifeCycle?: "Draft" | "Created" | "Acknowledged" | "Submitted" | "Completed";
+    serviceId?: string;
+    serviceName?: string;
+    selectionCondition?: string;
+    severity?: "Low" | "Normal" | "High" | "Critical";
+    settings?: IBaconActionItemSettings;
+    submittedEntryTime?: string;
+    submittedExitTime?: string;
+    ToDate?: string;
+    Transactions?: any[];
+    TransactionAmount?: number;
 }

package/src/concrete/BaconActionItemSnippet.ts

@@ -1,15 +1,15 @@
-export class BaconActionItemSnippet {
-
-    snippetId: string;
-    snippetHeader: string;
-    snippetText: string;
-    snippetModifiedDate: string;
-
-    constructor(snippetId: string, snippetHeader: string, snippetText: string, snippetModifiedDate: string) {
-        this.snippetId = snippetId;
-        this.snippetHeader = snippetHeader
-        this.snippetText = snippetText;
-        this.snippetModifiedDate = snippetModifiedDate;
-    }
-
+export class BaconActionItemSnippet {
+
+    snippetId: string;
+    snippetHeader: string;
+    snippetText: string;
+    snippetModifiedDate: string;
+
+    constructor(snippetId: string, snippetHeader: string, snippetText: string, snippetModifiedDate: string) {
+        this.snippetId = snippetId;
+        this.snippetHeader = snippetHeader
+        this.snippetText = snippetText;
+        this.snippetModifiedDate = snippetModifiedDate;
+    }
+
 }

package/src/concrete/BaconAdminInitRequestEvt.ts

@@ -1,17 +1,17 @@
-import { BaconBaseBrokerRequestEvent } from "../base";
-import { BaconBusinessLayerKinds } from "../enums";
-import { IBaconActorInitTriggerEvent } from "../interfaces";
-
-export class BaconAdminInitRequestEvent extends BaconBaseBrokerRequestEvent {
-
-    payload: IBaconActorInitTriggerEvent | undefined;
-
-    constructor(payload: IBaconActorInitTriggerEvent) {
-        super(BaconBusinessLayerKinds.BaconAdminInitRequestEvent,
-              payload);
-
-        this.kind = BaconBusinessLayerKinds.BaconAdminInitRequestEvent;
-        this.payload = payload;
-    }
-
+import { BaconBaseBrokerRequestEvent } from "../base";
+import { BaconBusinessLayerKinds } from "../enums";
+import { IBaconActorInitTriggerEvent } from "../interfaces";
+
+export class BaconAdminInitRequestEvent extends BaconBaseBrokerRequestEvent {
+
+    payload: IBaconActorInitTriggerEvent | undefined;
+
+    constructor(payload: IBaconActorInitTriggerEvent) {
+        super(BaconBusinessLayerKinds.BaconAdminInitRequestEvent,
+              payload);
+
+        this.kind = BaconBusinessLayerKinds.BaconAdminInitRequestEvent;
+        this.payload = payload;
+    }
+
 }

package/src/concrete/BaconAiContextCompletionReqEvt.ts

@@ -1,11 +1,11 @@
-import { BaconBaseBrokerRequestEvent } from "../base";
-import { BaconAITaskDescriptions, BaconBusinessLayerKinds } from "../enums";
-
-export class BaconAiContextCompletionRequest extends BaconBaseBrokerRequestEvent {
-
-    context: string | undefined;
-    task: BaconAITaskDescriptions | undefined;
-
-    constructor() { super(BaconBusinessLayerKinds.BaconAIContextCompletionRequest, undefined); }
-
+import { BaconBaseBrokerRequestEvent } from "../base";
+import { BaconAITaskDescriptions, BaconBusinessLayerKinds } from "../enums";
+
+export class BaconAiContextCompletionRequest extends BaconBaseBrokerRequestEvent {
+
+    context: string | undefined;
+    task: BaconAITaskDescriptions | undefined;
+
+    constructor() { super(BaconBusinessLayerKinds.BaconAIContextCompletionRequest, undefined); }
+
 }

package/src/concrete/BaconCognitoAdminRequestEvent.ts

@@ -1,14 +1,14 @@
-import { BaconBaseBrokerRequestEvent } from "../base";
-import { BaconBusinessLayerKinds } from "../enums";
-import {
-  BaconCognitoAdminRequestPayload,
-  BaconCognitoRequest,
-} from "../interfaces";
-
-export class BaconCognitoAdminRequestEvent extends BaconBaseBrokerRequestEvent {
-  request: BaconCognitoRequest | undefined;
-
-  constructor(payload: BaconCognitoAdminRequestPayload) {
-    super(BaconBusinessLayerKinds.BaconCognitoAdminRequestEvent, payload);
-  }
-}
+import { BaconBaseBrokerRequestEvent } from "../base";
+import { BaconBusinessLayerKinds } from "../enums";
+import {
+  BaconCognitoAdminRequestPayload,
+  BaconCognitoRequest,
+} from "../interfaces";
+
+export class BaconCognitoAdminRequestEvent extends BaconBaseBrokerRequestEvent {
+  request: BaconCognitoRequest | undefined;
+
+  constructor(payload: BaconCognitoAdminRequestPayload) {
+    super(BaconBusinessLayerKinds.BaconCognitoAdminRequestEvent, payload);
+  }
+}

package/src/concrete/BaconEmailRequestEvent.ts

@@ -1,9 +1,9 @@
-import { SendEmailCommandInput } from "@aws-sdk/client-sesv2";
-import { BaconBaseBrokerRequestEvent } from "../base";
-import { BaconBusinessLayerKinds } from "../enums";
-
-export class BaconEmailRequestEvent extends BaconBaseBrokerRequestEvent {
-  constructor(inputCommand: SendEmailCommandInput) {
-    super(BaconBusinessLayerKinds.BaconEmailRequestEvent, inputCommand);
-  }
-}
+import { SendEmailCommandInput } from "@aws-sdk/client-sesv2";
+import { BaconBaseBrokerRequestEvent } from "../base";
+import { BaconBusinessLayerKinds } from "../enums";
+
+export class BaconEmailRequestEvent extends BaconBaseBrokerRequestEvent {
+  constructor(inputCommand: SendEmailCommandInput) {
+    super(BaconBusinessLayerKinds.BaconEmailRequestEvent, inputCommand);
+  }
+}

package/src/concrete/BaconGenericLoggerEvent.ts

@@ -1,10 +1,10 @@
-import { BaconBaseLoggerEvent } from "../base/BaconBaseLoggerEvt";
-import { BaconBusinessLayerKinds, BaconLoggerEventTypes } from "../enums";
-
-export class BaconGenericLoggerEvent extends BaconBaseLoggerEvent {
-    constructor() {
-        super();
-        this.eventType = BaconLoggerEventTypes.GENERIC;
-        this.kind = BaconBusinessLayerKinds.BaconGenericLoggerEvent;
-    }
-}
+import { BaconBaseLoggerEvent } from "../base/BaconBaseLoggerEvt";
+import { BaconBusinessLayerKinds, BaconLoggerEventTypes } from "../enums";
+
+export class BaconGenericLoggerEvent extends BaconBaseLoggerEvent {
+    constructor() {
+        super();
+        this.eventType = BaconLoggerEventTypes.GENERIC;
+        this.kind = BaconBusinessLayerKinds.BaconGenericLoggerEvent;
+    }
+}

package/src/concrete/BaconIoTPermsBrokerRequestEvent.ts

@@ -1,13 +1,13 @@
-import { BaconBaseBrokerRequestEvent } from "../base/BaconBaseBrokerRequestEvent";
-import { BaconBusinessLayerKinds } from "../enums";
-import { BaconIOTPermsRequestPayload } from "../interfaces";
-
-export class BaconIoTPermsBrokerRequestEvent extends BaconBaseBrokerRequestEvent {
-
-    userSub: string | undefined;
-
-    constructor(payload: BaconIOTPermsRequestPayload) {
-        super(BaconBusinessLayerKinds.BaconIOTPermsRequestEvent,
-              payload);  // none of the base class properties are being used except for the kind
-    }
+import { BaconBaseBrokerRequestEvent } from "../base/BaconBaseBrokerRequestEvent";
+import { BaconBusinessLayerKinds } from "../enums";
+import { BaconIOTPermsRequestPayload } from "../interfaces";
+
+export class BaconIoTPermsBrokerRequestEvent extends BaconBaseBrokerRequestEvent {
+
+    userSub: string | undefined;
+
+    constructor(payload: BaconIOTPermsRequestPayload) {
+        super(BaconBusinessLayerKinds.BaconIOTPermsRequestEvent,
+              payload);  // none of the base class properties are being used except for the kind
+    }
 }

package/src/concrete/BaconPermissionsLoggerEvent.ts

@@ -1,10 +1,10 @@
-import { BaconBaseLoggerEvent } from "../base";
-import { BaconBusinessLayerKinds, BaconLoggerEventTypes } from "../enums";
-
-export class BaconPermissionsLoggerEvent extends BaconBaseLoggerEvent {
-    constructor() {
-        super();
-        this.eventType = BaconLoggerEventTypes.PERMISSIONS;
-        this.kind = BaconBusinessLayerKinds.BaconPermissionsLoggerEvent;
-    }
+import { BaconBaseLoggerEvent } from "../base";
+import { BaconBusinessLayerKinds, BaconLoggerEventTypes } from "../enums";
+
+export class BaconPermissionsLoggerEvent extends BaconBaseLoggerEvent {
+    constructor() {
+        super();
+        this.eventType = BaconLoggerEventTypes.PERMISSIONS;
+        this.kind = BaconBusinessLayerKinds.BaconPermissionsLoggerEvent;
+    }
 }

package/src/concrete/BaconS3GetObjectStrategy.ts

@@ -1,14 +1,14 @@
-import { GetObjectCommandInput } from "@aws-sdk/client-s3";
-import { BaconBaseAWSObjectStrategyEvt } from "../base";
-import { BaconAWSObjectRequestInstructions } from "../enums";
-import { BaconObjectLayerKinds } from "../enums";
-
-export class BaconS3GetObjectStrategy extends BaconBaseAWSObjectStrategyEvt {
-  constructor(inputCommand: GetObjectCommandInput) {
-    super(
-      BaconAWSObjectRequestInstructions.GET_OBJECT,
-      BaconObjectLayerKinds.BaconS3GetObjectStrategy,
-      inputCommand
-    );
-  }
-}
+import { GetObjectCommandInput } from "@aws-sdk/client-s3";
+import { BaconBaseAWSObjectStrategyEvt } from "../base";
+import { BaconAWSObjectRequestInstructions } from "../enums";
+import { BaconObjectLayerKinds } from "../enums";
+
+export class BaconS3GetObjectStrategy extends BaconBaseAWSObjectStrategyEvt {
+  constructor(inputCommand: GetObjectCommandInput) {
+    super(
+      BaconAWSObjectRequestInstructions.GET_OBJECT,
+      BaconObjectLayerKinds.BaconS3GetObjectStrategy,
+      inputCommand
+    );
+  }
+}

package/src/concrete/BaconS3PutObjectStrategy.ts

@@ -1,14 +1,14 @@
-import { PutObjectCommandInput } from "@aws-sdk/client-s3";
-import { BaconBaseAWSObjectStrategyEvt } from "../base";
-import { BaconAWSObjectRequestInstructions } from "../enums";
-import { BaconObjectLayerKinds } from "../enums";
-
-export class BaconS3PutObjectStrategy extends BaconBaseAWSObjectStrategyEvt {
-    constructor(inputCommand: PutObjectCommandInput) {
-        super(
-            BaconAWSObjectRequestInstructions.PUT_OBJECT,
-            BaconObjectLayerKinds.BaconS3PutObjectStrategy,
-            inputCommand
-        );
-    }
+import { PutObjectCommandInput } from "@aws-sdk/client-s3";
+import { BaconBaseAWSObjectStrategyEvt } from "../base";
+import { BaconAWSObjectRequestInstructions } from "../enums";
+import { BaconObjectLayerKinds } from "../enums";
+
+export class BaconS3PutObjectStrategy extends BaconBaseAWSObjectStrategyEvt {
+    constructor(inputCommand: PutObjectCommandInput) {
+        super(
+            BaconAWSObjectRequestInstructions.PUT_OBJECT,
+            BaconObjectLayerKinds.BaconS3PutObjectStrategy,
+            inputCommand
+        );
+    }
 }

package/src/concrete/BaconSP.ts

@@ -1,10 +1,10 @@
-import { BaconBaseActor } from "../base/BaconBaseActor";
-import { IOIDCProfile } from "../interfaces/i-oidc-profile";
-
-export class BaconSP extends BaconBaseActor {
-    constructor(profile: IOIDCProfile) {
-        super(profile)
-    }
-
-    //TODO: Implement
+import { BaconBaseActor } from "../base/BaconBaseActor";
+import { IOIDCProfile } from "../interfaces/i-oidc-profile";
+
+export class BaconSP extends BaconBaseActor {
+    constructor(profile: IOIDCProfile) {
+        super(profile)
+    }
+
+    //TODO: Implement
 }

package/src/concrete/BaconStripeReqEvent.ts

@@ -1,15 +1,15 @@
-import { BaconBusinessLayerKinds } from "../enums";
-
-export class BaconStripeRequestEvent {
-
-    kind: BaconBusinessLayerKinds | undefined;
-    stripeEntity: string | undefined;
-    stripeAction: string | undefined;
-
-    constructor(stripeEntity: string, stripeAction: string) {
-        this.kind = BaconBusinessLayerKinds.BaconStripeRequestEvent;
-
-        this.stripeEntity = stripeEntity;
-        this.stripeAction = stripeAction;
-    }
+import { BaconBusinessLayerKinds } from "../enums";
+
+export class BaconStripeRequestEvent {
+
+    kind: BaconBusinessLayerKinds | undefined;
+    stripeEntity: string | undefined;
+    stripeAction: string | undefined;
+
+    constructor(stripeEntity: string, stripeAction: string) {
+        this.kind = BaconBusinessLayerKinds.BaconStripeRequestEvent;
+
+        this.stripeEntity = stripeEntity;
+        this.stripeAction = stripeAction;
+    }
 }