Upgrade java 17

Issue-ID: USECASEUI-823
Change-Id: I935b08e9221b1dc17aa16d573efe5e3757609d3b
Signed-off-by: kaixiliu <liukaixi@chinamobile.com>

14 files changed, 18 insertions, 31 deletions

diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/AllottedResourceTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/AllottedResourceTest.java
index 106d2fc0..e76f603e 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/AllottedResourceTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/AllottedResourceTest.java
@@ -19,8 +19,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.mockito.Matchers.anyObject;
-
 public class AllottedResourceTest {
     @Before
     public void before() throws Exception {
@@ -58,7 +56,7 @@ public class AllottedResourceTest {
         ar.setAccessNodeId("");
         ar.setAccessProviderId("");
         ar.setAccessTopologyId("");
-        ar.setAdditionalProperty("", anyObject());
+        ar.setAdditionalProperty("",null);
         ar.setCvlan("");
         ar.setId("");
         ar.setModelInvariantId("");
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ConnectivityTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ConnectivityTest.java
index 02193720..ff841191 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ConnectivityTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ConnectivityTest.java
@@ -18,8 +18,8 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
-import static org.mockito.Matchers.anyObject;
 
 public class ConnectivityTest {
     @Before
@@ -66,7 +66,7 @@ public class ConnectivityTest {
         c.setAccessNodeId("");
         c.setAccessProviderId("");
         c.setAccessTopologyId("");
-        c.setAdditionalProperty("",anyObject());
+        c.setAdditionalProperty("", "");
         c.setBandwidthProfileName("");
         c.setCbs("");
         c.setColorAware("");
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceDeleteTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceDeleteTest.java
index 726992f4..5620ec5d 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceDeleteTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceDeleteTest.java
@@ -19,8 +19,8 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
-import static org.mockito.Matchers.anyObject;
 
 public class E2EServiceDeleteTest {
     @Before
@@ -41,7 +41,7 @@ public class E2EServiceDeleteTest {
     @Test
     public void  testSetE2EServiceDelete() throws Exception{
         E2EServiceDelete e2esd = new E2EServiceDelete();
-        e2esd.setAdditionalProperty("", anyObject());
+        e2esd.setAdditionalProperty("","");
         e2esd.setGlobalSubscriberId("");
         e2esd.setServiceType("");
     }
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequestTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequestTest.java
index b3963330..7d279cff 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequestTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequestTest.java
@@ -19,8 +19,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
+
 
 public class E2EServiceInstanceRequestTest {
     @Before
@@ -40,8 +40,8 @@ public class E2EServiceInstanceRequestTest {
     @Test
     public void  testSetE2EServiceInstanceRequest() throws Exception{
         E2EServiceInstanceRequest e2esir = new E2EServiceInstanceRequest();
-        e2esir.setAdditionalProperty("",anyObject());
+        e2esir.setAdditionalProperty("","");
         e2esir.setAdditionalProperties(null);
-        e2esir.setService(any());
+        e2esir.setService(null);
     }
 }
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileWrapperTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileWrapperTest.java
index bcc7002d..e6a7d290 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileWrapperTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileWrapperTest.java
@@ -19,8 +19,8 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
-import static org.mockito.Matchers.any;
 
 public class FileWrapperTest {
     @Before
@@ -39,7 +39,7 @@ public class FileWrapperTest {
     @Test
     public void  testSetFileWrapper() throws Exception{
         FileWrapper fw = new  FileWrapper();
-        fw.setFile(any());
+        fw.setFile(null);
     }
 
 }
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/LogicalLinkTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/LogicalLinkTest.java
index 2861ff2c..65ec77d0 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/LogicalLinkTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/LogicalLinkTest.java
@@ -19,9 +19,8 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyObject;
 
 public class LogicalLinkTest {
     @Before
@@ -45,13 +44,13 @@ public class LogicalLinkTest {
     @Test
     public void  testSetlogicalLink() throws Exception{
         LogicalLink Ll = new LogicalLink();
-        Ll.setAdditionalProperty("", anyObject());
+        Ll.setAdditionalProperty("", "");
         Ll.setInMaint(true);
         Ll.setLinkName("");
         Ll.setLinkType("");
         Ll.setOperationalStatus("");
         Ll.setResourceVersion("");
-        Ll.setRelationshipList(any());
+        Ll.setRelationshipList(null);
     }
 
 }
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfigTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfigTest.java
index a8761d63..7f7f5704 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfigTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfigTest.java
@@ -19,8 +19,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.List;
-
 public class ModelConfigTest {
     @Before
     public void before() throws Exception {
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/PnfTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/PnfTest.java
index d011b09e..6a493ac9 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/PnfTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/PnfTest.java
@@ -18,8 +18,8 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
-import static org.mockito.Matchers.anyObject;
 
 public class PnfTest {
     @Before
@@ -47,7 +47,7 @@ public class PnfTest {
     public void testSetPnf() throws Exception {
         Pnf pnf = new Pnf();
         pnf.setPnfId("");
-        pnf.setAdditionalProperty("", anyObject());
+        pnf.setAdditionalProperty("", null);
         pnf.setAdminStatus("");
         pnf.setInMaint(true);
         pnf.setOperationalStatus("");
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequestTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequestTest.java
index d2f55bd4..02b441c9 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequestTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequestTest.java
@@ -21,7 +21,6 @@ import org.junit.Test;
 
 import java.util.HashMap;
 
-import static org.mockito.Matchers.anyObject;
 
 public class ResourceRequestTest {
 
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceResponseTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceResponseTest.java
index c00b8956..c73bf595 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceResponseTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceResponseTest.java
@@ -19,8 +19,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.List;
-
 public class ResourceResponseTest {
     @Before
     public void before() throws Exception {
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/UniTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/UniTest.java
index eb67ac8c..9e152cae 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/UniTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/UniTest.java
@@ -18,7 +18,6 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
 public class UniTest {
     @Before
     public void before() throws Exception {
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VnfsTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VnfsTest.java
index 693fe4d4..edec03d8 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VnfsTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VnfsTest.java
@@ -18,7 +18,6 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
 public class VnfsTest {
     @Before
     public void before() throws Exception {
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBindingTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBindingTest.java
index d5533422..cfae9294 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBindingTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBindingTest.java
@@ -18,7 +18,6 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
 public class VpnBindingTest {
     @Before
     public void before() throws Exception {
diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnInformationTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnInformationTest.java
index 817d21c6..593d7810 100644
--- a/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnInformationTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnInformationTest.java
@@ -18,9 +18,7 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
-import static org.mockito.Matchers.anyObject;
-
+import org.mockito.Mockito;
 public class VpnInformationTest {
     @Before
     public void before() throws Exception {
@@ -59,7 +57,7 @@ public class VpnInformationTest {
         vi.setAccessClientId("");
         vi.setAccessProviderId("");
         vi.setAccessTopologyId("");
-        vi.setAdditionalProperty("", anyObject());
+        vi.setAdditionalProperty("", "");
         vi.setDstAccessLtpId("");
         vi.setOperationalStatus("");
         vi.setResourceVersion("");