From e649bf558a04bf7a3756fa2238db219878c3fafc Mon Sep 17 00:00:00 2001
From: Shudong Zhou <shudongzhou@gmail.com>
Date: Thu, 18 Apr 2013 08:09:54 -0700
Subject: [PATCH] Revert "Minor findbugs fix for OFSwitchBase"
This reverts commit 2dae941efe4bff9bf6a99ab7e3932fa2c74f8139, breaks json contract
---
src/main/java/net/floodlightcontroller/core/IOFSwitch.java | 3 ++-
src/main/java/net/floodlightcontroller/core/OFSwitchBase.java | 4 ++--
.../floodlightcontroller/util/OFMessageDamperMockSwitch.java | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/IOFSwitch.java b/src/main/java/net/floodlightcontroller/core/IOFSwitch.java
index 0d823d839..6bc92c98f 100644
--- a/src/main/java/net/floodlightcontroller/core/IOFSwitch.java
+++ b/src/main/java/net/floodlightcontroller/core/IOFSwitch.java
@@ -20,6 +20,7 @@ package net.floodlightcontroller.core;
import java.io.IOException;
import java.net.SocketAddress;
import java.util.Collection;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Future;
@@ -292,7 +293,7 @@ public interface IOFSwitch {
* Retrieves the date the switch connected to this controller
* @return the date
*/
- public String getConnectedSince();
+ public Date getConnectedSince();
/**
* Returns the next available transaction id
diff --git a/src/main/java/net/floodlightcontroller/core/OFSwitchBase.java b/src/main/java/net/floodlightcontroller/core/OFSwitchBase.java
index 8e00a08c8..465df255d 100644
--- a/src/main/java/net/floodlightcontroller/core/OFSwitchBase.java
+++ b/src/main/java/net/floodlightcontroller/core/OFSwitchBase.java
@@ -440,8 +440,8 @@ public abstract class OFSwitchBase implements IOFSwitch {
}
@Override
- public String getConnectedSince() {
- return connectedSince.toString();
+ public Date getConnectedSince() {
+ return connectedSince;
}
@JsonIgnore
diff --git a/src/test/java/net/floodlightcontroller/util/OFMessageDamperMockSwitch.java b/src/test/java/net/floodlightcontroller/util/OFMessageDamperMockSwitch.java
index c4f8b83db..29191365c 100644
--- a/src/test/java/net/floodlightcontroller/util/OFMessageDamperMockSwitch.java
+++ b/src/test/java/net/floodlightcontroller/util/OFMessageDamperMockSwitch.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.net.SocketAddress;
import java.util.Collection;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Future;
@@ -227,7 +228,7 @@ public class OFMessageDamperMockSwitch implements IOFSwitch {
}
@Override
- public String getConnectedSince() {
+ public Date getConnectedSince() {
assertTrue("Unexpected method call", false);
return null;
}
--
GitLab