adjust object mapper naming

Author: gregolsky

src/Documents/Commands/FacetQueryCommand.ts

@@ -47,7 +47,7 @@ export class FacetQueryCommand extends QueryCommand {
 
         const [results, includes, rest] = await Promise.all([resultsPromise, includesPromise, restPromise]);
         const rawResult = Object.assign({} as any, rest, { results, includes }) as QueryResult;
-        const queryResult = conventions.entityObjectMapper.fromObjectLiteral<QueryResult>(rawResult, {
+        const queryResult = conventions.objectMapper.fromObjectLiteral<QueryResult>(rawResult, {
             typeName: QueryResult.name,
             nestedTypes: {
                 indexTimestamp: "date",

src/Documents/Commands/GetConflictsCommand.ts

@@ -37,7 +37,7 @@ export class GetConflictsCommand extends RavenCommand<GetConflictsResult> {
         let body: string = null;
         await this._defaultPipeline(_ => body = _).process(bodyStream)
             .then(results => {
-                this.result = this._conventions.entityObjectMapper.fromObjectLiteral(results, {
+                this.result = this._conventions.objectMapper.fromObjectLiteral(results, {
                     nestedTypes: {
                         "results[].lastModified": "Date"
                     }

src/Documents/Commands/QueryCommand.ts

@@ -112,7 +112,7 @@ export class QueryCommand extends RavenCommand<QueryResult> {
 
         const [results, includes, rest] = await Promise.all([resultsPromise, includesPromise, restPromise]);
         const rawResult = Object.assign({} as any, rest, { results, includes }) as QueryResult;
-        const queryResult = conventions.entityObjectMapper
+        const queryResult = conventions.objectMapper
             .fromObjectLiteral<QueryResult>(rawResult, {
                 typeName: QueryResult.name,
                 nestedTypes: {

src/Documents/Conventions/DocumentConventions.ts

@@ -70,7 +70,7 @@ export class DocumentConventions {
     private _localEntityFieldNameConvention: CasingConvention;
     private _remoteEntityFieldNameConvention: CasingConvention;
 
-    private _entityObjectMapper: TypesAwareObjectMapper;
+    private _objectMapper: TypesAwareObjectMapper;
 
     private _useCompression;
 
@@ -110,20 +110,20 @@ export class DocumentConventions {
         this._maxHttpCacheSize = 128 * 1024 * 1024;
 
         this._knownEntityTypes = new Map();
-        this._entityObjectMapper = new TypesAwareObjectMapper({
+        this._objectMapper = new TypesAwareObjectMapper({
             dateFormat: DateUtil.DEFAULT_DATE_FORMAT,
             documentConventions: this
         });
 
         this._useCompression = null;
     }
 
-    public get entityObjectMapper(): TypesAwareObjectMapper {
-        return this._entityObjectMapper;
+    public get objectMapper(): TypesAwareObjectMapper {
+        return this._objectMapper;
     }
 
-    public set entityObjectMapper(value: TypesAwareObjectMapper) {
-        this._entityObjectMapper = value;
+    public set objectMapper(value: TypesAwareObjectMapper) {
+        this._objectMapper = value;
     }
 
     public get readBalanceBehavior(): ReadBalanceBehavior {
@@ -156,7 +156,7 @@ export class DocumentConventions {
     public deserializeEntityFromJson(documentType: ObjectTypeDescriptor, document: object): object {
         try {
             const typeName = documentType ? documentType.name : null;
-            return this.entityObjectMapper.fromObjectLiteral(document, { typeName });
+            return this.objectMapper.fromObjectLiteral(document, { typeName });
         } catch (err) {
             throwError("RavenException", "Cannot deserialize entity", err);
         }

src/Documents/Operations/Indexes/IndexHasChangedOperation.ts

@@ -36,7 +36,7 @@ export class IndexHasChangedCommand extends RavenCommand<boolean> {
     public constructor(conventions: DocumentConventions, definition: IndexDefinition) {
         super();
 
-        this._definition = conventions.entityObjectMapper.toObjectLiteral(definition);
+        this._definition = conventions.objectMapper.toObjectLiteral(definition);
     }
 
     public get isReadRequest(): boolean {

src/Documents/Operations/Indexes/PutIndexesOperation.ts

@@ -57,7 +57,7 @@ export class PutIndexesCommand extends RavenCommand<PutIndexResult[]> {
                 throwError("InvalidArgumentException", "Index name cannot be null.");
             }
 
-            result.push(this._conventions.entityObjectMapper.toObjectLiteral(next));
+            result.push(this._conventions.objectMapper.toObjectLiteral(next));
 
             return result;
         }, []);

src/Documents/Operations/Indexes/SetIndexesLockOperation.ts

@@ -73,7 +73,7 @@ export class SetIndexLockCommand extends RavenCommand<void> {
         }
 
         this._responseType = "Empty";
-        this._parameters = conventions.entityObjectMapper.toObjectLiteral(parameters);
+        this._parameters = conventions.objectMapper.toObjectLiteral(parameters);
     }
 
     public createRequest(node: ServerNode): HttpRequestParameters {

src/Documents/Operations/Indexes/SetIndexesPriorityOperation.ts

@@ -63,7 +63,7 @@ export class SetIndexPriorityCommand extends RavenCommand<void> {
             throwError("InvalidArgumentException", "Parameters cannot be null");
         }
 
-        this._parameters = conventions.entityObjectMapper.toObjectLiteral(parameters);
+        this._parameters = conventions.objectMapper.toObjectLiteral(parameters);
     }
 
     public createRequest(node: ServerNode): HttpRequestParameters {

src/Documents/Operations/PatchOperation.ts

@@ -128,7 +128,7 @@ export class PatchCommand extends RavenCommand<PatchResult> {
 
         this._id = id;
         this._changeVector = changeVector;
-        this._patch = conventions.entityObjectMapper.toObjectLiteral({ patch, patchIfMissing });
+        this._patch = conventions.objectMapper.toObjectLiteral({ patch, patchIfMissing });
         this._skipPatchIfChangeVectorMismatch = skipPatchIfChangeVectorMismatch;
         this._returnDebugInformation = returnDebugInformation;
         this._test = test;

src/Documents/Operations/PatchRequest.ts

@@ -15,7 +15,7 @@ export class PatchRequest {
         return {
             Script: this.script,
             Values: Object.keys(this.values).reduce((result, next) => {
-                const literal = conventions.entityObjectMapper.toObjectLiteral(this.values[next]);
+                const literal = conventions.objectMapper.toObjectLiteral(this.values[next]);
                 result[next] = conventions.transformObjectKeysToRemoteFieldNameConvention(literal);
                 return result;
             }, {})