Remove duplicate registrations.
- MapEvent.class, MapEvent.Type.class, Versioned.class part of API,
and all the existing caller was supplying API as base namespace.
- MeterId, MapUpdate part of API
- Default{Device, Port} part of API
- WallClockTimestamp is always added by ECMap
Change-Id: I654c892549e6dddbe5e1f86dbb41d1ca4e84611f
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/DistributedMeterStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/DistributedMeterStore.java
index ecef57f..be7de21 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/DistributedMeterStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/DistributedMeterStore.java
@@ -32,7 +32,6 @@
import org.onosproject.net.meter.Meter;
import org.onosproject.net.meter.MeterEvent;
import org.onosproject.net.meter.MeterFailReason;
-import org.onosproject.net.meter.MeterId;
import org.onosproject.net.meter.MeterKey;
import org.onosproject.net.meter.MeterOperation;
import org.onosproject.net.meter.MeterState;
@@ -103,8 +102,7 @@
Band.Type.class,
MeterState.class,
Meter.Unit.class,
- MeterFailReason.class,
- MeterId.class)).build();
+ MeterFailReason.class)).build();
meters.addListener(mapListener);
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualNetworkStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualNetworkStore.java
index 1452dfc..800ecfd 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualNetworkStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualNetworkStore.java
@@ -42,8 +42,6 @@
import org.onosproject.incubator.net.virtual.VirtualNetworkStoreDelegate;
import org.onosproject.incubator.net.virtual.VirtualPort;
import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.DefaultDevice;
-import org.onosproject.net.DefaultPort;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Port;
@@ -133,10 +131,9 @@
.register(VirtualPort.class)
.register(DefaultVirtualPort.class)
.register(Device.class)
- .register(DefaultDevice.class)
- .register(DefaultPort.class)
.register(TunnelId.class)
- .nextId(KryoNamespaces.BEGIN_USER_CUSTOM_ID).build());
+ .nextId(KryoNamespaces.BEGIN_USER_CUSTOM_ID)
+ .build("VirtualNetworkStore"));
/**
* Distributed network store service activate method.