From f51020f3e23de8a15a98ab61da2a25c43b19a963 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 22 Nov 2017 11:32:17 +0100 Subject: Add missing @Override annotations Fix isses reported by Sonar thanks to IntelliJ's code inspection. Change-Id: I846590213e3e8ac7d3539d4de9940b32818625d5 Signed-off-by: Marek Gradzki (cherry picked from commit b1f0c71b032eb17d8cac1c5324745b759c2da87f) --- .../test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizerTest.java | 1 + .../io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java | 1 + .../hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java | 1 + .../hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java | 1 + .../io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java | 1 + .../io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java | 2 ++ .../hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java | 1 + .../hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizerTest.java | 1 + .../src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java | 1 + 9 files changed, 10 insertions(+) diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizerTest.java index 74745c485..850c1baeb 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4AddressCustomizerTest.java @@ -74,6 +74,7 @@ public class Ipv4AddressCustomizerTest extends WriterCustomizerTest { return o -> o instanceof InstanceIdentifier && (o.getTargetType().equals(desiredClass)); } + @Override @Before public void setUpTest() throws Exception { interfaceContext = new NamingContext("generatedIfaceName", IFC_CTX_NAME); diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java index 17ecd402d..5312c2ea5 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java @@ -65,6 +65,7 @@ public final class LispStateCheckServiceImpl implements LispStateCheckService, J .or(STATIC_LISP_INSTANCE).isEnable(), "Lisp feature not enabled"); } + @Override public boolean lispEnabled(@Nonnull final ReadContext ctx) { // in this case it must be dumped try { diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java index 1d78d5cb5..295f75244 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/BridgeDomainSubtableCustomizerTest.java @@ -101,6 +101,7 @@ public class BridgeDomainSubtableCustomizerTest fail("Test should throw ReadFailedException"); } + @Override @Test public void testGetBuilder() { final BridgeDomainSubtableBuilder builder = customizer.getBuilder(validId); diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java index 5bc994a39..5c09d2706 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java @@ -56,6 +56,7 @@ public class ItrRemoteLocatorSetCustomizerTest super(ItrRemoteLocatorSet.class, LispFeatureDataBuilder.class); } + @Override @Before public void setUp() throws Exception { validId = InstanceIdentifier.create(ItrRemoteLocatorSet.class); diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java index fc4344cf4..4012084b7 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LocalMappingCustomizerTest.java @@ -78,6 +78,7 @@ public class LocalMappingCustomizerTest extends } + @Override public void setUp() { emptyIdentifier = InstanceIdentifier.create(EidTable.class) .child(VniTable.class, new VniTableKey(12L)) diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java index 9b7dadadf..ff3297ed6 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/VrfSubtableCustomizerTest.java @@ -100,6 +100,7 @@ public class VrfSubtableCustomizerTest extends SubtableReaderTestCase validId; private ItrRemoteLocatorSet validData; + @Override @Before public void setUpTest() throws Exception { initMocks(this); diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizerTest.java index edf31a608..4e6fdddcc 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/span/MirroredInterfacesCustomizerTest.java @@ -57,6 +57,7 @@ public class MirroredInterfacesCustomizerTest extends WriterCustomizerTest { @Captor private ArgumentCaptor requestCaptor; + @Override public void setUpTest() { interfaceContext = new NamingContext("iface", "iface-context"); customizer = diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java index 7e6a0f7a4..e66a72327 100644 --- a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java @@ -26,6 +26,7 @@ import io.fd.vpp.jvpp.core.future.FutureJVppCore; import net.jmob.guice.conf.core.ConfigurationModule; public final class VppCommonModule extends AbstractModule { + @Override protected void configure() { install(ConfigurationModule.create()); -- cgit 1.2.3-korg