Code cleanup

Author: rkodev

packages/abstractions/src/serialization/serializationWriter.ts

@@ -99,7 +99,7 @@ export interface SerializationWriter {
 	 * @param key the key to write the value with.
 	 * @param values the value to write to the stream.
 	 */
-	writeCollectionOfEnumValue<T>(key?: string, values?: (T | null | undefined)[]): void;
+	writeCollectionOfEnumValues<T>(key?: string, values?: (T | null | undefined)[]): void;
 	/**
 	 * Writes a null value for the specified key.
 	 * @param key the key to write the value with.

packages/serialization/form/src/formSerializationWriter.ts

@@ -131,7 +131,7 @@ export class FormSerializationWriter implements SerializationWriter {
 			}
 		}
 	};
-	public writeCollectionOfEnumValue = <T>(key?: string, values?: (T | null | undefined)[]): void => {
+	public writeCollectionOfEnumValues = <T>(key?: string, values?: (T | null | undefined)[]): void => {
 		if (key && values && values.length > 0) {
 			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			const rawValues = values.filter((x) => x !== undefined).map((x) => `${x}`);

packages/serialization/form/test/common/formSerializationWriter.ts

@@ -35,7 +35,7 @@ describe("FormSerializationWriter", () => {
 		testEntity.additionalData["createdDateTime"] = new Date(0);
 		testEntity.deviceNames = ["device1", "device2"];
 		testEntity.status = LongRunningOperationStatusObject.NotStarted;
-		//testEntity.nextStatuses = [LongRunningOperationStatusObject.Running, LongRunningOperationStatusObject.Succeeded];
+		testEntity.nextStatuses = [LongRunningOperationStatusObject.Running, LongRunningOperationStatusObject.Succeeded];
 		const formSerializationWriter = new FormSerializationWriter();
 		formSerializationWriter.writeObjectValue(undefined, testEntity, serializeTestEntity);
 		const formContent = formSerializationWriter.getSerializedContent();
@@ -54,6 +54,8 @@ describe("FormSerializationWriter", () => {
 			"officeLocation=null", // Serializes null values
 			"endWorkTime=null", // Serializes null values
 			"status=notStarted", // Serializes enum values
+			"nextStatuses=running", // Serializes collection of enum values
+			"nextStatuses=succeeded",
 		];
 		const arr = form.split("&");
 		let count = 0;
@@ -71,7 +73,7 @@ describe("FormSerializationWriter", () => {
 	it("writeCollectionOfEnumValues", () => {
 		const enums = [LongRunningOperationStatusObject.Running, LongRunningOperationStatusObject.Succeeded];
 		const formSerializationWriter = new FormSerializationWriter();
-		formSerializationWriter.writeCollectionOfEnumValue("nextStatuses", enums);
+		formSerializationWriter.writeCollectionOfEnumValues("nextStatuses", enums);
 		const formContent = formSerializationWriter.getSerializedContent();
 		const form = new TextDecoder().decode(formContent);
 		assert.equal("nextStatuses=running&nextStatuses=succeeded&", form);

packages/serialization/form/test/testEntity.ts

@@ -80,6 +80,5 @@ export function serializeTestEntity(writer: SerializationWriter, testEntity: Tes
 	writer.writeAdditionalData(testEntity.additionalData);
 	writer.writeCollectionOfPrimitiveValues("deviceNames", testEntity.deviceNames);
 	writer.writeEnumValue<LongRunningOperationStatus>("status", testEntity.status);
-	// enable this line after publishing writeCollectionOfEnumValues
-	//writer.writeCollectionOfEnumValues<LongRunningOperationStatus>("nextStatuses", testEntity.nextStatuses);
+	writer.writeCollectionOfEnumValues<LongRunningOperationStatus>("nextStatuses", testEntity.nextStatuses);
 }

packages/serialization/json/src/jsonSerializationWriter.ts

@@ -222,7 +222,7 @@ export class JsonSerializationWriter implements SerializationWriter {
 		}
 	};
 
-	public writeCollectionOfEnumValue = <T>(key?: string, values?: (T | undefined | null)[]): void => {
+	public writeCollectionOfEnumValues = <T>(key?: string, values?: (T | undefined | null)[]): void => {
 		if (values && values.length > 0) {
 			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			const rawValues = values.filter((x) => x !== undefined).map((x) => `${x}`);

packages/serialization/json/test/common/jsonSerializationWriter.ts

@@ -62,11 +62,11 @@ describe("JsonParseNode", () => {
 	it("Test enum serialization", async () => {
 		const inputObject: TestParser = {
 			status: LongRunningOperationStatusObject.NotStarted,
-			//nextStatuses: [LongRunningOperationStatusObject.Succeeded, LongRunningOperationStatusObject.Failed],
+			nextStatuses: [LongRunningOperationStatusObject.Succeeded, LongRunningOperationStatusObject.Failed],
 		};
 		const expectedObject: TestParser = {
 			status: LongRunningOperationStatusObject.NotStarted,
-			//nextStatuses: [LongRunningOperationStatusObject.Succeeded, LongRunningOperationStatusObject.Failed],
+			nextStatuses: [LongRunningOperationStatusObject.Succeeded, LongRunningOperationStatusObject.Failed],
 		};
 
 		const writer = new JsonSerializationWriter();
@@ -83,7 +83,7 @@ describe("JsonParseNode", () => {
 		const writer = new JsonSerializationWriter();
 		const enums = [LongRunningOperationStatusObject.NotStarted, LongRunningOperationStatusObject.Succeeded];
 
-		writer.writeCollectionOfEnumValue("enum", enums);
+		writer.writeCollectionOfEnumValues("enum", enums);
 		const serializedContent = writer.getSerializedContent();
 		const decoder = new TextDecoder();
 		const contentAsStr = decoder.decode(serializedContent);

packages/serialization/json/test/common/testEntity.ts

@@ -167,7 +167,7 @@ export function serializeTestParser(writer: SerializationWriter, entity: TestPar
 		writer.writeObjectValue("testUnionObject", entity.testUnionObject as any, serializeTestUnionObject);
 	}
 	writer.writeEnumValue("status", entity.status);
-	writer.writeCollectionOfEnumValue("nextStatuses", entity.nextStatuses);
+	writer.writeCollectionOfEnumValues("nextStatuses", entity.nextStatuses);
 }
 
 export function serializeFoo(writer: SerializationWriter, entity: FooResponse | undefined = {}): void {

packages/serialization/multipart/src/multipartSerializationWriter.ts

@@ -113,7 +113,7 @@ export class MultipartSerializationWriter implements SerializationWriter {
 	): void => {
 		throw new Error(`serialization of enum values is not supported with multipart`);
 	};
-	public writeCollectionOfEnumValue = <T>(
+	public writeCollectionOfEnumValues = <T>(
 		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		key?: string,
 		// eslint-disable-next-line @typescript-eslint/no-unused-vars

packages/serialization/text/src/textSerializationWriter.ts

@@ -133,7 +133,7 @@ export class TextSerializationWriter implements SerializationWriter {
 			}
 		}
 	};
-	public writeCollectionOfEnumValue = <T>(key?: string, values?: T[] | null): void => {
+	public writeCollectionOfEnumValues = <T>(key?: string, values?: T[] | null): void => {
 		this.writeEnumValue(key, values);
 	};
 	public getSerializedContent = (): ArrayBuffer => {

packages/serialization/text/test/common/textSerializationWriter.ts

@@ -12,10 +12,10 @@ describe("TextSerializationWriter", () => {
 		const expectedString = "notStarted, running";
 		assert.equal(form, expectedString);
 	});
-	it("writeCollectionOfEnumValue", () => {
+	it("writeCollectionOfEnumValues", () => {
 		const textSerializationWriter = new TextSerializationWriter();
 		const statuses = [LongRunningOperationStatusObject.NotStarted, LongRunningOperationStatusObject.Running];
-		textSerializationWriter.writeCollectionOfEnumValue("", statuses);
+		textSerializationWriter.writeCollectionOfEnumValues("", statuses);
 		const formContent = textSerializationWriter.getSerializedContent();
 		const form = new TextDecoder().decode(formContent);
 		const expectedString = "notStarted,running";