Revert "[Refactor] AppInstaller logic export"

This reverts commit 90f7070f171e8abe145d30150b976f0a4e13bd86.

Change-Id: Iaaa68f8f60076803c49a5231b1be35478768846e

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 14521ab..4e36b4b 100644 (file)
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -103,9 +103,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
     : AppInstaller("wgt", pkgmgr) {
   context_->cross_app_rules.set(true);
   context_->backend_data.set(new HybridBackendData());
-}
 
-void HybridInstaller::InstallSteps() {
+  switch (pkgmgr_->GetRequestType()) {
+    case ci::RequestType::Install:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
       AddStep<ci::configuration::StepParseManifest>(
@@ -152,9 +152,8 @@ void HybridInstaller::InstallSteps() {
           wgt::filesystem::HybridAdditionalSharedDirs);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-}
-
-void HybridInstaller::UpdateSteps() {
+      break;
+    case ci::RequestType::Update:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
       AddStep<ci::configuration::StepParseManifest>(
@@ -203,9 +202,8 @@ void HybridInstaller::UpdateSteps() {
           ci::Plugin::ActionType::Upgrade);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-}
-
-void HybridInstaller::UninstallSteps() {
+      break;
+    case ci::RequestType::Uninstall:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::pkgmgr::StepCheckRestriction>();
       AddStep<ci::pkgmgr::StepCheckRemovable>();
@@ -229,14 +227,12 @@ void HybridInstaller::UninstallSteps() {
       AddStep<ci::security::StepRevokeSecurity>();
       AddStep<ci::pkgmgr::StepRemoveManifest>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-}
-
-void HybridInstaller::ReinstallSteps() {
+      break;
+    case ci::RequestType::Reinstall:
       // RDS is not supported for hybrid apps
       AddStep<ci::configuration::StepFail>();
-}
-
-void HybridInstaller::DeltaSteps() {
+      break;
+    case ci::RequestType::Delta:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
       AddStep<ci::configuration::StepParseManifest>(
@@ -288,9 +284,8 @@ void HybridInstaller::DeltaSteps() {
           ci::Plugin::ActionType::Upgrade);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-}
-
-void HybridInstaller::RecoverySteps() {
+      break;
+    case ci::RequestType::Recovery:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::recovery::StepOpenRecoveryFile>();
       AddStep<ci::configuration::StepParseManifest>(
@@ -307,9 +302,8 @@ void HybridInstaller::RecoverySteps() {
       AddStep<ci::pkgmgr::StepRecoverApplication>();
       AddStep<ci::filesystem::StepRecoverChangeOwner>();
       AddStep<ci::security::StepRecoverSecurity>();
-}
-
-void HybridInstaller::MountInstallSteps() {
+      break;
+    case ci::RequestType::MountInstall:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::mount::StepMountUnpacked>();
       AddStep<ci::configuration::StepParseManifest>(
@@ -356,9 +350,8 @@ void HybridInstaller::MountInstallSteps() {
           wgt::filesystem::HybridAdditionalSharedDirs);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-}
-
-void HybridInstaller::MountUpdateSteps() {
+      break;
+    case ci::RequestType::MountUpdate:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::mount::StepMountUnpacked>();
       AddStep<ci::configuration::StepParseManifest>(
@@ -406,9 +399,8 @@ void HybridInstaller::MountUpdateSteps() {
           ci::Plugin::ActionType::Upgrade);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-}
-
-void HybridInstaller::ManifestDirectInstallSteps() {
+      break;
+    case ci::RequestType::ManifestDirectInstall:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::configuration::StepParseManifest>(
           ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
@@ -439,9 +431,8 @@ void HybridInstaller::ManifestDirectInstallSteps() {
           wgt::filesystem::HybridAdditionalSharedDirs);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-}
-
-void HybridInstaller::ManifestDirectUpdateSteps() {
+      break;
+    case ci::RequestType::ManifestDirectUpdate:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::configuration::StepParseManifest>(
           ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
@@ -472,9 +463,8 @@ void HybridInstaller::ManifestDirectUpdateSteps() {
           ci::Plugin::ActionType::Upgrade);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-}
-
-void HybridInstaller::ManifestPartialInstallSteps() {
+      break;
+    case ci::RequestType::ManifestPartialInstall: {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::configuration::StepParseManifest>(
           ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
@@ -493,9 +483,9 @@ void HybridInstaller::ManifestPartialInstallSteps() {
       AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
           wgt::filesystem::HybridAdditionalSharedDirs);
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-}
-
-void HybridInstaller::ManifestPartialUpdateSteps() {
+      break;
+    }
+    case ci::RequestType::ManifestPartialUpdate: {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::configuration::StepParseManifest>(
           ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
@@ -516,9 +506,9 @@ void HybridInstaller::ManifestPartialUpdateSteps() {
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Upgrade);
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-}
-
-void HybridInstaller::PartialUninstallSteps() {
+      break;
+    }
+    case ci::RequestType::PartialUninstall: {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::pkgmgr::StepCheckRestriction>();
       AddStep<ci::pkgmgr::StepCheckRemovable>();
@@ -534,9 +524,9 @@ void HybridInstaller::PartialUninstallSteps() {
       AddStep<ci::pkgmgr::StepUnregisterApplication>();
       AddStep<wgt::encryption::StepRemoveEncryptionData>();
       AddStep<ci::security::StepRevokeSecurity>();
-}
-
-void HybridInstaller::EnablePkgSteps() {
+      break;
+    }
+    case ci::RequestType::EnablePkg:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::configuration::StepParseManifest>(
           ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
@@ -546,9 +536,8 @@ void HybridInstaller::EnablePkgSteps() {
         ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable);
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
         ci::Plugin::ActionType::Uninstall);
-}
-
-void HybridInstaller::DisablePkgSteps() {
+      break;
+    case ci::RequestType::DisablePkg:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::configuration::StepParseManifest>(
           ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
@@ -558,12 +547,17 @@ void HybridInstaller::DisablePkgSteps() {
         ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
         ci::Plugin::ActionType::Uninstall);
-}
-
-void HybridInstaller::MigrateExtImgSteps() {
+      break;
+    case ci::RequestType::MigrateExtImg: {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::security::StepMigrateLegacyExtImage>();
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
+      break;
+    }
+    default:
+      AddStep<ci::configuration::StepFail>();
+      break;
+  }
 }
 
 }  // namespace hybrid

diff --git a/src/hybrid/hybrid_installer.h b/src/hybrid/hybrid_installer.h
index 8331393..9824d21 100644 (file)
--- a/src/hybrid/hybrid_installer.h
+++ b/src/hybrid/hybrid_installer.h
@@ -8,8 +8,6 @@
 #include "common/app_installer.h"
 #include "common/pkgmgr_interface.h"
 
-namespace ci = common_installer;
-
 namespace hybrid {
 
 /**
@@ -26,24 +24,6 @@ class HybridInstaller : public common_installer::AppInstaller {
   explicit HybridInstaller(common_installer::PkgMgrPtr pkgmgr);
 
   SCOPE_LOG_TAG(HybridInstaller)
-
- private:
-  void InstallSteps() override;
-  void UpdateSteps() override;
-  void UninstallSteps() override;
-  void ReinstallSteps() override;
-  void DeltaSteps() override;
-  void RecoverySteps() override;
-  void MountInstallSteps() override;
-  void MountUpdateSteps() override;
-  void ManifestDirectInstallSteps() override;
-  void ManifestDirectUpdateSteps() override;
-  void DisablePkgSteps() override;
-  void EnablePkgSteps() override;
-  void ManifestPartialInstallSteps() override;
-  void ManifestPartialUpdateSteps() override;
-  void PartialUninstallSteps() override;
-  void MigrateExtImgSteps() override;
 };
 
 }  // namespace hybrid

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index e3d32ed..ffa669f 100755 (executable)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -110,6 +110,89 @@ namespace wgt {
 WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
     : AppInstaller("wgt", pkgrmgr) {
   context_->backend_data.set(new WgtBackendData());
+
+  /* treat the request */
+  switch (pkgmgr_->GetRequestType()) {
+    case ci::RequestType::Install : {
+      InstallSteps();
+      break;
+    }
+    case ci::RequestType::Update: {
+      UpdateSteps();
+      break;
+    }
+    case ci::RequestType::Uninstall: {
+      UninstallSteps();
+      break;
+    }
+    case ci::RequestType::Reinstall: {
+      ReinstallSteps();
+      break;
+    }
+    case ci::RequestType::Delta: {
+      DeltaSteps();
+      break;
+    }
+    case ci::RequestType::Recovery: {
+      RecoverySteps();
+      break;
+    }
+    case ci::RequestType::MountInstall: {
+      MountInstallSteps();
+      break;
+    }
+    case ci::RequestType::MountUpdate: {
+      MountUpdateSteps();
+      break;
+    }
+    case ci::RequestType::ManifestDirectInstall: {
+      ManifestDirectInstallSteps();
+      break;
+    }
+    case ci::RequestType::ManifestDirectUpdate: {
+      ManifestDirectUpdateSteps();
+      break;
+    }
+    case ci::RequestType::ReadonlyUpdateInstall: {
+      ReadonlyUpdateInstallSteps();
+      break;
+    }
+    case ci::RequestType::ReadonlyUpdateUninstall: {
+      ReadonlyUpdateUninstallSteps();
+      break;
+    }
+    case ci::RequestType::ManifestPartialInstall: {
+      ManifestPartialInstallSteps();
+      break;
+    }
+    case ci::RequestType::ManifestPartialUpdate: {
+      ManifestPartialUpdateSteps();
+      break;
+    }
+    case ci::RequestType::PartialUninstall: {
+      ManifestPartialUninstallSteps();
+      break;
+    }
+    case ci::RequestType::Move: {
+      MoveSteps();
+      break;
+    }
+    case ci::RequestType::EnablePkg: {
+      EnablePkgSteps();
+      break;
+    }
+    case ci::RequestType::DisablePkg: {
+      DisablePkgSteps();
+      break;
+    }
+    case ci::RequestType::MigrateExtImg: {
+      MigrateExtImgSteps();
+      break;
+    }
+    default: {
+      DefaultSteps();
+    }
+  }
 }
   void WgtInstaller::InstallSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
@@ -555,7 +638,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
   }
 
-  void WgtInstaller::PartialUninstallSteps() {
+  void WgtInstaller::ManifestPartialUninstallSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::pkgmgr::StepCheckRestriction>();
       AddStep<ci::pkgmgr::StepCheckRemovable>();
@@ -613,4 +696,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   }
 
+  void WgtInstaller::DefaultSteps() {
+      AddStep<ci::configuration::StepFail>();
+  }
+
 }  // namespace wgt

diff --git a/src/wgt/wgt_installer.h b/src/wgt/wgt_installer.h
index c25c2e1..0c3a5e9 100644 (file)
--- a/src/wgt/wgt_installer.h
+++ b/src/wgt/wgt_installer.h
@@ -26,25 +26,26 @@ class WgtInstaller : public common_installer::AppInstaller {
   explicit WgtInstaller(common_installer::PkgMgrPtr pkgrmgr);
 
  private:
-  void InstallSteps() override;
-  void UpdateSteps() override;
-  void UninstallSteps() override;
-  void ReinstallSteps() override;
-  void DeltaSteps() override;
-  void MoveSteps() override;
-  void RecoverySteps() override;
-  void MountInstallSteps() override;
-  void MountUpdateSteps() override;
-  void ManifestDirectInstallSteps() override;
-  void ManifestDirectUpdateSteps() override;
-  void ManifestPartialInstallSteps() override;
-  void ManifestPartialUpdateSteps() override;
-  void PartialUninstallSteps() override;
-  void ReadonlyUpdateInstallSteps() override;
-  void ReadonlyUpdateUninstallSteps() override;
-  void DisablePkgSteps() override;
-  void EnablePkgSteps() override;
-  void MigrateExtImgSteps() override;
+  void InstallSteps();
+  void UpdateSteps();
+  void UninstallSteps();
+  void ReinstallSteps();
+  void DeltaSteps();
+  void RecoverySteps();
+  void MountInstallSteps();
+  void MountUpdateSteps();
+  void ManifestDirectInstallSteps();
+  void ManifestDirectUpdateSteps();
+  void ReadonlyUpdateInstallSteps();
+  void ReadonlyUpdateUninstallSteps();
+  void ManifestPartialInstallSteps();
+  void ManifestPartialUpdateSteps();
+  void ManifestPartialUninstallSteps();
+  void MoveSteps();
+  void EnablePkgSteps();
+  void DisablePkgSteps();
+  void MigrateExtImgSteps();
+  void DefaultSteps();
 };
 
 }  // namespace wgt