Revert "Refactoring to move code to right locations. Attempt at breaking dependency cycles."
This reverts commit 58819b4dcc697f63872bee9f3ddd41a0c4d8fca5.
diff --git a/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java b/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java
index 53fafd3..2e92f5b 100644
--- a/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java
+++ b/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java
@@ -2,16 +2,13 @@
import org.onlab.onos.net.DeviceId;
import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.device.DeviceMastershipListener;
-import org.onlab.onos.net.device.DeviceMastershipService;
-import org.onlab.onos.net.device.DeviceMastershipTermService;
import java.util.Set;
/**
* Test adapter for mastership service.
*/
-public class MastershipServiceAdapter implements DeviceMastershipService {
+public class MastershipServiceAdapter implements MastershipService {
@Override
public MastershipRole getLocalRole(DeviceId deviceId) {
return null;
@@ -37,15 +34,15 @@
}
@Override
- public void addListener(DeviceMastershipListener listener) {
+ public void addListener(MastershipListener listener) {
}
@Override
- public void removeListener(DeviceMastershipListener listener) {
+ public void removeListener(MastershipListener listener) {
}
@Override
- public DeviceMastershipTermService requestTermService() {
+ public MastershipTermService requestTermService() {
return null;
}
}