From 79e83719d9919b497b94ca0e34f4f0e1d1e40365 Mon Sep 17 00:00:00 2001
From: jorge Lopez <jlopez@flexion.us>
Date: Wed, 15 May 2024 01:58:00 -0700
Subject: [PATCH] refactoring: use map instead of peek in some cases

---
 .../trustedintermediary/external/hapi/HapiHelper.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelper.java b/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelper.java
index 309452614..86d20eb41 100644
--- a/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelper.java
+++ b/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelper.java
@@ -93,8 +93,8 @@ public static MessageHeader findOrInitializeMessageHeader(Bundle bundle) {
     public static void updateOrganizationIdentifierValue(Bundle bundle, String newValue) {
         bundle.getEntry().stream()
                 .map(Bundle.BundleEntryComponent::getResource)
-                .filter(resource -> resource instanceof Patient)
-                .map(resource -> (Patient) resource)
+                .filter(Patient.class::isInstance)
+                .map(Patient.class::cast)
                 .flatMap(patient -> patient.getIdentifier().stream())
                 .map(
                         identifier ->
@@ -117,7 +117,7 @@ public static void updateOrganizationIdentifierValue(Bundle bundle, String newVa
                                                         LOGGER.logInfo(
                                                                 "Updating Organization identifier from: "
                                                                         + orgIdentifier.getValue()))
-                                        .peek(orgIdentifier -> orgIdentifier.setValue(newValue)))
+                                        .map(orgIdentifier -> orgIdentifier.setValue(newValue)))
                 .forEach(
                         orgIdentifier ->
                                 LOGGER.logInfo(
@@ -144,8 +144,8 @@ private static Optional<Organization> getOrganizationFromAssigner(
 
         return bundle.getEntry().stream()
                 .map(Bundle.BundleEntryComponent::getResource)
-                .filter(resource -> resource instanceof Organization)
-                .map(resource -> (Organization) resource)
+                .filter(Organization.class::isInstance)
+                .map(Organization.class::cast)
                 .peek(org -> LOGGER.logInfo("Checking organization with ID: " + org.getId()))
                 .filter(
                         org -> {