From e34e4d0df23d1919fd9630ba34a8659279086908 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Mon, 16 Oct 2017 18:05:26 -0400 Subject: alaCarteSet unrecognized field The aLaCarte and aLaCarteSet fields in RequestParameters class and their corresponsding methods are not consistently named, and thus they are not serialized/deserialized correctly by the Jackson JSON utilities. We were seeing this sort of thing in the requests database: "requestParameters": { "subscriptionServiceType": "vFW", "aLaCarte": true, "autoBuildVfModules": false, "cascadeDelete": false, "usePreload": true, "rebuildVolumeGroups": false, "alaCarteSet": true, "alaCarte": true } We obviously shouldn't have "alaCarte" as well as "aLaCarte". And I don't think we want "alaCarteSet" to be persisted in the DB at all (it should be ignored by the JSON mapper). Issue: SO-219 Change-Id: Ia943d2970cb7db153f3af73289f426a154917f7e Signed-off-by: Rob Daugherty --- .../java/org/openecomp/mso/apihandlerinfra/MsoRequest.java | 4 ++-- .../org/openecomp/mso/apihandlerinfra/ServiceInstances.java | 2 +- .../serviceinstancebeans/RequestParameters.java | 12 ++++-------- .../org/openecomp/mso/apihandlerinfra/MsoRequestTest.java | 6 +++--- 4 files changed, 10 insertions(+), 14 deletions(-) (limited to 'mso-api-handlers') 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 9b975facc6..27c3c2b283 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 @@ -254,7 +254,7 @@ public class MsoRequest { RequestParameters requestParameters = sir.getRequestDetails().getRequestParameters(); if(this.reqVersion >= 3){ if(requestParameters!=null){ - this.aLaCarteFlag = sir.getRequestDetails().getRequestParameters().getALaCarte(); + this.aLaCarteFlag = sir.getRequestDetails().getRequestParameters().isaLaCarte(); }else{ this.aLaCarteFlag = false; } @@ -1010,4 +1010,4 @@ public class MsoRequest { public void setReqVersion(int reqVersion) { this.reqVersion = reqVersion; } -} \ No newline at end of file +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java index 66a14db610..6413c4bf57 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java @@ -771,7 +771,7 @@ public class ServiceInstances { } //if an aLaCarte flag was sent in the request, throw an error if the recipe was not found RequestParameters reqParam = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters(); - if(reqParam!=null && reqParam.isALaCarteSet() && recipe==null){ + if(reqParam!=null && reqParam.isaLaCarteSet() && recipe==null){ return null; }else if (recipe == null) { //aLaCarte wasn't sent, so we'll try the default serviceRecord = db.getServiceByModelName(defaultServiceModelName); diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java index a2acc3c3e4..f34272954d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java @@ -36,7 +36,7 @@ public class RequestParameters { @JsonSerialize(include=Inclusion.ALWAYS) private boolean aLaCarte = false; @JsonIgnore - private boolean isALaCarteSet = false; + private boolean aLaCarteSet = false; @JsonSerialize(include=Inclusion.ALWAYS) private boolean autoBuildVfModules = false; @JsonSerialize(include=Inclusion.ALWAYS) @@ -55,18 +55,14 @@ public class RequestParameters { this.subscriptionServiceType = subscriptionServiceType; } - public boolean getALaCarte() { - return aLaCarte; - } - public void setaLaCarte(boolean aLaCarte) { this.aLaCarte = aLaCarte; - this.isALaCarteSet = true; + this.aLaCarteSet = true; } //returns true if aLaCarte param came in on request - public boolean isALaCarteSet() { - return isALaCarteSet; + public boolean isaLaCarteSet() { + return aLaCarteSet; } public boolean isaLaCarte() { diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java index d20357d4be..6a7fc2c723 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java @@ -84,7 +84,7 @@ public class MsoRequestTest { assertEquals(msoRequest.getRequestInfo().getSource(),"VID"); assertFalse(msoRequest.getALaCarteFlag()); assertEquals(msoRequest.getReqVersion(),3); - boolean testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isALaCarteSet(); + boolean testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isaLaCarteSet(); assertFalse(testIsALaCarteSet); } @@ -186,13 +186,13 @@ public class MsoRequestTest { ServiceInstancesRequest sir = mapper.readValue(requestJSON1, ServiceInstancesRequest.class); MsoRequest msoRequest = new MsoRequest ("1234"); msoRequest.parse(sir, instanceIdMap, Action.deleteInstance, "v3"); - boolean testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isALaCarteSet(); + boolean testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isaLaCarteSet(); assertTrue(testIsALaCarteSet); assertFalse(msoRequest.getALaCarteFlag()); sir = mapper.readValue(requestJSON2, ServiceInstancesRequest.class); msoRequest = new MsoRequest ("12345"); msoRequest.parse(sir, instanceIdMap, Action.deleteInstance, "v3"); - testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isALaCarteSet(); + testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isaLaCarteSet(); assertTrue(testIsALaCarteSet); assertTrue(msoRequest.getALaCarteFlag()); -- cgit 1.2.3-korg