Flatten MastershipTermService
Change-Id: Ic75b7376f7436c76f69127d6137577ec2fc09d2b
diff --git a/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
index dbb3ae4..e97a553 100644
--- a/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
+++ b/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
@@ -50,7 +50,7 @@
@Component(immediate = true)
@Service
public class MastershipManager
-implements MastershipService, MastershipAdminService {
+ implements MastershipService, MastershipAdminService, MastershipTermService {
private static final String NODE_ID_NULL = "Node ID cannot be null";
private static final String DEVICE_ID_NULL = "Device ID cannot be null";
@@ -159,8 +159,8 @@
}
@Override
- public MastershipTermService requestTermService() {
- return new InternalMastershipTermService();
+ public MastershipTerm getMastershipTerm(DeviceId deviceId) {
+ return store.getTermFor(deviceId);
}
@Override
@@ -184,14 +184,7 @@
}
}
- private class InternalMastershipTermService implements MastershipTermService {
- @Override
- public MastershipTerm getMastershipTerm(DeviceId deviceId) {
- return store.getTermFor(deviceId);
- }
-
- }
//callback for reacting to cluster events
private class InternalClusterEventListener implements ClusterEventListener {