Revert "LPS-199722 Inline"

This reverts commit b56dd7d.
liferay · Nov 2, 2023 · cc05f4d · cc05f4d
1 parent 7ce6459
commit cc05f4d
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/...ps/layout/layout-api/src/main/java/com/liferay/layout/util/structure/LayoutStructure.java b/...ps/layout/layout-api/src/main/java/com/liferay/layout/util/structure/LayoutStructure.java
@@ -36,7 +36,7 @@
  */
 public class LayoutStructure {
 
-	public static LayoutStructure of(String layoutStructure) throws Exception {
+	public static LayoutStructure of(String layoutStructure) {
 		if (Validator.isNull(layoutStructure)) {
 			return new LayoutStructure();
 		}
@@ -105,14 +105,26 @@ public static LayoutStructure of(String layoutStructure) throws Exception {
 						deletedLayoutStructureItem);
 				});
 
+			List<LayoutStructureRule> layoutStructureRules = new ArrayList<>();
+
+			JSONArray layoutStructureRulesJSONArray =
+				layoutStructureJSONObject.getJSONArray("pageRules");
+
+			if (!JSONUtil.isEmpty(layoutStructureRulesJSONArray)) {
+				for (int i = 0; i < layoutStructureRulesJSONArray.length();
+					 i++) {
+
+					layoutStructureRules.add(
+						LayoutStructureRule.of(
+							layoutStructureRulesJSONArray.getJSONObject(i)));
+				}
+			}
+
 			return new LayoutStructure(
 				collectionStyledLayoutStructureItems, deletedItemIds,
 				deletedLayoutStructureItems, deletedPortletIds,
 				formStyledLayoutStructureItems, fragmentLayoutStructureItems,
-				layoutStructureItems,
-				JSONUtil.toList(
-					layoutStructureJSONObject.getJSONArray("pageRules"),
-					jsonObject -> LayoutStructureRule.of(jsonObject)),
+				layoutStructureItems, layoutStructureRules,
 				rootItemsJSONObject.getString("main"));
 		}
 		catch (JSONException jsonException) {