From bc3227f0506764b22e76700212981fcdae58ffe1 Mon Sep 17 00:00:00 2001
From: Rob Adams <rob.adams@bigswitch.com>
Date: Tue, 22 May 2012 10:55:27 -0700
Subject: [PATCH] Add @JsonIgore to length fields for OF statistics replies
---
.../protocol/statistics/OFAggregateStatisticsReply.java | 2 ++
.../org/openflow/protocol/statistics/OFFlowStatisticsReply.java | 2 ++
.../org/openflow/protocol/statistics/OFPortStatisticsReply.java | 2 ++
.../openflow/protocol/statistics/OFQueueStatisticsReply.java | 2 ++
4 files changed, 8 insertions(+)
diff --git a/src/main/java/org/openflow/protocol/statistics/OFAggregateStatisticsReply.java b/src/main/java/org/openflow/protocol/statistics/OFAggregateStatisticsReply.java
index b5a486c31..7dec16b69 100644
--- a/src/main/java/org/openflow/protocol/statistics/OFAggregateStatisticsReply.java
+++ b/src/main/java/org/openflow/protocol/statistics/OFAggregateStatisticsReply.java
@@ -18,6 +18,7 @@
package org.openflow.protocol.statistics;
+import org.codehaus.jackson.annotate.JsonIgnore;
import org.jboss.netty.buffer.ChannelBuffer;
/**
@@ -72,6 +73,7 @@ public class OFAggregateStatisticsReply implements OFStatistics {
}
@Override
+ @JsonIgnore
public int getLength() {
return 24;
}
diff --git a/src/main/java/org/openflow/protocol/statistics/OFFlowStatisticsReply.java b/src/main/java/org/openflow/protocol/statistics/OFFlowStatisticsReply.java
index 420717fb3..803db8a91 100644
--- a/src/main/java/org/openflow/protocol/statistics/OFFlowStatisticsReply.java
+++ b/src/main/java/org/openflow/protocol/statistics/OFFlowStatisticsReply.java
@@ -19,6 +19,7 @@ package org.openflow.protocol.statistics;
import java.util.List;
+import org.codehaus.jackson.annotate.JsonIgnore;
import org.jboss.netty.buffer.ChannelBuffer;
import org.openflow.protocol.OFMatch;
import org.openflow.protocol.action.OFAction;
@@ -195,6 +196,7 @@ public class OFFlowStatisticsReply implements OFStatistics, OFActionFactoryAware
}
@Override
+ @JsonIgnore
public int getLength() {
return U16.f(length);
}
diff --git a/src/main/java/org/openflow/protocol/statistics/OFPortStatisticsReply.java b/src/main/java/org/openflow/protocol/statistics/OFPortStatisticsReply.java
index 047ca5425..87a2465ea 100644
--- a/src/main/java/org/openflow/protocol/statistics/OFPortStatisticsReply.java
+++ b/src/main/java/org/openflow/protocol/statistics/OFPortStatisticsReply.java
@@ -18,6 +18,7 @@
package org.openflow.protocol.statistics;
+import org.codehaus.jackson.annotate.JsonIgnore;
import org.jboss.netty.buffer.ChannelBuffer;
/**
@@ -222,6 +223,7 @@ public class OFPortStatisticsReply implements OFStatistics {
}
@Override
+ @JsonIgnore
public int getLength() {
return 104;
}
diff --git a/src/main/java/org/openflow/protocol/statistics/OFQueueStatisticsReply.java b/src/main/java/org/openflow/protocol/statistics/OFQueueStatisticsReply.java
index 7d0238a3f..03cbb9cef 100644
--- a/src/main/java/org/openflow/protocol/statistics/OFQueueStatisticsReply.java
+++ b/src/main/java/org/openflow/protocol/statistics/OFQueueStatisticsReply.java
@@ -18,6 +18,7 @@
package org.openflow.protocol.statistics;
+import org.codehaus.jackson.annotate.JsonIgnore;
import org.jboss.netty.buffer.ChannelBuffer;
/**
@@ -102,6 +103,7 @@ public class OFQueueStatisticsReply implements OFStatistics {
}
@Override
+ @JsonIgnore
public int getLength() {
return 32;
}
--
GitLab