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 <mcmarada@cisco.com>

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 8e410759846ea3c48101c248ebdb05229ac72d2d..20f77b6810cb22056731bea016486e1e80c1c7fa 100644 (file)
--- 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 5e24652a26e5068182a53c7b4f7ffb5b8d0f717e..f16b5547cb01686d320e4dfc9edd2c5a2ebab491 100644 (file)
--- 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<Class<? extends Augmentation<RendererNetworkDomain>>, Augmentation<RendererNetworkDomain>> buildRendererNetworkDomainAugmentation(
-            NetworkDomain input) {
+    public Entry<Class<? extends Augmentation<RendererNetworkDomain>>, Augmentation<RendererNetworkDomain>>
+        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 7a1e82f186e2a94ffae7719eaac3734967e218f5..0789bd9d4860004057b49573eb2a012b0c0fad50 100644 (file)
--- 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<Class<? extends Augmentation<RendererNetworkDomain>>, Augmentation<RendererNetworkDomain>> rendererNetworkDomainAugmentation =
+        Entry<Class<? extends Augmentation<RendererNetworkDomain>>, Augmentation<RendererNetworkDomain>>
+            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<Class<? extends Augmentation<RendererNetworkDomain>>, Augmentation<RendererNetworkDomain>> rendererNetworkDomainAugmentation =
+        Entry<Class<? extends Augmentation<RendererNetworkDomain>>, Augmentation<RendererNetworkDomain>>
+            rendererNetworkDomainAugmentation =
                 l2l3Augmentor.buildRendererNetworkDomainAugmentation(networkDomain);
 
         Assert.assertNull(rendererNetworkDomainAugmentation);

diff --git a/domain-extensions/pom.xml b/domain-extensions/pom.xml
index 0acf86d394759007fc5f9288f6cf782b2b82ec0e..059468a1d2826c0dd863f4f5321c661e37a02ea3 100644 (file)
--- a/domain-extensions/pom.xml
+++ b/domain-extensions/pom.xml
@@ -45,4 +45,25 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <excludes>org/opendaylight/yang/gen/**,**/yang/**</excludes>
+          <consoleOutput>true</consoleOutput>
+          <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>process-sources</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>