Update to conform with guava 18

Stopwatch instantiation has changed, so adjust accordingly.

Change-Id: I97800f17c0af3dad038b07c6aa393c44fd9f80ee
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionStats.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionStats.java
index decde537310ca79fc5c5897cd3d2fa45e4d665ed..652e0a12301e3e838e96c892edc29ea7b364890d 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionStats.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionStats.java
@@ -54,7 +54,7 @@ final class BGPSessionStats {
 
     public BGPSessionStats(final Open remoteOpen, final int holdTimerValue, final int keepAlive, final Channel channel,
             final Optional<BGPSessionPreferences> localPreferences, final Collection<BgpTableType> tableTypes) {
-        this.sessionStopwatch = new Stopwatch();
+        this.sessionStopwatch = Stopwatch.createUnstarted();
         this.stats = new BgpSessionState();
         this.stats.setHoldtimeCurrent(holdTimerValue);
         this.stats.setKeepaliveCurrent(keepAlive);

diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java
index 5feea8267476392e97b6fba4eb6cb406084eacda..2d76c4c7a690d99f4a9c4795936c7c2f7ff85e52 100644 (file)
--- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java
+++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java
@@ -33,7 +33,7 @@ final class PCEPRequest {
         this.future = SettableFuture.create();
         this.metadata = metadata;
         this.state = State.UNSENT;
-        this.stopwatch = new Stopwatch().start();
+        this.stopwatch = Stopwatch.createStarted();
     }
 
     protected ListenableFuture<OperationResult> getFuture() {
@@ -66,4 +66,4 @@ final class PCEPRequest {
     public long getElapsedMillis() {
         return this.stopwatch.elapsed(TimeUnit.MILLISECONDS);
     }
-}
\ No newline at end of file
+}

diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java
index 699fbec60a9d8cb5b6de0af1b98cf22c5456a52d..fc58b6390fe89514cd9fb62a4b405f6a28a1945f 100644 (file)
--- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java
+++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java
@@ -43,7 +43,7 @@ final class SessionListenerState {
     private long reqCount = 0;
 
     public SessionListenerState() {
-        this.sessionUpDuration = new Stopwatch();
+        this.sessionUpDuration = Stopwatch.createUnstarted();
         this.capa = new PeerCapabilities();
     }