LPD-28121 DRY

liferay · Jun 11, 2024 · 0028e9e · 0028e9e
1 parent e2e785f
commit 0028e9e
Showing 1 changed file with 24 additions and 27 deletions.
diff --git a/...arketplace-etc-spring-boot/src/main/java/com/liferay/marketplace/TrialRestController.java b/...arketplace-etc-spring-boot/src/main/java/com/liferay/marketplace/TrialRestController.java
@@ -348,7 +348,7 @@ private void _postNotificationQueueEntry(
 				HttpHeaders.AUTHORIZATION, authorization
 			).build();
 
-		NotificationTemplate notificationTemplate = null;
+		NotificationTemplate notificationTemplate;
 
 		try {
 			notificationTemplate =
@@ -375,18 +375,13 @@ private void _postNotificationQueueEntry(
 		NotificationQueueEntry notificationQueueEntry =
 			new NotificationQueueEntry();
 
-		String body = notificationTemplate.getBody(
-		).get(
-			"en_US"
-		);
-
-		for (Map.Entry<String, String> entry : map.entrySet()) {
-			body = StringUtil.replace(body, entry.getKey(), entry.getValue());
-		}
-
-		String finalBody = body;
-
-		notificationQueueEntry.setBody(() -> finalBody);
+		notificationQueueEntry.setBody(
+			() -> _replace(
+				notificationTemplate.getBody(
+				).get(
+					"en_US"
+				),
+				map));
 
 		JSONArray jsonArray = new JSONObject(
 			String.valueOf(notificationTemplate)
@@ -412,20 +407,13 @@ private void _postNotificationQueueEntry(
 				).build()
 			});
 
-		String subject = notificationTemplate.getSubject(
-		).get(
-			"en_US"
-		);
-
-		for (Map.Entry<String, String> entry : map.entrySet()) {
-			subject = StringUtil.replace(
-				subject, entry.getKey(), entry.getValue());
-		}
-
-		String finalSubject = subject;
-
-		notificationQueueEntry.setSubject(() -> finalSubject);
-
+		notificationQueueEntry.setSubject(
+			() -> _replace(
+				notificationTemplate.getSubject(
+				).get(
+					"en_US"
+				),
+				map));
 		notificationQueueEntry.setType(notificationTemplate::getType);
 
 		notificationQueueEntryResource.postNotificationQueueEntry(
@@ -479,6 +467,15 @@ private PortalInstance _postPortalInstance(
 		return portalInstance;
 	}
 
+	private String _replace(String string, Map<String, String> map) {
+		for (Map.Entry<String, String> entry : map.entrySet()) {
+			string = StringUtil.replace(
+				string, entry.getKey(), entry.getValue());
+		}
+
+		return string;
+	}
+
 	private void _updateOrder(
 			Map<String, ?> customFields, long orderId, int orderStatus)
 		throws Exception {