From e7df0de1fde61d54c85135c9157a8d48e7de6f71 Mon Sep 17 00:00:00 2001
From: zhaogan <zhaogan2@huawei.com>
Date: Fri, 4 Aug 2023 17:25:00 +0800
Subject: [PATCH] =?UTF-8?q?Issue:=20#I7Q490=20Description:distributionFilt?=
 =?UTF-8?q?er=E5=94=AF=E4=B8=80=E6=80=A7=E6=A0=A1=E9=AA=8C=20Sig:=20SIG=5F?=
 =?UTF-8?q?ApplicaitonFramework=20Feature=20or=20Bugfix:=20Feature=20Binar?=
 =?UTF-8?q?y=20Source:=20No?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhaogan <zhaogan2@huawei.com>
---
 adapter/ohos/JsonUtil.java       |  4 +---
 adapter/ohos/ModuleJsonUtil.java | 32 +++-----------------------------
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/adapter/ohos/JsonUtil.java b/adapter/ohos/JsonUtil.java
index a11d44f7..82be70a0 100644
--- a/adapter/ohos/JsonUtil.java
+++ b/adapter/ohos/JsonUtil.java
@@ -1168,10 +1168,8 @@ public class JsonUtil {
      *
      * @param moduleMetadataInfos metedata in moduleInfo
      * @return the parse result
-     * @throws BundleException Throws this exception if the json is not standard.
      */
-    static DistroFilter parseModuleDistrofilterFromMetadata(
-            List<ModuleMetadataInfo> moduleMetadataInfos) throws BundleException {
+    static DistroFilter parseModuleDistrofilterFromMetadata(List<ModuleMetadataInfo> moduleMetadataInfos) {
         for (ModuleMetadataInfo moduleMetadataInfo : moduleMetadataInfos) {
             String resource = moduleMetadataInfo.resource;
             if (resource.isEmpty()) {
diff --git a/adapter/ohos/ModuleJsonUtil.java b/adapter/ohos/ModuleJsonUtil.java
index 66c6561b..85909820 100644
--- a/adapter/ohos/ModuleJsonUtil.java
+++ b/adapter/ohos/ModuleJsonUtil.java
@@ -25,6 +25,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.HashMap;
 
+import static ohos.JsonUtil.parseModuleDistrofilterFromMetadata;
+
 class ModuleJsonUtil {
     private static final String APP = "app";
     private static final String BUNDLE_TYPE = "bundleType";
@@ -955,7 +957,7 @@ class ModuleJsonUtil {
         hapVerifyInfo.setModuleName(parseStageModuleName(hapVerifyInfo.getProfileStr()));
         List<ModuleMetadataInfo> moduleMetadataInfos =
                 parseModuleAllMetadata(hapVerifyInfo.getProfileStr(), hapVerifyInfo.getResourceMap());
-        hapVerifyInfo.setDistroFilter(parseStageDistroFilter(moduleMetadataInfos));
+        hapVerifyInfo.setDistroFilter(parseModuleDistrofilterFromMetadata(moduleMetadataInfos));
         hapVerifyInfo.setDeviceType(parseDeviceType(hapVerifyInfo.getProfileStr()));
         hapVerifyInfo.setAbilityNames(parseAbilityNames(hapVerifyInfo.getProfileStr()));
         List<String> extensionAbilityNames = parseExtensionAbilityName(hapVerifyInfo.getProfileStr());
@@ -1005,34 +1007,6 @@ class ModuleJsonUtil {
         hapVerifyInfo.setCompileSdkVersion(getFACompileSdkVersion(hapVerifyInfo.getProfileStr()));
     }
 
-    /**
-     * parse stage distroFilter.
-     *
-     * @param moduleMetadataInfos all metadata of module
-     * @return DistroFilter is the result of parsed distroFilter
-     */
-    public static DistroFilter parseStageDistroFilter(
-            List<ModuleMetadataInfo> moduleMetadataInfos) throws BundleException {
-        DistroFilter distroFilter = new DistroFilter();
-        for (ModuleMetadataInfo moduleMetadataInfo : moduleMetadataInfos) {
-            if (moduleMetadataInfo.resource.isEmpty()) {
-                continue;
-            }
-            try {
-                JSONObject distroFilterObj = JSON.parseObject(moduleMetadataInfo.resource);
-                if (distroFilterObj.containsKey(DISTRO_FILTER)) {
-                    distroFilter = JSONObject.parseObject(getJsonString(distroFilterObj,
-                            DISTRO_FILTER), DistroFilter.class);
-                }
-            } catch (JSONException exception) {
-                String errMsg = "parse JSONobject failed.";
-                LOG.error(errMsg);
-                throw new BundleException(errMsg);
-            }
-        }
-        return distroFilter;
-    }
-
     /**
      * parse stage parseModuleAllMetadata.
      *
-- 
Gitee