issue-2964 - fixed review comments and updated unit tests

Signed-off-by: Prasanna Hegde <prasanna.hegde1@ibm.com>

Author: PrasannaHegde1

operation/fhir-operation-validate/src/main/java/org/linuxforhealth/fhir/operation/validate/ValidateOperation.java

@@ -67,15 +67,11 @@ protected Parameters doInvoke(FHIROperationContext operationContext, Class<? ext
                 Uri profileUri = profileParameter.getValue().as(Uri.class);
                 String profile = profileUri == null ? null : profileUri.getValue();
                 issues = FHIRValidator.validator().validate(resource, profile);
-            } else if (modeType != null
-                    && (modeType == ModeType.CREATE
-                            || modeType == ModeType.UPDATE)) {
+            } else if (modeType == ModeType.CREATE || modeType == ModeType.UPDATE) {
                 // If the 'mode' parameter is specified and its value is 'create' or 'update', validate the resource
                 // against the FHIR server config's profile properties and the resource's asserted profiles.
                 issues = resourceHelper.validateResource(resource);
-            } else if (modeType != null
-                    && modeType == ModeType.DELETE
-                    && operationContext.getType() == FHIROperationContext.Type.INSTANCE) {
+            } else if (modeType == ModeType.DELETE && operationContext.getType() == FHIROperationContext.Type.INSTANCE) {
                 // If the 'mode' parameter is specified and its value is 'delete' and delete is invoked at the resource-instance level,
                 // validate if the persistence layer implementation supports the "delete" operation
                 issues = validateDeleteResource(resourceTypeName, logicalId, operationContext);
@@ -120,12 +116,11 @@ private OperationOutcome buildResourceValidOperationOutcome(List<Issue> issues)
 
 
     /**
-     * This method does the following validations.
-     * 1. Validate if a resource validation mode code is valid.
-     * 2. Validate an interaction for a specified resource type.
-     * 3. Validate if persistence layer implementation supports update/create mode if mode = create.
-     * 4. Validate if persistence layer implementation supports update/create mode if mode = update but the resource doesnot exist yet in the DB.
-     * 5. Validate if modes update and delete are only be used when the operation is invoked at the resource instance level
+     * This method does the following validations if modeType(mode parameter) is not null. If the mode parameter is null then the below validations are skipped.
+     * 1. Validate an interaction for a specified resource type.
+     * 2. Validate if persistence layer implementation supports update/create mode if mode = create.
+     * 3. Validate if persistence layer implementation supports update/create mode if mode = update but the resource doesnot exist yet in the DB.
+     * 4. Validate if modes update and delete are only be used when the operation is invoked at the resource instance level
      *
      * @param modeParameter resource validation mode code to be validated
      * @param resourceHelper Resource operation provider for loading related Library resources
@@ -177,14 +172,17 @@ private void validateModeParameter(ModeType modetype, FHIRResourceHelpers resour
     private void validateUpdateCreateEnabled(ModeType modetype, String resourceType, FHIROperationContext operationContext) throws FHIROperationException {
         FHIRPersistence persistence =
                 (FHIRPersistence) operationContext.getProperty(FHIROperationContext.PROPNAME_PERSISTENCE_IMPL);
-        if(!persistence.isUpdateCreateEnabled()) {
+        if (!persistence.isUpdateCreateEnabled()) {
             throw buildExceptionWithIssue(IssueSeverity.ERROR, IssueType.NOT_SUPPORTED, "Resource " + modetype.value() +  ", of type '"
                     + resourceType + "', is not supported.", null);  
         }
     }
 
     /**
-     * Method to get a valid resource validation mode code from ModeType enum
+     * If the mode parameter is not null, this method validates if a resource validation mode code is valid and
+     * returns valid resource validation mode code from ModeType enum.
+     * If mode parameter is null this method returns null.
+     * If mode parameter is not valid this method throws FHIROperationException with issues.
      * @param modeParameter resource validation mode code
      * @return The corresponding ModeType or null if a null value was passed
      * @throws FHIROperationException
@@ -201,8 +199,7 @@ private ModeType getModeType(Parameter modeParameter) throws FHIROperationExcept
             return modetype;
 
         }
-        return null; 
-        
+        return null;
     }
 
 
@@ -260,7 +257,7 @@ private Resource validateResource(FHIROperationContext operationContext, String
         Resource resource = null;
         // if $validate is invoked at instance level and mode = create, check if the resource already exists. 
         if (operationContext != null && operationContext.getType() == FHIROperationContext.Type.INSTANCE 
-                && modeType != null && modeType == ModeType.CREATE) {
+                && modeType == ModeType.CREATE) {
             Resource existingResource = resourceHelper.doRead(resourceType, logicalId).getResource();
             if (existingResource != null) {
                 throw buildExceptionWithIssue(IssueSeverity.ERROR, IssueType.NOT_SUPPORTED, resourceType + " with id '" + logicalId + "' already exists", null);
@@ -275,7 +272,7 @@ private Resource validateResource(FHIROperationContext operationContext, String
         }
         // if mode=profile AND no resource parameter value is provided then the resource at this id is read and validated against the nominated profile
         if (resourceParameter == null && operationContext != null && operationContext.getType() == FHIROperationContext.Type.INSTANCE 
-                && (modeType != null && modeType == ModeType.PROFILE)) {
+                && modeType == ModeType.PROFILE) {
             resource = resourceHelper.doRead(resourceType, logicalId).getResource();
             if (resource == null) {
                 throw buildExceptionWithIssue(IssueSeverity.ERROR, IssueType.INVALID, resourceType + " with id '" + logicalId + "' does not exist", null);

operation/fhir-operation-validate/src/test/java/org/linuxforhealth/fhir/operation/validate/ValidateOperationTest.java

@@ -493,7 +493,7 @@ public void testValidateOperationDeleteSupported() throws FHIROperationException
 
 
     /**
-     * Test validate operation with create mode type code and  "update/create" enabled. 
+     * Test validate operation with update mode type code and  "update/create" enabled.
      * Validate the outcome when the persistence layer implementation supports the "update/create" operation  
      * @throws Exception 
      * 
@@ -513,7 +513,7 @@ public void testValidateOperationWithUpdateCreateEnabled() throws Exception {
                         .build(),
                         Parameter.builder()
                             .name("mode")
-                            .value(Code.of("create"))
+                            .value(Code.of("update"))
                             .build())
                     .build();
             FHIROperationContext operationContext =
@@ -546,12 +546,12 @@ public void testValidateOperationWithUpdateCreateEnabled() throws Exception {
     }
 
     /**
-     * Test validate operation with create mode type code and "update/create" disabled. 
+     * Test validate operation with update mode type code and "update/create" disabled.
      * Validate the outcome when the persistence layer implementation does not support the "update/create" operation  
      * @throws Exception 
      * 
      */
-    @Test(expectedExceptions = { FHIROperationException.class } , expectedExceptionsMessageRegExp  = ".*Resource create, of type 'Patient', is not supported.*")
+    @Test(expectedExceptions = { FHIROperationException.class } , expectedExceptionsMessageRegExp  = ".*Resource update, of type 'Patient', is not supported.*")
     public void testValidateOperationWithUpdateCreateDisabled() throws Exception {
         FHIRPersistence persistence = Mockito.mock(FHIRPersistence.class);
             Parameters input = Parameters.builder()
@@ -566,7 +566,7 @@ public void testValidateOperationWithUpdateCreateDisabled() throws Exception {
                         .build(),
                         Parameter.builder()
                             .name("mode")
-                            .value(Code.of("create"))
+                            .value(Code.of("update"))
                             .build())
                     .build();
             FHIROperationContext operationContext =
@@ -732,8 +732,6 @@ public void testValidateOperationDisAllowedInteractionForCreateMode() throws Exc
             doThrow(ex).when(fhirResourceHelper).validateInteraction(any(), anyString());
 
             validateOperation.doInvoke(operationContext, Patient.class, "1", null, input, fhirResourceHelper, null);
-
-
     }
 
 }