Update attachment embedding

Author: HardNorth

src/main/java/com/epam/reportportal/karate/ReportPortalHook.java

@@ -326,23 +326,34 @@ public void finishBackground(@Nullable StepResult stepResult, @Nonnull ScenarioR
 	 * @param itemId item ID future
 	 * @param embed  Karate's Embed object
 	 */
-	protected void embedAttachment(Maybe<String> itemId, Embed embed) {
+	protected void embedAttachment(@Nonnull Maybe<String> itemId, @Nonnull Embed embed) {
 		ReportPortalUtils.embedAttachment(itemId, embed);
 	}
 
+	/**
+	 * Embed an attachment to ReportPortal.
+	 *
+	 * @param itemId           item ID future
+	 * @param embeddedEntities a list of Karate's Embed object
+	 */
+	protected void embedAttachments(@Nonnull Maybe<String> itemId, @Nullable List<Embed> embeddedEntities) {
+		ofNullable(embeddedEntities).ifPresent(embeds -> embeds.forEach(embed -> embedAttachment(itemId, embed)));
+	}
+
 	@Override
 	public void afterScenario(ScenarioRuntime sr) {
 		Maybe<String> scenarioId = scenarioIdMap.get(sr.scenario.getUniqueId());
+		finishBackground(null, sr);
+
 		if (scenarioId == null) {
 			LOGGER.error("ERROR: Trying to finish unspecified scenario.");
+			return;
 		}
 
-		finishBackground(null, sr);
-
 		try {
 			@SuppressWarnings("unchecked")
 			List<Embed> embeddedEntities = (List<Embed>) new Accessible(sr).field("embeds").getValue();
-			ofNullable(embeddedEntities).ifPresent(embeds -> embeds.forEach(embed -> embedAttachment(scenarioId, embed)));
+			embedAttachments(scenarioId, embeddedEntities);
 		} catch (Exception e) {
 			LOGGER.warn("Unable to get scenario embeddings", e);
 		}

src/main/java/com/epam/reportportal/karate/ReportPortalPublisher.java

@@ -410,6 +410,16 @@ protected void embedAttachment(Maybe<String> itemId, Embed embed) {
 		ReportPortalUtils.embedAttachment(itemId, embed);
 	}
 
+	/**
+	 * Embed an attachment to ReportPortal.
+	 *
+	 * @param itemId           item ID future
+	 * @param embeddedEntities a list of Karate's Embed object
+	 */
+	protected void embedAttachments(@Nonnull Maybe<String> itemId, @Nullable List<Embed> embeddedEntities) {
+		ofNullable(embeddedEntities).ifPresent(embeds -> embeds.forEach(embed -> embedAttachment(itemId, embed)));
+	}
+
 	/**
 	 * Send Step execution results to ReportPortal.
 	 *
@@ -423,8 +433,7 @@ public void sendStepResults(StepResult stepResult) {
 			sendLog(stepId, stepLog, LogLevel.DEBUG);
 		}
 
-		// Embed attachments before failure logging
-		ofNullable(stepResult.getEmbeds()).ifPresent(embeds -> embeds.forEach(embed -> embedAttachment(stepId, embed)));
+		embedAttachments(stepId, stepResult.getEmbeds());
 
 		if (result.isFailed()) {
 			String fullErrorMessage = step.getPrefix() + " " + step.getText();

src/main/java/com/epam/reportportal/karate/ReportPortalUtils.java

@@ -471,7 +471,7 @@ public static void sendLog(Maybe<String> itemId, String message, LogLevel level)
 	 * @param itemId item ID future
 	 * @param embed  Karate's Embed object
 	 */
-	public static void embedAttachment(Maybe<String> itemId, Embed embed) {
+	public static void embedAttachment(@Nonnull Maybe<String> itemId, @Nonnull Embed embed) {
 		ReportPortal.emitLog(itemId, id -> {
 			SaveLogRQ rq = new SaveLogRQ();
 			rq.setItemUuid(id);