From f5667a352ef968b8c6f011cd21e6fdb5174006f8 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 4 Mar 2016 10:42:24 +0100 Subject: Removed usused VppPollOperDataImpl.updateOperational() return value Change-Id: I6eaefd0448367abdc5774d931cb22caf73166662 Signed-off-by: Marek Gradzki --- .../main/java/io/fd/honeycomb/v3po/impl/V3poApiRequest.java | 3 --- .../java/io/fd/honeycomb/v3po/impl/VppPollOperDataImpl.java | 12 ++++-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/V3poApiRequest.java b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/V3poApiRequest.java index 5de4cfdf5..5416b3774 100644 --- a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/V3poApiRequest.java +++ b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/V3poApiRequest.java @@ -76,7 +76,6 @@ import org.slf4j.LoggerFactory; */ public class V3poApiRequest { private static final Logger LOG = LoggerFactory.getLogger(V3poApiRequest.class); - public String ifNames = ""; private final VppPollOperDataImpl caller; private final vppApi api; @@ -451,7 +450,5 @@ public class V3poApiRequest { swIf.vtrOp, swIf.vtrPushDot1q, swIf.vtrTag1, swIf.vtrTag2, stats); writeToIfState(iid, intf); - - ifNames += " " + swIf.interfaceName; } } diff --git a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppPollOperDataImpl.java b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppPollOperDataImpl.java index e5cb13f81..aa607c771 100644 --- a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppPollOperDataImpl.java +++ b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppPollOperDataImpl.java @@ -66,10 +66,9 @@ public class VppPollOperDataImpl implements V3poService { /** * TODO-ADD-JAVADOC. - * Update operational data and return string of space separated - * interfaces names + * Updates operational data */ - public String updateOperational() { + public void updateOperational() { V3poApiRequest req = new V3poApiRequest(api, this); version = api.getVppVersion(); @@ -118,17 +117,14 @@ public class VppPollOperDataImpl implements V3poService { // write to oper writeVppState(VPP_STATE, stateBuilder.build()); - - return req.ifNames; } @Override public Future> vppPollOperData() { - String ifNames = updateOperational(); - + updateOperational(); VppPollOperDataOutput output = new VppPollOperDataOutputBuilder() - .setStatus(new Long(1)).build(); + .setStatus(Long.valueOf(1)).build(); return RpcResultBuilder.success(output).buildFuture(); } -- cgit 1.2.3-korg