cherry pick [ONOS-4986] [ONOS-4985] Json defect fix to master
Change-Id: Ia9ead1babf3de43e6f492f4f3b6f4d6b9377b042
diff --git a/apps/pce/app/src/main/java/org/onosproject/pce/pcestore/DistributedPceStore.java b/apps/pce/app/src/main/java/org/onosproject/pce/pcestore/DistributedPceStore.java
index ea5dca0..47f1c46 100644
--- a/apps/pce/app/src/main/java/org/onosproject/pce/pcestore/DistributedPceStore.java
+++ b/apps/pce/app/src/main/java/org/onosproject/pce/pcestore/DistributedPceStore.java
@@ -98,6 +98,17 @@
// List of PCC LSR ids whose BGP device information was not available to perform
// label db sync.
private HashSet<DeviceId> pendinglabelDbSyncPccMap = new HashSet();
+ private static final Serializer SERIALIZER = Serializer
+ .using(new KryoNamespace.Builder().register(KryoNamespaces.API)
+ .register(PcePathInfo.class)
+ .register(CostConstraint.class)
+ .register(CostConstraint.Type.class)
+ .register(BandwidthConstraint.class)
+ .register(SharedBandwidthConstraint.class)
+ .register(CapabilityConstraint.class)
+ .register(CapabilityConstraint.CapabilityType.class)
+ .register(LspType.class)
+ .build());
@Activate
protected void activate() {
@@ -136,19 +147,7 @@
failedPathSet = storageService.<PcePathInfo>setBuilder()
.withName("failed-path-info")
- .withSerializer(Serializer.using(
- new KryoNamespace.Builder()
- .register(KryoNamespaces.API)
- .register(PcePathInfo.class,
- CostConstraint.class,
- CostConstraint.Type.class,
- BandwidthConstraint.class,
- SharedBandwidthConstraint.class,
- CapabilityConstraint.class,
- CapabilityConstraint.CapabilityType.class,
- LspType.class)
- .build()))
-
+ .withSerializer(SERIALIZER)
.build()
.asDistributedSet();