From dbe917de21c52555fa2a5d19b06386b3d1abd137 Mon Sep 17 00:00:00 2001
From: karen-hedges <133129444+karen-hedges@users.noreply.github.com>
Date: Wed, 22 Jan 2025 10:54:10 +0000
Subject: [PATCH] DMP-4613 Add ARM RPO check for getExtendedProductionsByMatter
 status

Fixed sonar complaint
---
 .../darts/arm/service/impl/ArmRpoPollServiceImpl.java      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/uk/gov/hmcts/darts/arm/service/impl/ArmRpoPollServiceImpl.java b/src/main/java/uk/gov/hmcts/darts/arm/service/impl/ArmRpoPollServiceImpl.java
index 7c0e27fa4f4..0b6cf072e05 100644
--- a/src/main/java/uk/gov/hmcts/darts/arm/service/impl/ArmRpoPollServiceImpl.java
+++ b/src/main/java/uk/gov/hmcts/darts/arm/service/impl/ArmRpoPollServiceImpl.java
@@ -209,12 +209,9 @@ private boolean pollServiceFailed(ArmRpoExecutionDetailEntity armRpoExecutionDet
     }
 
     private boolean pollServiceInProgress(ArmRpoExecutionDetailEntity armRpoExecutionDetail) {
-        if (nonNull(armRpoExecutionDetail.getArmRpoState())
+        return nonNull(armRpoExecutionDetail.getArmRpoState())
             && ArmRpoHelper.inProgressRpoStatus().getId().equals(armRpoExecutionDetail.getArmRpoStatus().getId())
-            && allowableInProgressStates.contains(armRpoExecutionDetail.getArmRpoState().getId())) {
-            return true;
-        }
-        return false;
+            && allowableInProgressStates.contains(armRpoExecutionDetail.getArmRpoState().getId());
     }
 
     private boolean saveBackgroundSearchCompleted(ArmRpoExecutionDetailEntity armRpoExecutionDetailEntity) {