PombaReqest and ServiceInstance improvements

- fix encapsulation issues
- make object immutable

Change-Id: I7f66aa7ec5e0ba63a9178ad27c8a9466f04e0869
Issue-ID: VID-422
Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>

2 files changed, 93 insertions, 14 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/PombaRequest.java b/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/PombaRequest.java
index f7327acf1..d416420e9 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/PombaRequest.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/PombaRequest.java
@@ -1,7 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2018 AT&T
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Nokia
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
 package org.onap.vid.model.PombaInstance;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 
-public class PombaRequest {
-    public List<ServiceInstance> serviceInstanceList;
+public final class PombaRequest {
+
+    private ImmutableList<ServiceInstance> serviceInstanceList;
+
+    @JsonCreator
+    public PombaRequest(@JsonProperty("serviceInstanceList") List<ServiceInstance> serviceInstanceList) {
+        this.serviceInstanceList = ImmutableList.copyOf(serviceInstanceList);
+    }
+
+    public List<ServiceInstance> getServiceInstanceList() {
+        return serviceInstanceList;
+    }
 }
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/ServiceInstance.java b/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/ServiceInstance.java
index 08b224a3b..f42f35a4d 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/ServiceInstance.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/ServiceInstance.java
@@ -1,21 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2018 AT&T
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Nokia
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
 package org.onap.vid.model.PombaInstance;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+public final class ServiceInstance {
 
-public class ServiceInstance {
+    private String serviceInstanceId;
+    private String modelVersionId;
+    private String modelInvariantId;
+    private String customerId;
+    private String serviceType;
 
-    @JsonProperty
-    public String serviceInstanceId;
+    public ServiceInstance() {
+    }
 
-    @JsonProperty
-    public String modelVersionId;
+    public ServiceInstance(String serviceInstanceId,
+        String modelVersionId,
+        String modelInvariantId,
+        String customerId,
+        String serviceType) {
+        this.serviceInstanceId = serviceInstanceId;
+        this.modelVersionId = modelVersionId;
+        this.modelInvariantId = modelInvariantId;
+        this.customerId = customerId;
+        this.serviceType = serviceType;
+    }
 
-    @JsonProperty
-    public String modelInvariantId;
+    public String getServiceInstanceId() {
+        return serviceInstanceId;
+    }
 
-    @JsonProperty
-    public String customerId;
+    public String getModelVersionId() {
+        return modelVersionId;
+    }
 
-    @JsonProperty
-    public String serviceType;
+    public String getModelInvariantId() {
+        return modelInvariantId;
+    }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public String getServiceType() {
+        return serviceType;
+    }
 }