From: Michal Cmarada Date: Tue, 3 Oct 2017 10:43:39 +0000 (+0200) Subject: apply checkstyle check during build for domain-extensions X-Git-Tag: release/oxygen~10 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ccdcb8561742ee085fb27da2050d148171f5ba37;p=groupbasedpolicy.git apply checkstyle check during build for domain-extensions enabling checkstyle checks on build which should prevent checkstyle violations in future. Change-Id: I3468f3cf0e94cf0905b466bd6c372a7332c1f307 Signed-off-by: Michal Cmarada --- diff --git a/domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionInstance.java b/domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionInstance.java index 8e4107598..20f77b681 100644 --- a/domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionInstance.java +++ b/domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionInstance.java @@ -8,6 +8,8 @@ package org.opendaylight.controller.config.yang.config.domain_extension.l2_l3.impl; +import javax.annotation.Nonnull; + import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -51,7 +53,8 @@ public class L2L3DomainExtensionInstance implements ClusterSingletonService, Aut @Override public void instantiateServiceInstance() { LOG.info("Instantiating {}", this.getClass().getSimpleName()); - l2l3NetworkDomainAugmentor = new L2L3NetworkDomainAugmentor(domainSpecificRegistry.getNetworkDomainAugmentorRegistry()); + l2l3NetworkDomainAugmentor = + new L2L3NetworkDomainAugmentor(domainSpecificRegistry.getNetworkDomainAugmentorRegistry()); } @Override @@ -75,6 +78,7 @@ public class L2L3DomainExtensionInstance implements ClusterSingletonService, Aut } @Override + @Nonnull public ServiceGroupIdentifier getIdentifier() { return IDENTIFIER; } diff --git a/domain-extensions/l2-l3/src/main/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/L2L3NetworkDomainAugmentor.java b/domain-extensions/l2-l3/src/main/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/L2L3NetworkDomainAugmentor.java index 5e24652a2..f16b5547c 100644 --- a/domain-extensions/l2-l3/src/main/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/L2L3NetworkDomainAugmentor.java +++ b/domain-extensions/l2-l3/src/main/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/L2L3NetworkDomainAugmentor.java @@ -8,9 +8,13 @@ package org.opendaylight.groupbasedpolicy.domain_extension.l2_l3; +import com.google.common.base.Preconditions; + import java.util.AbstractMap.SimpleImmutableEntry; import java.util.Map.Entry; +import javax.annotation.Nonnull; + import org.opendaylight.groupbasedpolicy.api.NetworkDomainAugmentor; import org.opendaylight.groupbasedpolicy.api.NetworkDomainAugmentorRegistry; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.l2_l3.rev170511.SubnetAugmentForwarding; @@ -20,8 +24,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.renderer.forwarding.renderer.forwarding.by.tenant.RendererNetworkDomain; import org.opendaylight.yangtools.yang.binding.Augmentation; -import com.google.common.base.Preconditions; - public class L2L3NetworkDomainAugmentor implements NetworkDomainAugmentor, AutoCloseable { private final NetworkDomainAugmentorRegistry networkDomainAugmentorRegistry; @@ -32,8 +34,8 @@ public class L2L3NetworkDomainAugmentor implements NetworkDomainAugmentor, AutoC } @Override - public Entry>, Augmentation> buildRendererNetworkDomainAugmentation( - NetworkDomain input) { + public Entry>, Augmentation> + buildRendererNetworkDomainAugmentation(@Nonnull NetworkDomain input) { SubnetAugmentForwarding subnetForwarding = input.getAugmentation(SubnetAugmentForwarding.class); if (subnetForwarding == null) { return null; diff --git a/domain-extensions/l2-l3/src/test/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/L2L3NetworkDomainAugmentorTest.java b/domain-extensions/l2-l3/src/test/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/L2L3NetworkDomainAugmentorTest.java index 7a1e82f18..0789bd9d4 100644 --- a/domain-extensions/l2-l3/src/test/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/L2L3NetworkDomainAugmentorTest.java +++ b/domain-extensions/l2-l3/src/test/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/L2L3NetworkDomainAugmentorTest.java @@ -7,7 +7,7 @@ */ package org.opendaylight.groupbasedpolicy.domain_extension.l2_l3; -import java.util.Arrays; +import java.util.Collections; import java.util.Map.Entry; import org.junit.Assert; @@ -80,21 +80,22 @@ public class L2L3NetworkDomainAugmentorTest { @Test public void testBuildRendererNetworkDomainAugmentation() { Gateways gateways = new GatewaysBuilder().setGateway(IP_ADDRESS) - .setPrefixes(Arrays.asList(new PrefixesBuilder().setPrefix(IP_PREFIX_2).build())) + .setPrefixes(Collections.singletonList(new PrefixesBuilder().setPrefix(IP_PREFIX_2).build())) .build(); SubnetAugmentForwarding subnetAugmentForwarding = new SubnetAugmentForwardingBuilder().setSubnet(new SubnetBuilder().setIpPrefix(IP_PREFIX) - .setGateways(Arrays.asList(gateways)) + .setGateways(Collections.singletonList(gateways)) .setVirtualRouterIp(IP_ADDRESS_2) .build()).build(); NetworkDomain networkDomain = new NetworkDomainBuilder() .setNetworkDomainType( - org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.rev160427.NetworkDomain.class) + org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.rev160427.NetworkDomain.class) .setNetworkDomainId(NET_DOMAIN) .addAugmentation(SubnetAugmentForwarding.class, subnetAugmentForwarding) .build(); - Entry>, Augmentation> rendererNetworkDomainAugmentation = + Entry>, Augmentation> + rendererNetworkDomainAugmentation = l2l3Augmentor.buildRendererNetworkDomainAugmentation(networkDomain); Assert.assertNotNull(rendererNetworkDomainAugmentation); @@ -109,11 +110,12 @@ public class L2L3NetworkDomainAugmentorTest { public void testBuildRendererNetworkDomainAugmentation_nullAugmentation() { NetworkDomain networkDomain = new NetworkDomainBuilder() .setNetworkDomainType( - org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.rev160427.NetworkDomain.class) + org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.rev160427.NetworkDomain.class) .setNetworkDomainId(NET_DOMAIN) .build(); - Entry>, Augmentation> rendererNetworkDomainAugmentation = + Entry>, Augmentation> + rendererNetworkDomainAugmentation = l2l3Augmentor.buildRendererNetworkDomainAugmentation(networkDomain); Assert.assertNull(rendererNetworkDomainAugmentation); diff --git a/domain-extensions/pom.xml b/domain-extensions/pom.xml index 0acf86d39..059468a1d 100644 --- a/domain-extensions/pom.xml +++ b/domain-extensions/pom.xml @@ -45,4 +45,25 @@ ${project.version} + + + + + maven-checkstyle-plugin + + org/opendaylight/yang/gen/**,**/yang/** + true + checkstyle.violationSeverity=error + + + + + check + + process-sources + + + + +