chore: remove deviceAppDataFactory and deviceAppDataProviders

Remove deviceAppDataFactory and deviceAppDataProviders which were used in old LiveSync logic.

Author: rosen-vladimirov

lib/common/appbuilder/appbuilder-bootstrap.ts

@@ -5,7 +5,6 @@ $injector.require("pathFilteringService", "./appbuilder/services/path-filtering"
 $injector.require("liveSyncServiceBase", "./services/livesync-service-base");
 $injector.require("androidLiveSyncServiceLocator", "./appbuilder/services/livesync/android-livesync-service");
 $injector.require("iosLiveSyncServiceLocator", "./appbuilder/services/livesync/ios-livesync-service");
-$injector.require("deviceAppDataProvider", "./appbuilder/providers/device-app-data-provider");
 $injector.require("nativeScriptProjectCapabilities", "./appbuilder/project/nativescript-project-capabilities");
 $injector.require("cordovaProjectCapabilities", "./appbuilder/project/cordova-project-capabilities");
 $injector.require("mobilePlatformsCapabilities", "./appbuilder/mobile-platforms-capabilities");

lib/common/appbuilder/declarations.d.ts

@@ -1,9 +1,3 @@
-interface ILiveSyncDeviceAppData extends Mobile.IDeviceAppData {
-	liveSyncFormat: string;
-	encodeLiveSyncHostUri(hostUri: string): string;
-	getLiveSyncNotSupportedError(): string;
-}
-
 interface IDeployHelper {
 	deploy(platform?: string): Promise<void>;
 }

lib/common/appbuilder/mobile/appbuilder-device-app-data-base.ts

@@ -74,7 +74,6 @@ $injector.require("iOSSimResolver", "./mobile/ios/simulator/ios-sim-resolver");
 $injector.require("iOSSimulatorLogProvider", "./mobile/ios/simulator/ios-simulator-log-provider");
 
 $injector.require("localToDevicePathDataFactory", "./mobile/local-to-device-path-data-factory");
-$injector.require("deviceAppDataFactory", "./mobile/device-app-data/device-app-data-factory");
 
 $injector.requirePublic("typeScriptService", "./services/typescript-service");
 

lib/common/appbuilder/providers/device-app-data-provider.ts

@@ -153,19 +153,6 @@ declare module Mobile {
 		isLiveSyncSupported(): Promise<boolean>;
 	}
 
-	interface IDeviceAppDataFactory {
-		create<T extends Mobile.IDeviceAppData>(appIdentifier: string, platform: string, device: Mobile.IDevice, liveSyncOptions?: { isForCompanionApp: boolean }): T;
-	}
-
-	interface IDeviceAppDataFactoryRule {
-		vanilla: any;
-		companion?: any;
-	}
-
-	interface IDeviceAppDataProvider {
-		createFactoryRules(): IDictionary<Mobile.IDeviceAppDataFactoryRule>;
-	}
-
 	interface IAndroidLiveSyncService {
 		liveSyncCommands: any;
 		livesync(appIdentifier: string, liveSyncRoot: string, commands: string[]): Promise<void>;

lib/common/bootstrap.ts

@@ -1,5 +1,4 @@
 import { assert } from "chai";
-import { DeviceAppDataFactory } from "../../../mobile/device-app-data/device-app-data-factory";
 import { DevicePlatformsConstants } from "../../../mobile/device-platforms-constants";
 import { Errors } from "../../../errors";
 import { FileSystem } from "../../../file-system";
@@ -19,44 +18,21 @@ temp.track();
 
 const testedApplicationIdentifier = "com.telerik.myApp";
 const iOSDeviceProjectRootPath = "/Documents/AppBuilder/LiveSync/app";
-const iOSDeviceSyncZipPath = "/Documents/AppBuilder/LiveSync/sync.zip";
 const androidDeviceProjectRootPath = `${LiveSyncPaths.ANDROID_TMP_DIR_NAME}/${LiveSyncPaths.SYNC_DIR_NAME}`;
 
-class IOSAppIdentifierMock implements Mobile.IDeviceAppData {
-	public platform = "iOS";
-	public appIdentifier = testedApplicationIdentifier;
-	public device: Mobile.IDevice = null;
-	public getDeviceProjectRootPath = async () => iOSDeviceProjectRootPath;
-	public deviceSyncZipPath = iOSDeviceSyncZipPath;
+const androidDeviceAppData: Mobile.IDeviceAppData = <any>{
+	appIdentifier: testedApplicationIdentifier,
+	platform: "Android",
+	getDeviceProjectRootPath: async () => androidDeviceProjectRootPath,
+	isLiveSyncSupported: async () => true
+};
 
-	public async isLiveSyncSupported(): Promise<boolean> {
-		return true;
-	}
-}
-
-class AndroidAppIdentifierMock implements Mobile.IDeviceAppData {
-	public platform = "Android";
-	public appIdentifier = testedApplicationIdentifier;
-	public device: Mobile.IDevice = null;
-	public getDeviceProjectRootPath = async () => androidDeviceProjectRootPath;
-
-	public async isLiveSyncSupported(): Promise<boolean> {
-		return true;
-	}
-}
-
-class DeviceAppDataProvider {
-	public createFactoryRules(): IDictionary<Mobile.IDeviceAppDataFactoryRule> {
-		return {
-			iOS: {
-				vanilla: IOSAppIdentifierMock
-			},
-			Android: {
-				vanilla: AndroidAppIdentifierMock
-			}
-		};
-	}
-}
+const iOSDeviceAppData: Mobile.IDeviceAppData = <any>{
+	appIdentifier: testedApplicationIdentifier,
+	platform: "iOS",
+	getDeviceProjectRootPath: async () => iOSDeviceProjectRootPath,
+	isLiveSyncSupported: async () => true
+};
 
 class MobilePlatformsCapabilitiesMock implements Mobile.IPlatformsCapabilities {
 	public getPlatformNames(): string[] {
@@ -84,8 +60,6 @@ class MobilePlatformsCapabilitiesMock implements Mobile.IPlatformsCapabilities {
 function createTestInjector(): IInjector {
 	const testInjector = new Yok();
 
-	testInjector.register("deviceAppDataFactory", DeviceAppDataFactory);
-	testInjector.register("deviceAppDataProvider", DeviceAppDataProvider);
 	testInjector.register("devicePlatformsConstants", DevicePlatformsConstants);
 	testInjector.register("errors", Errors);
 	testInjector.register("fs", FileSystem);
@@ -122,20 +96,18 @@ function createFile(testInjector: IInjector, fileToCreate: string, fileContent:
 }
 
 describe("Project Files Manager Tests", () => {
-	let testInjector: IInjector, projectFilesManager: IProjectFilesManager, deviceAppDataFactory: Mobile.IDeviceAppDataFactory;
+	let testInjector: IInjector, projectFilesManager: IProjectFilesManager;
 	let mobileHelper: Mobile.IMobileHelper;
 
 	beforeEach(() => {
 		testInjector = createTestInjector();
 		projectFilesManager = testInjector.resolve("projectFilesManager");
-		deviceAppDataFactory = testInjector.resolve("deviceAppDataFactory");
 		mobileHelper = testInjector.resolve("mobileHelper");
 	});
 
 	it("maps non-platform specific files to device file paths for ios platform", async () => {
-		const deviceAppData = deviceAppDataFactory.create(testedApplicationIdentifier, "iOS", null);
 		const files = ["~/TestApp/app/test.js", "~/TestApp/app/myfile.js"];
-		const localToDevicePaths = await projectFilesManager.createLocalToDevicePaths(deviceAppData, "~/TestApp/app", files, []);
+		const localToDevicePaths = await projectFilesManager.createLocalToDevicePaths(iOSDeviceAppData, "~/TestApp/app", files, []);
 
 		_.each(localToDevicePaths, (localToDevicePathData, index) => {
 			assert.equal(files[index], localToDevicePathData.getLocalPath());
@@ -145,9 +117,8 @@ describe("Project Files Manager Tests", () => {
 	});
 
 	it("maps non-platform specific files to device file paths for android platform", async () => {
-		const deviceAppData = deviceAppDataFactory.create(testedApplicationIdentifier, "Android", null);
 		const files = ["~/TestApp/app/test.js", "~/TestApp/app/myfile.js"];
-		const localToDevicePaths = await projectFilesManager.createLocalToDevicePaths(deviceAppData, "~/TestApp/app", files, []);
+		const localToDevicePaths = await projectFilesManager.createLocalToDevicePaths(androidDeviceAppData, "~/TestApp/app", files, []);
 
 		_.each(localToDevicePaths, (localToDevicePathData, index) => {
 			assert.equal(files[index], localToDevicePathData.getLocalPath());
@@ -157,19 +128,17 @@ describe("Project Files Manager Tests", () => {
 	});
 
 	it("maps ios platform specific file to device file path", async () => {
-		const deviceAppData = deviceAppDataFactory.create(testedApplicationIdentifier, "iOS", null);
 		const filePath = "~/TestApp/app/test.ios.js";
-		const localToDevicePathData = (await projectFilesManager.createLocalToDevicePaths(deviceAppData, "~/TestApp/app", [filePath], []))[0];
+		const localToDevicePathData = (await projectFilesManager.createLocalToDevicePaths(iOSDeviceAppData, "~/TestApp/app", [filePath], []))[0];
 
 		assert.equal(filePath, localToDevicePathData.getLocalPath());
 		assert.equal(mobileHelper.buildDevicePath(iOSDeviceProjectRootPath, "test.js"), localToDevicePathData.getDevicePath());
 		assert.equal("test.ios.js", localToDevicePathData.getRelativeToProjectBasePath());
 	});
 
 	it("maps android platform specific file to device file path", async () => {
-		const deviceAppData = deviceAppDataFactory.create(testedApplicationIdentifier, "Android", null);
 		const filePath = "~/TestApp/app/test.android.js";
-		const localToDevicePathData = (await projectFilesManager.createLocalToDevicePaths(deviceAppData, "~/TestApp/app", [filePath], []))[0];
+		const localToDevicePathData = (await projectFilesManager.createLocalToDevicePaths(androidDeviceAppData, "~/TestApp/app", [filePath], []))[0];
 
 		assert.equal(filePath, localToDevicePathData.getLocalPath());
 		assert.equal(mobileHelper.buildDevicePath(androidDeviceProjectRootPath, "test.js"), localToDevicePathData.getDevicePath());

lib/common/definitions/mobile.d.ts

@@ -46,7 +46,6 @@ function createTestInjector(): IInjector {
 	testInjector.register("sysInfo", {});
 	testInjector.register("mobileHelper", {});
 	testInjector.register("pluginVariablesService", {});
-	testInjector.register("deviceAppDataFactory", {});
 	testInjector.register("projectTemplatesService", {});
 	testInjector.register("debugService", {});
 	testInjector.register("xmlValidator", {});