From 096c0fee2751a8bac1e67b21867e5b23f6a93b63 Mon Sep 17 00:00:00 2001 From: ajay priyadarshi Date: Wed, 14 Mar 2018 12:05:08 +0530 Subject: [PATCH] sonar fix:cbam serialization VimInfoType cbam/bo/entity/VimInfoType.java file name: OpenstackV2Info.java, OpenstackV3Info.java ... Change-Id: I10e90b59851513406e06d6f6701c7371ce6d3c5a Issue-ID: VFC-813 Signed-off-by: ajay priyadarshi --- .../vnfm/svnfm/cbam/bo/entity/OpenstackV2Info.java | 7 ++--- .../vnfm/svnfm/cbam/bo/entity/OpenstackV3Info.java | 5 ++- .../vnfm/svnfm/cbam/bo/entity/OtherVimInfo.java | 5 ++- .../vnfm/svnfm/cbam/bo/entity/VimInfoType.java | 36 +++++++++------------- .../svnfm/cbam/bo/entity/VmwareVcloudInfo.java | 3 +- 5 files changed, 23 insertions(+), 33 deletions(-) diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OpenstackV2Info.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OpenstackV2Info.java index 3ffa0fb0..1f1eb1ca 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OpenstackV2Info.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OpenstackV2Info.java @@ -14,10 +14,10 @@ * limitations under the License. */ package org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity; - +import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonProperty; -public class OpenstackV2Info { +public class OpenstackV2Info implements Serializable { @JsonProperty("vimInfoType") private VimInfoType vimInfoType; @@ -52,7 +52,4 @@ public class OpenstackV2Info { this.accessInfo = accessInfo; } - - - } diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OpenstackV3Info.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OpenstackV3Info.java index 22de770e..7d4c53e6 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OpenstackV3Info.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OpenstackV3Info.java @@ -16,8 +16,9 @@ package org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity; import com.fasterxml.jackson.annotation.JsonProperty; +import java.io.Serializable; -public class OpenstackV3Info { +public class OpenstackV3Info implements Serializable { @JsonProperty("vimInfoType") private VimInfoType vimInfoType; @@ -52,6 +53,4 @@ public class OpenstackV3Info { this.accessInfo = accessInfo; } - - } diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OtherVimInfo.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OtherVimInfo.java index 4b7fb072..1cedf98b 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OtherVimInfo.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/OtherVimInfo.java @@ -15,9 +15,10 @@ */ package org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity; +import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonProperty; -public class OtherVimInfo { +public class OtherVimInfo implements Serializable { @JsonProperty("vimInfoType") private VimInfoType vimInfoType; @@ -40,6 +41,4 @@ public class OtherVimInfo { this.id = id; } - - } diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/VimInfoType.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/VimInfoType.java index 779e2659..5be96a88 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/VimInfoType.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/VimInfoType.java @@ -14,28 +14,22 @@ * limitations under the License. */ package org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity; +import java.io.Serializable; -public enum VimInfoType { - - OPENSTACK_V2_INFO { +public enum VimInfoType implements Serializable{ + + OPENSTACK_V2_INFO { private OpenstackV2Info openstackv2; - - }, - OPENSTACK_V3_INFO{ - private OpenstackV3Info openstackv3; - }, - VMWARE_VCLOUD_INFO{ - private VmwareVcloudInfo vmwareInfo; - }, - OTHER_VIM_INFO{ - private OtherVimInfo other; - } - - - - - - - + + }, + OPENSTACK_V3_INFO{ + private OpenstackV3Info openstackv3; + }, + VMWARE_VCLOUD_INFO{ + private VmwareVcloudInfo vmwareInfo; + }, + OTHER_VIM_INFO{ + private OtherVimInfo other; + } } diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/VmwareVcloudInfo.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/VmwareVcloudInfo.java index 746cb007..73446461 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/VmwareVcloudInfo.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/entity/VmwareVcloudInfo.java @@ -15,9 +15,10 @@ */ package org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity; +import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonProperty; -public class VmwareVcloudInfo { +public class VmwareVcloudInfo implements Serializable{ @JsonProperty("vimInfoType") private VimInfoType vimInfoType; -- 2.16.6