From 76455ea6b8dfcae239c2929e02c3eba0cca4cbe9 Mon Sep 17 00:00:00 2001
From: Munir Ahmad <munir.ahmad@bell.ca>
Date: Sat, 24 Feb 2018 12:44:49 -0500
Subject: Simplify if statements where it makes sense
Change-Id: Id04ede6b8aa8fa3ca8c02b8c32ad5f4745ef47f4
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
---
.../org/openecomp/mso/apihandlerinfra/MsoRequest.java | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
(limited to 'mso-api-handlers/mso-api-handler-infra/src')
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java
index 27c3c2b283..7d45c4b0a2 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java
@@ -252,15 +252,12 @@ public class MsoRequest {
}
RequestParameters requestParameters = sir.getRequestDetails().getRequestParameters();
- if(this.reqVersion >= 3){
- if(requestParameters!=null){
- this.aLaCarteFlag = sir.getRequestDetails().getRequestParameters().isaLaCarte();
- }else{
- this.aLaCarteFlag = false;
- }
- }else{
- this.aLaCarteFlag = true;
- }
+ if (this.reqVersion >= 3) {
+ this.aLaCarteFlag =
+ requestParameters != null && sir.getRequestDetails().getRequestParameters().isaLaCarte();
+ } else {
+ this.aLaCarteFlag = true;
+ }
if(requestParameters != null && (reqVersion < 3) && requestParameters.getAutoBuildVfModules()){
throw new ValidationException("AutoBuildVfModule", version);
--
cgit