commit 094a135ef58243bdb809c458f8e3a7ef26af019a
author Ray Milkey <ray@opennetworking.org> Mon Jan 22 14:03:54 2018 -0800
committer Thomas Vachuska <tom@opennetworking.org> Thu Jan 25 01:16:03 2018 +0000
tree 869dabb3a1a590de7ee975925c4db7b7426b27de
parent 96b2640b27be2feaf36eaeb0e963464b4cd7283f

Removed the setServiceDirectory() method from the base web resource

This is a testing only API and potentially dangerous to allow to be public.
I modified the tests that use it to set the value using TestUtils.setField()

Change-Id: Ic590f4641f4e3de208dffa16b3df9a9a2106114b

apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsCollectorResourceTest.java

diff --git a/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsCollectorResourceTest.java b/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsCollectorResourceTest.java
index b505cd5..a225113 100644
--- a/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsCollectorResourceTest.java
+++ b/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsCollectorResourceTest.java
@@ -32,7 +32,6 @@
 import org.onlab.metrics.MetricsService;
 import org.onlab.osgi.ServiceDirectory;
 import org.onlab.osgi.TestServiceDirectory;
-import org.onlab.rest.BaseResource;
 import org.onosproject.cpman.ControlPlaneMonitorService;
 import org.onosproject.cpman.SystemInfo;
 import org.onosproject.cpman.impl.SystemInfoFactory;
@@ -86,7 +85,7 @@
                 new TestServiceDirectory()
                         .add(ControlPlaneMonitorService.class, mockControlPlaneMonitorService)
                         .add(MetricsService.class, mockMetricsService);
-        BaseResource.setServiceDirectory(testDirectory);
+        setServiceDirectory(testDirectory);
     }
 
     /**