summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-11-30 14:20:23 +0100
committerMarek Gradzki <mgradzki@cisco.com>2017-11-30 14:20:23 +0100
commitac0481981f2a71ceb03210e961b8a9d09bc0ebba (patch)
tree043137c8ca199a2d548f04f9ec9a7326635c4e5f
parent2c4c5fcaeb2f5bd0b3b710191bdfde8a03abbc93 (diff)
Remove dead stores and unused fields
Change-Id: I3ad4e1f1aae9ed52911acbed11d931349ad94da9 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rw-r--r--lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java4
-rw-r--r--nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java2
-rwxr-xr-xnsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java2
-rwxr-xr-xnsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java2
-rw-r--r--samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/VxlanReadCustomizer.java3
-rw-r--r--samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/VxlanWriteCustomizer.java2
-rw-r--r--vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerReaderFactory.java1
7 files changed, 3 insertions, 13 deletions
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java
index f04a13f5c..2afa852d4 100644
--- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java
@@ -28,8 +28,6 @@ import javax.annotation.Nonnull;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170801._native.forward.paths.tables.NativeForwardPathsTable;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170801._native.forward.paths.tables.NativeForwardPathsTableKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Uses api to create gpe interfaces, which creates fib table as by-product.
@@ -39,8 +37,6 @@ public class NativeForwardPathsTableCustomizer extends FutureJVppCustomizer
implements ListWriterCustomizer<NativeForwardPathsTable, NativeForwardPathsTableKey>, ByteDataTranslator,
JvppReplyConsumer {
- private static final Logger LOG = LoggerFactory.getLogger(NativeForwardPathsTableCustomizer.class);
-
public NativeForwardPathsTableCustomizer(@Nonnull final FutureJVppCore futureJVppCore) {
super(futureJVppCore);
}
diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java
index 764da68b8..802d6875b 100644
--- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatWriterFactory.java
@@ -47,8 +47,6 @@ public final class NatWriterFactory implements WriterFactory {
NAT_CFG_ID.child(NatInstances.class).child(NatInstance.class);
private static final InstanceIdentifier<MappingEntry> MAP_ENTRY_ID =
NAT_INSTANCE_ID.child(MappingTable.class).child(MappingEntry.class);
- private static final InstanceIdentifier<Nat64Prefixes> NAT64_PREFIXES =
- NAT_INSTANCE_ID.child(Nat64Prefixes.class);
private final FutureJVppNatFacade jvppNat;
private final MappingEntryContext mappingEntryContext;
diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java
index 988c9948d..3fa397705 100755
--- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java
+++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java
@@ -118,7 +118,7 @@ public class NshEntryWriterCustomizer extends FutureJVppNshCustomizer
final List<Md2Data> md2Datas = entry.getAugmentation(NshMdType2Augment.class).getMd2Data();
final byte md2_len = (byte) (entry.getLength() * 4 - 8);
byte cur_len = 0;
- byte option_len = 0;
+ byte option_len;
LOG.debug("wr: md2_len={}", md2_len);
request.tlv = new byte[md2_len];
diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java
index 147b9c50a..e5fcef6c2 100755
--- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java
+++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java
@@ -101,7 +101,7 @@ public class NshEntryReaderCustomizer extends FutureJVppNshCustomizer
final NshMdType2StateAugmentBuilder augmentBuilder = new NshMdType2StateAugmentBuilder();
final byte md2_len = (nshEntryDetails.tlvLength);
byte cur_len = 0;
- byte option_len = 0;
+ byte option_len;
LOG.debug("rd: md2_len={}", md2_len);
List<Md2Data> md2Datas = new ArrayList<>();
diff --git a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/VxlanReadCustomizer.java b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/VxlanReadCustomizer.java
index 133155b6f..cc322a2cc 100644
--- a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/VxlanReadCustomizer.java
+++ b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/read/VxlanReadCustomizer.java
@@ -58,8 +58,6 @@ public final class VxlanReadCustomizer implements
// provides utility methods to consume results of jvpp api calls
JvppReplyConsumer {
- // JVpp core. This is the Java API for VPP's core API.
- private final FutureJVppCore jVppCore;
// Naming context for interfaces
// Honeycomb provides a "context" storage for plugins. This storage is used for storing metadata required during
// data translation (just like in this plugin). An example of such metadata would be interface identifier. In Honeycomb
@@ -75,7 +73,6 @@ public final class VxlanReadCustomizer implements
private DumpCacheManager<VxlanTunnelDetailsReplyDump, Integer> dumpManager;
public VxlanReadCustomizer(final FutureJVppCore jVppCore, final NamingContext vxlanNamingContext) {
- this.jVppCore = jVppCore;
this.vxlanNamingContext = vxlanNamingContext;
this.dumpManager = new DumpCacheManager.DumpCacheManagerBuilder<VxlanTunnelDetailsReplyDump, Integer>()
diff --git a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/VxlanWriteCustomizer.java b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/VxlanWriteCustomizer.java
index 77c67b290..fb15f134f 100644
--- a/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/VxlanWriteCustomizer.java
+++ b/samples/samples-impl/src/main/java/io/fd/hc2vpp/samples/write/VxlanWriteCustomizer.java
@@ -104,7 +104,7 @@ public final class VxlanWriteCustomizer implements ListWriterCustomizer<VxlanTun
vxlanAddDelTunnel.dstAddress = ipAddressToArray(isIpv6, dataBefore.getDst());
// There are other input parameters that are not exposed by our YANG model, default values will be used
- final VxlanAddDelTunnelReply replyForWrite = getReplyForWrite(jvppCore.vxlanAddDelTunnel(vxlanAddDelTunnel).toCompletableFuture(), id);
+ getReplyForWrite(jvppCore.vxlanAddDelTunnel(vxlanAddDelTunnel).toCompletableFuture(), id);
// It's important to remove the mapping from context
vxlanTunnelNamingContext.removeName(dataBefore.getId(), writeContext.getMappingContext());
}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerReaderFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerReaderFactory.java
index da027310a..855dfe25a 100644
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerReaderFactory.java
+++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/read/InterfacePolicerReaderFactory.java
@@ -51,7 +51,6 @@ public class InterfacePolicerReaderFactory implements ReaderFactory {
@Override
public void init(@Nonnull final ModifiableReaderRegistryBuilder registry) {
- InstanceIdentifier<Policer> IID = InstanceIdentifier.create(Policer.class);
registry.addStructuralReader(POLICER_IFC_ID, PolicerInterfaceStateAugmentationBuilder.class);
registry.add(
new GenericReader<>(POLICER_IID, new InterfacePolicerCustomizer(vppApi, ifcContext, classifyTableContext)));