commit 358130019757e83a0c893b489bc0b36dd5bdfdc2
author Jian Li <pyguni@gmail.com> Fri Feb 19 10:28:01 2021 +0900
committer Jian Li <pyguni@gmail.com> Fri Feb 19 02:11:05 2021 +0000
tree b47eb57ba929cfc82a6e92fa19e56c21c98b4738
parent 80c6f1b20bb4978bbf64be94ecb126b695153382

Fix: refer to services inside each method to avoid SNF exception

Change-Id: I5b668224962874948b0670cb698be1736ddf4e58
(cherry picked from commit f868cd54594aa21003d84bfc7be37742a5e17a78)

apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkWebResource.java

diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkWebResource.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkWebResource.java
index 8ab531f..4e8f5df 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkWebResource.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkWebResource.java
@@ -55,9 +55,6 @@
 
     private static final String RESULT = "result";
 
-    private final KubevirtNetworkAdminService adminService =
-            get(KubevirtNetworkAdminService.class);
-
     /**
      * Creates a network from the JSON input stream.
      *
@@ -71,13 +68,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Response createNetwork(InputStream input) {
         log.trace(String.format(MESSAGE, "CREATE"));
+        KubevirtNetworkAdminService service = get(KubevirtNetworkAdminService.class);
         URI location;
 
         try {
             ObjectNode jsonTree = readTreeFromStream(mapper(), input);
             final KubevirtNetwork network =
                     codec(KubevirtNetwork.class).decode(jsonTree, this);
-            adminService.createNetwork(network);
+            service.createNetwork(network);
             location = new URI(network.networkId());
         } catch (IOException | URISyntaxException e) {
             throw new IllegalArgumentException(e);
@@ -101,6 +99,7 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Response updateNetwork(@PathParam("id") String id, InputStream input) {
         log.trace(String.format(MESSAGE, "UPDATED"));
+        KubevirtNetworkAdminService service = get(KubevirtNetworkAdminService.class);
 
         try {
             ObjectNode jsonTree = readTreeFromStream(mapper(), input);
@@ -112,7 +111,7 @@
 
             final KubevirtNetwork network =
                     codec(KubevirtNetwork.class).decode(jsonTree, this);
-            adminService.updateNetwork(network);
+            service.updateNetwork(network);
         } catch (IOException e) {
             throw new IllegalArgumentException(e);
         }
@@ -130,8 +129,9 @@
     @Path("{id}")
     public Response removeNetwork(@PathParam("id") String id) {
         log.trace(String.format(MESSAGE, "DELETE " + id));
+        KubevirtNetworkAdminService service = get(KubevirtNetworkAdminService.class);
 
-        adminService.removeNetwork(id);
+        service.removeNetwork(id);
         return Response.noContent().build();
     }
 
@@ -146,8 +146,10 @@
     public Response hasNetwork(@PathParam("id") String id) {
         log.trace(String.format(MESSAGE, "QUERY " + id));
 
+        KubevirtNetworkAdminService service = get(KubevirtNetworkAdminService.class);
+
         ObjectNode root = mapper().createObjectNode();
-        KubevirtNetwork network = adminService.network(id);
+        KubevirtNetwork network = service.network(id);
 
         if (network == null) {
             root.put(RESULT, false);
@@ -167,7 +169,8 @@
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public Response getNetworks() {
-        final Iterable<KubevirtNetwork> networks = adminService.networks();
+        KubevirtNetworkAdminService service = get(KubevirtNetworkAdminService.class);
+        final Iterable<KubevirtNetwork> networks = service.networks();
         return ok(encodeArray(KubevirtNetwork.class, "networks", networks)).build();
     }
 
@@ -182,7 +185,8 @@
     @Produces(MediaType.APPLICATION_JSON)
     @Path("{id}")
     public Response getNetworkById(@PathParam("id") String id) {
-        final KubevirtNetwork network = nullIsNotFound(adminService.network(id),
+        KubevirtNetworkAdminService service = get(KubevirtNetworkAdminService.class);
+        final KubevirtNetwork network = nullIsNotFound(service.network(id),
                 NETWORK_NOT_FOUND + id);
         return ok(codec(KubevirtNetwork.class).encode(network, this)).build();
     }