Fixup logging and static methods

Methods which can be static are made static. Also fixes string concat in
logging. Next we share a single instance of the VppState identifier.
Finally fixup the LoggingFuturesCallback.

Change-Id: I4f5076bfcbf782ecf4452e00726d49b46e15628c
Signed-off-by: Robert Varga <nite@hq.sk>

1 files changed, 7 insertions, 7 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 21541d96e..9eb9d3a08 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
@@ -82,16 +82,16 @@ public class V3poApiRequest extends V3poRequest {
         caller = vppPollOperData;
     }
 
-    private InstanceIdentifier<Interface> getStateInterfaceIid(final String interfaceName) {
+    private static InstanceIdentifier<Interface> getStateInterfaceIid(final String interfaceName) {
         return InstanceIdentifier.create(InterfacesState.class).child(Interface.class,
                 new InterfaceKey(interfaceName));
     }
 
-    private InstanceIdentifier<Interface2> getStateInterfaceIpId(final InstanceIdentifier<Interface> iid) {
+    private static InstanceIdentifier<Interface2> getStateInterfaceIpId(final InstanceIdentifier<Interface> iid) {
         return iid.augmentation(Interface2.class);
     }
 
-    private InstanceIdentifier<Statistics> getStateInterfaceStatsId(final InstanceIdentifier<Interface> iid) {
+    private static InstanceIdentifier<Statistics> getStateInterfaceStatsId(final InstanceIdentifier<Interface> iid) {
         return iid.child(Statistics.class);
     }
 
@@ -103,7 +103,7 @@ public class V3poApiRequest extends V3poRequest {
         return new Counter32(num);
     }
 
-    private Statistics buildInterfaceStatistics(final vppInterfaceCounters ifCounters) {
+    private static Statistics buildInterfaceStatistics(final vppInterfaceCounters ifCounters) {
         if (ifCounters == null) {
             return null;
         }
@@ -331,7 +331,7 @@ public class V3poApiRequest extends V3poRequest {
         return ifBuilder.build();
     }
 
-    private void setStateInterfaceL2(
+    private static void setStateInterfaceL2(
             final VppInterfaceStateAugmentationBuilder augBuilder,
             final boolean isL2BridgeBased, final boolean isXconnect,
             final String xconnectOutgoingInterface,
@@ -356,7 +356,7 @@ public class V3poApiRequest extends V3poRequest {
         augBuilder.setL2(l2Builder.build());
     }
 
-    private void setStateInterfaceEthernet(
+    private static void setStateInterfaceEthernet(
             final VppInterfaceStateAugmentationBuilder augBuilder,
             final boolean isFullDuplex, final String manufacturerDesc, final Integer mtu) {
 
@@ -368,7 +368,7 @@ public class V3poApiRequest extends V3poRequest {
         augBuilder.setEthernet(ethBuilder.build());
     }
 
-    private void setStateInterfaceVxlan(
+    private static void setStateInterfaceVxlan(
             final VppInterfaceStateAugmentationBuilder augBuilder, final int srcAddress,
             final int dstAddress, final int vni, final int encapVrfId) {