mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-15 17:31:31 +02:00
Code Issues Projects Releases Wiki Activity

Remove deprecated value() method

Browse Source 
Change-Id: I3056a47f4630a5667f9dc05280a6d0ab1a2c7ca8
This commit is contained in:
Ray Milkey 2018-09-21 12:52:34 -07:00 committed by Thomas Vachuska
parent a8f108ff24
commit d0f017fccb
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/security/src/main/java/org/onosproject/security/store/DistributedSecurityModeStore.java
View File

@ -42,6 +42,7 @@ import org.onosproject.store.service.MapEvent;
import org.onosproject.store.service.MapEventListener; import org.onosproject.store.service.MapEventListener;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.Versioned;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.HashSet; import java.util.HashSet;
@ -232,7 +233,8 @@ public class DistributedSecurityModeStore
return; return;
} }
ApplicationId appId = event.key(); ApplicationId appId = event.key();
SecurityInfo info = event.value().value(); Versioned<SecurityInfo> value = event.type() == MapEvent.Type.REMOVE ? event.oldValue() : event.newValue();
SecurityInfo info = value.value();
if (event.type() == MapEvent.Type.INSERT || event.type() == MapEvent.Type.UPDATE) { if (event.type() == MapEvent.Type.INSERT || event.type() == MapEvent.Type.UPDATE) {
switch (info.getState()) { switch (info.getState()) {

4
core/store/dist/src/main/java/org/onosproject/store/host/impl/DistributedHostStore.java vendored
View File

@ -49,6 +49,7 @@ import org.onosproject.store.service.MapEventListener;
import org.onosproject.store.service.Serializer; import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService; import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.DistributedPrimitive.Status; import org.onosproject.store.service.DistributedPrimitive.Status;
import org.onosproject.store.service.Versioned;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.Collection; import java.util.Collection;
@ -420,7 +421,8 @@ public class DistributedHostStore
private class HostLocationTracker implements MapEventListener<HostId, DefaultHost> { private class HostLocationTracker implements MapEventListener<HostId, DefaultHost> {
@Override @Override
public void event(MapEvent<HostId, DefaultHost> event) { public void event(MapEvent<HostId, DefaultHost> event) {
DefaultHost host = checkNotNull(event.value().value()); Versioned<DefaultHost> value = event.type() == MapEvent.Type.REMOVE ? event.oldValue() : event.newValue();
DefaultHost host = checkNotNull(value.value());
switch (event.type()) { switch (event.type()) {
case INSERT: case INSERT:
updateHostsByIp(host); updateHostsByIp(host);

3
incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/DistributedMeterStore.java
View File

@ -448,7 +448,8 @@ public class DistributedMeterStore extends AbstractStore<MeterEvent, MeterStoreD
@Override @Override
public void event(MapEvent<MeterKey, MeterData> event) { public void event(MapEvent<MeterKey, MeterData> event) {
MeterKey key = event.key(); MeterKey key = event.key();
MeterData data = event.value().value(); Versioned<MeterData> value = event.type() == MapEvent.Type.REMOVE ? event.oldValue() : event.newValue();
MeterData data = value.value();
NodeId master = mastershipService.getMasterFor(data.meter().deviceId()); NodeId master = mastershipService.getMasterFor(data.meter().deviceId());
switch (event.type()) { switch (event.type()) {
case INSERT: case INSERT: