Remove redundent byte[].class registration
Also added names to some serializer for debugging purpose
Change-Id: I0997b61a5d08df84c85ca28f6a5ed23417fb8c22
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java
index f78722d..b260751 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java
@@ -120,12 +120,12 @@
mcastNextObjStore = storageService
.<McastStoreKey, NextObjective>consistentMapBuilder()
.withName("onos-mcast-nextobj-store")
- .withSerializer(Serializer.using(mcastKryo.build()))
+ .withSerializer(Serializer.using(mcastKryo.build("McastHandler-NextObj")))
.build();
mcastRoleStore = storageService
.<McastStoreKey, McastRole>consistentMapBuilder()
.withName("onos-mcast-role-store")
- .withSerializer(Serializer.using(mcastKryo.build()))
+ .withSerializer(Serializer.using(mcastKryo.build("McastHandler-Role")))
.build();
}
diff --git a/apps/test/messaging-perf/src/main/java/org/onosproject/messagingperf/MessagingPerfApp.java b/apps/test/messaging-perf/src/main/java/org/onosproject/messagingperf/MessagingPerfApp.java
index e77cf41..7d13ec5 100644
--- a/apps/test/messaging-perf/src/main/java/org/onosproject/messagingperf/MessagingPerfApp.java
+++ b/apps/test/messaging-perf/src/main/java/org/onosproject/messagingperf/MessagingPerfApp.java
@@ -130,9 +130,8 @@
serializerPool = KryoNamespace.newBuilder()
.register(KryoNamespaces.BASIC)
.register(KryoNamespaces.MISC)
- .register(byte[].class)
.register(Data.class)
- .build();
+ .build("MessagingPerfApp");
}
};
diff --git a/core/store/dist/src/main/java/org/onosproject/store/flowobjective/impl/DistributedFlowObjectiveStore.java b/core/store/dist/src/main/java/org/onosproject/store/flowobjective/impl/DistributedFlowObjectiveStore.java
index 5794f45..957523c 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flowobjective/impl/DistributedFlowObjectiveStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flowobjective/impl/DistributedFlowObjectiveStore.java
@@ -66,7 +66,7 @@
new KryoNamespace.Builder()
.register(byte[].class)
.register(Versioned.class)
- .build()))
+ .build("DistributedFlowObjectiveStore")))
.build();
nextIds = storageService.getAtomicCounter("next-objective-counter");
diff --git a/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/AbstractCorsaPipeline.java b/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/AbstractCorsaPipeline.java
index 8ae04d2..e76d9fe 100644
--- a/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/AbstractCorsaPipeline.java
+++ b/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/AbstractCorsaPipeline.java
@@ -105,7 +105,7 @@
.register(DefaultGroupKey.class)
.register(CorsaGroup.class)
.register(byte[].class)
- .build();
+ .build("AbstractCorsaPipeline");
private Cache<GroupKey, NextObjective> pendingGroups;
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/DefaultMoveExtensionTreatment.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/DefaultMoveExtensionTreatment.java
index a2395b8..86b44cf 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/DefaultMoveExtensionTreatment.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/DefaultMoveExtensionTreatment.java
@@ -39,7 +39,7 @@
private final KryoNamespace appKryo = new KryoNamespace.Builder()
.register(byte[].class).register(Integer.class).register(Map.class)
- .build();
+ .build("DefaultMoveExtensionTreatment");
/**
* Creates a new move Treatment.
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraResubmit.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraResubmit.java
index cecdbd3..e1b5be9 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraResubmit.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraResubmit.java
@@ -46,7 +46,7 @@
.register(new PortNumberSerializer(), PortNumber.class)
.register(Map.class).register(HashMap.class)
.register(byte[].class)
- .build();
+ .build("NiciraResubmit");
/**
* Creates a new resubmit instruction.
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraResubmitTable.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraResubmitTable.java
index 47757c3..b3183df 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraResubmitTable.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraResubmitTable.java
@@ -47,7 +47,7 @@
.register(new PortNumberSerializer(), PortNumber.class)
.register(Map.class).register(HashMap.class)
.register(byte[].class)
- .build();
+ .build("NiciraResubmitTable");
/**
* Creates a new resubmit-table instruction.
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraSetTunnelDst.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraSetTunnelDst.java
index 40499bb..efd409a 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraSetTunnelDst.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraSetTunnelDst.java
@@ -39,7 +39,7 @@
private final KryoNamespace appKryo = new KryoNamespace.Builder()
.register(new Ip4AddressSerializer(), Ip4Address.class)
.register(byte[].class)
- .build();
+ .build("NiciraSetTunnelDst");
/**
* Creates a new set tunnel destination instruction.
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/CentecV350Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/CentecV350Pipeline.java
index 216ecc4..183d997 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/CentecV350Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/CentecV350Pipeline.java
@@ -134,7 +134,7 @@
.register(DefaultGroupKey.class)
.register(CentecV350Group.class)
.register(byte[].class)
- .build();
+ .build("CentecV350Pipeline");
private Cache<GroupKey, NextObjective> pendingGroups;
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/DefaultSingleTablePipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/DefaultSingleTablePipeline.java
index 884e41a..8ac24d4 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/DefaultSingleTablePipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/DefaultSingleTablePipeline.java
@@ -69,7 +69,7 @@
.register(DefaultGroupKey.class)
.register(SingleGroup.class)
.register(byte[].class)
- .build();
+ .build("DefaultSingleTablePipeline");
@Override
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
index eca8412..6f42dbc 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
@@ -121,9 +121,8 @@
.register(GroupKey.class)
.register(DefaultGroupKey.class)
.register(Ofdpa2GroupHandler.OfdpaNextGroup.class)
- .register(byte[].class)
.register(ArrayDeque.class)
- .build();
+ .build("Ofdpa2Pipeline");
protected Ofdpa2GroupHandler groupHandler;
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
index 0139573..a323427 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
@@ -114,8 +114,7 @@
.register(GroupKey.class)
.register(DefaultGroupKey.class)
.register(OLTPipelineGroup.class)
- .register(byte[].class)
- .build();
+ .build("OltPipeline");
@Override
public void init(DeviceId deviceId, PipelinerContext context) {
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/PicaPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/PicaPipeline.java
index c407a61..810bceb 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/PicaPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/PicaPipeline.java
@@ -90,8 +90,7 @@
private KryoNamespace appKryo = new KryoNamespace.Builder()
.register(KryoNamespaces.API)
.register(PicaGroup.class)
- .register(byte[].class)
- .build();
+ .build("PicaPipeline");
@Override
public void init(DeviceId deviceId, PipelinerContext context) {
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java
index ad235f9..064a71e 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java
@@ -140,8 +140,7 @@
.register(DefaultGroupKey.class)
.register(TrafficTreatment.class)
.register(SpringOpenGroup.class)
- .register(byte[].class)
- .build();
+ .build("SpringOpenTTP");
@Override
public void init(DeviceId deviceId, PipelinerContext context) {