enabling checkstyle checks on build which should prevent
checkstyle violations in future.
Change-Id: I3468f3cf0e94cf0905b466bd6c372a7332c1f307
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
package org.opendaylight.controller.config.yang.config.domain_extension.l2_l3.impl;
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;
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@Override
public void instantiateServiceInstance() {
LOG.info("Instantiating {}", this.getClass().getSimpleName());
@Override
public void instantiateServiceInstance() {
LOG.info("Instantiating {}", this.getClass().getSimpleName());
- l2l3NetworkDomainAugmentor = new L2L3NetworkDomainAugmentor(domainSpecificRegistry.getNetworkDomainAugmentorRegistry());
+ l2l3NetworkDomainAugmentor =
+ new L2L3NetworkDomainAugmentor(domainSpecificRegistry.getNetworkDomainAugmentorRegistry());
public ServiceGroupIdentifier getIdentifier() {
return IDENTIFIER;
}
public ServiceGroupIdentifier getIdentifier() {
return IDENTIFIER;
}
package org.opendaylight.groupbasedpolicy.domain_extension.l2_l3;
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 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;
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;
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 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;
public class L2L3NetworkDomainAugmentor implements NetworkDomainAugmentor, AutoCloseable {
private final NetworkDomainAugmentorRegistry networkDomainAugmentorRegistry;
- 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;
SubnetAugmentForwarding subnetForwarding = input.getAugmentation(SubnetAugmentForwarding.class);
if (subnetForwarding == null) {
return null;
*/
package org.opendaylight.groupbasedpolicy.domain_extension.l2_l3;
*/
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;
import java.util.Map.Entry;
import org.junit.Assert;
@Test
public void testBuildRendererNetworkDomainAugmentation() {
Gateways gateways = new GatewaysBuilder().setGateway(IP_ADDRESS)
@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)
.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(
.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();
.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);
l2l3Augmentor.buildRendererNetworkDomainAugmentation(networkDomain);
Assert.assertNotNull(rendererNetworkDomainAugmentation);
public void testBuildRendererNetworkDomainAugmentation_nullAugmentation() {
NetworkDomain networkDomain = new NetworkDomainBuilder()
.setNetworkDomainType(
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();
.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);
l2l3Augmentor.buildRendererNetworkDomainAugmentation(networkDomain);
Assert.assertNull(rendererNetworkDomainAugmentation);
<version>${project.version}</version>
</dependency>
</dependencies>
<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>