OperationalEnvironment improvements

-added new unit test to AaiControllerTest
-OperationalEnvironment and List are now immutable
-builder improvements
-removed redundant test

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

1 files changed, 17 insertions, 19 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentList.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentList.java
index 13c6ada2d..6b3fbbd64 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentList.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentList.java
@@ -3,13 +3,14 @@
  * VID
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * 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.
@@ -20,30 +21,27 @@
 
 package org.onap.vid.aai.model.AaiGetOperationalEnvironments;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.onap.vid.aai.OperationalEnvironment;
+import static com.fasterxml.jackson.annotation.JsonProperty.Access.WRITE_ONLY;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Collections;
 import java.util.List;
+import org.onap.vid.aai.OperationalEnvironment;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class OperationalEnvironmentList {
-
-    public List<OperationalEnvironment> getOperationalEnvironment() {
-        return operationalEnvironment;
-    }
+public final class OperationalEnvironmentList {
 
-    @JsonAlias("operational-environment")
-    public void setOperationalEnvironment(List<OperationalEnvironment> operationalEnvironment) {
-        this.operationalEnvironment = operationalEnvironment;
-    }
+    private final List<OperationalEnvironment> operationalEnvironment;
 
-    public OperationalEnvironmentList() {
+    @JsonCreator
+    public OperationalEnvironmentList(
+        @JsonProperty(value = "operational-environment", access = WRITE_ONLY) List<OperationalEnvironment> operationalEnvironment) {
+        this.operationalEnvironment = Collections.unmodifiableList(operationalEnvironment);
     }
 
-    public OperationalEnvironmentList(List<OperationalEnvironment> operationalEnvironment) {
-        this.operationalEnvironment = operationalEnvironment;
+    public List<OperationalEnvironment> getOperationalEnvironment() {
+        return operationalEnvironment;
     }
-
-    private List<OperationalEnvironment> operationalEnvironment;
 }