Some data cleanup in ReportPortalHook class

Author: HardNorth

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Fixed
+- Some data cleanup in `ReportPortalHook` class, by @HardNorth
 
 ## [5.3.1]
 ### Added

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

@@ -200,7 +200,7 @@ protected FinishTestItemRQ buildFinishFeatureRq(@Nonnull FeatureRuntime fr) {
 
 	@Override
 	public void afterFeature(FeatureRuntime fr) {
-		Optional<Maybe<String>> optionalId = ofNullable(featureIdMap.get(getFeatureNameForReport(fr))).map(Supplier::get);
+		Optional<Maybe<String>> optionalId = ofNullable(featureIdMap.remove(getFeatureNameForReport(fr))).map(Supplier::get);
 		if (optionalId.isEmpty()) {
 			LOGGER.error("ERROR: Trying to finish unspecified feature.");
 		}
@@ -342,7 +342,7 @@ protected void embedAttachments(@Nonnull Maybe<String> itemId, @Nullable List<Em
 
 	@Override
 	public void afterScenario(ScenarioRuntime sr) {
-		Maybe<String> scenarioId = scenarioIdMap.get(sr.scenario.getUniqueId());
+		Maybe<String> scenarioId = scenarioIdMap.remove(sr.scenario.getUniqueId());
 		finishBackground(null, sr);
 
 		if (scenarioId == null) {
@@ -490,7 +490,7 @@ public void afterStep(StepResult stepResult, ScenarioRuntime sr) {
 		}
 
 		sendStepResults(stepResult, sr);
-		Maybe<String> stepId = stepIdMap.get(sr.scenario.getUniqueId());
+		Maybe<String> stepId = stepIdMap.remove(sr.scenario.getUniqueId());
 		if (stepId == null) {
 			LOGGER.error("ERROR: Trying to finish unspecified step.");
 			return;