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/cfm/src/test/java/org/onosproject/cfm/impl/MaWebResourceTest.java

diff --git a/apps/cfm/src/test/java/org/onosproject/cfm/impl/MaWebResourceTest.java b/apps/cfm/src/test/java/org/onosproject/cfm/impl/MaWebResourceTest.java
index 6378ea9..8216dde 100644
--- a/apps/cfm/src/test/java/org/onosproject/cfm/impl/MaWebResourceTest.java
+++ b/apps/cfm/src/test/java/org/onosproject/cfm/impl/MaWebResourceTest.java
@@ -22,7 +22,6 @@
 import org.onlab.osgi.ServiceDirectory;
 import org.onlab.osgi.TestServiceDirectory;
 import org.onlab.packet.VlanId;
-import org.onlab.rest.BaseResource;
 import org.onosproject.cfm.CfmCodecContext;
 import org.onosproject.codec.CodecService;
 import org.onosproject.incubator.net.l2monitoring.cfm.Component;
@@ -43,7 +42,6 @@
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;
-
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -72,7 +70,7 @@
         ServiceDirectory testDirectory = new TestServiceDirectory()
                 .add(CfmMdService.class, mdService)
                 .add(CodecService.class, context.codecManager());
-        BaseResource.setServiceDirectory(testDirectory);
+        setServiceDirectory(testDirectory);
 
         ma1 = DefaultMaintenanceAssociation
                 .builder(MANAME1, MDNAME1.getNameLength())