Pnf pojo improvements

- added builder
- immutable
- improved json serialization

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

1 files changed, 23 insertions, 8 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/model/AaiGetPnfs/PnfTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/model/AaiGetPnfs/PnfTest.java
index 2d7d2aad3..7a5d3ad91 100644
--- a/vid-app-common/src/test/java/org/onap/vid/aai/model/AaiGetPnfs/PnfTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/model/AaiGetPnfs/PnfTest.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,16 +21,30 @@
 
 package org.onap.vid.aai.model.AaiGetPnfs;
 
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
-import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
 
 public class PnfTest {
 
     @Test
-    public void shouldHaveValidGettersAndSetters(){
-        assertThat(Pnf.class, hasValidGettersAndSetters());
-    }
+    public void builder_shouldProperlyConstructObject() {
+        Pnf pnf = Pnf.builder()
+            .withPnfId("pnfId")
+            .withPnfName("TestPnf")
+            .withPnfName2("pnfName2")
+            .withPnfName2Source("pnfNameSource")
+            .withEquipModel("model")
+            .withEquipType("type")
+            .withEquipVendor("vendor")
+            .build();
 
+        assertThat(pnf.getPnfId()).isEqualTo("pnfId");
+        assertThat(pnf.getPnfName()).isEqualTo("TestPnf");
+        assertThat(pnf.getPnfName2()).isEqualTo("pnfName2");
+        assertThat(pnf.getPnfName2Source()).isEqualTo("pnfNameSource");
+        assertThat(pnf.getEquipModel()).isEqualTo("model");
+        assertThat(pnf.getEquipType()).isEqualTo("type");
+        assertThat(pnf.getEquipVendor()).isEqualTo("vendor");
+    }
 }