Implementing checkStyleViolationSeverity=error for mdsal-eos-binding-adaptor module

Change-Id: Ibb2d726a1d2e40be605ebef21deda5a03757d0b6
Signed-off-by: Brinda Jana <brinda.jana@nexusis.com>

diff --git a/entityownership/mdsal-eos-binding-adapter/pom.xml b/entityownership/mdsal-eos-binding-adapter/pom.xml
index 204d073cf1629fe05ce0d8df44b64faaf454acb2..41e0b9da31ab74577edb592f0727baf0e8991ed6 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/pom.xml
+++ b/entityownership/mdsal-eos-binding-adapter/pom.xml
@@ -71,6 +71,17 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <configuration>
+              <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>

diff --git a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java
index e49afca5333c862adf89399df7af2a76d57cab42..72edc809f0d10944d2c0855aa5bbd254e2dde511 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java
+++ b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java
@@ -9,7 +9,6 @@ package org.opendaylight.mdsal.eos.binding.dom.adapter;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import java.lang.AutoCloseable;
 import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
 import org.opendaylight.mdsal.eos.binding.api.Entity;
@@ -44,13 +43,14 @@ public class BindingDOMEntityOwnershipServiceAdapter implements EntityOwnershipS
     @Override
     public EntityOwnershipCandidateRegistration registerCandidate(Entity entity)
             throws CandidateAlreadyRegisteredException {
-        return new BindingEntityOwnershipCandidateRegistration(domService.registerCandidate(toDOMEntity(entity)), entity);
+        return new BindingEntityOwnershipCandidateRegistration(
+                domService.registerCandidate(toDOMEntity(entity)), entity);
     }
 
     @Override
     public EntityOwnershipListenerRegistration registerListener(String entityType, EntityOwnershipListener listener) {
-        return new BindingEntityOwnershipListenerRegistration(entityType, listener, domService.
-                registerListener(entityType, new DOMEntityOwnershipListenerAdapter(listener, conversionCodec)));
+        return new BindingEntityOwnershipListenerRegistration(entityType, listener, domService
+                .registerListener(entityType, new DOMEntityOwnershipListenerAdapter(listener, conversionCodec)));
     }
 
     @Override

diff --git a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/DOMEntityOwnershipListenerAdapter.java b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/DOMEntityOwnershipListenerAdapter.java
index b3113bb49e49e3107db14990f75296c577300d14..d8a681532202b788cb694fb627026749b3322963 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/DOMEntityOwnershipListenerAdapter.java
+++ b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/DOMEntityOwnershipListenerAdapter.java
@@ -30,6 +30,7 @@ class DOMEntityOwnershipListenerAdapter implements DOMEntityOwnershipListener {
         this.conversionCodec = Preconditions.checkNotNull(conversionCodec);
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     public void ownershipChanged(final DOMEntityOwnershipChange ownershipChange) {
         try {
@@ -38,8 +39,9 @@ class DOMEntityOwnershipListenerAdapter implements DOMEntityOwnershipListener {
             bindingListener.ownershipChanged(new EntityOwnershipChange(entity, ownershipChange.getState(),
                     ownershipChange.inJeopardy()));
         } catch (final Exception e) {
-            BindingDOMEntityOwnershipServiceAdapter.LOG.error("Error converting DOM entity ID {} to binding InstanceIdentifier",
-                    ownershipChange.getEntity().getIdentifier(), e);
+            BindingDOMEntityOwnershipServiceAdapter.LOG.error(
+                    "Error converting DOM entity ID {} to binding InstanceIdentifier",
+                        ownershipChange.getEntity().getIdentifier(), e);
         }
     }
 }
\ No newline at end of file

diff --git a/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapterTest.java b/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapterTest.java
index 498b8cae4b1bddcd24bff71f975c0dab1cfd0fc7..61d70b2259ec9611f7e4b8a7e28f82be1b4f2ce7 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapterTest.java
+++ b/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapterTest.java
@@ -29,7 +29,6 @@ import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipCandidateRegistrati
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipChange;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListener;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListenerRegistration;
-import org.opendaylight.mdsal.eos.binding.dom.adapter.BindingDOMEntityOwnershipServiceAdapter;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
@@ -63,8 +62,10 @@ public class BindingDOMEntityOwnershipServiceAdapterTest {
     public void setup() {
         MockitoAnnotations.initMocks(this);
 
-        doReturn(DOM_ENTITY.getIdentifier()).when(mockCodecRegistry).toYangInstanceIdentifier(BINDING_ENTITY.getIdentifier());
-        doReturn(BINDING_ENTITY.getIdentifier()).when(mockCodecRegistry).fromYangInstanceIdentifier(DOM_ENTITY.getIdentifier());
+        doReturn(DOM_ENTITY.getIdentifier()).when(mockCodecRegistry).toYangInstanceIdentifier(
+                BINDING_ENTITY.getIdentifier());
+        doReturn(BINDING_ENTITY.getIdentifier()).when(mockCodecRegistry).fromYangInstanceIdentifier(
+                DOM_ENTITY.getIdentifier());
 
         adapter = new BindingDOMEntityOwnershipServiceAdapter(mockDOMService,
                 new BindingToNormalizedNodeCodec(GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(),
@@ -92,20 +93,23 @@ public class BindingDOMEntityOwnershipServiceAdapterTest {
                 any(DOMEntityOwnershipListener.class));
         final EntityOwnershipListener mockListener = mock(EntityOwnershipListener.class);
 
-        final EntityOwnershipListenerRegistration reg = adapter.registerListener(BINDING_ENTITY.getType(), mockListener);
+        final EntityOwnershipListenerRegistration reg = adapter.registerListener(
+                BINDING_ENTITY.getType(), mockListener);
 
         assertNotNull("registerListener returned null", reg);
         assertEquals("getInstance", mockListener, reg.getInstance());
         assertEquals("getEntityType", BINDING_ENTITY.getType(), reg.getEntityType());
 
-        final ArgumentCaptor<DOMEntityOwnershipListener> domListenerCaptor = ArgumentCaptor.forClass(DOMEntityOwnershipListener.class);
+        final ArgumentCaptor<DOMEntityOwnershipListener> domListenerCaptor = ArgumentCaptor.forClass(
+                DOMEntityOwnershipListener.class);
         verify(mockDOMService).registerListener(eq(DOM_ENTITY.getType()),  domListenerCaptor.capture());
 
         final DOMEntityOwnershipChange domOwnershipChange = new DOMEntityOwnershipChange(DOM_ENTITY,
                 EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED, true);
         domListenerCaptor.getValue().ownershipChanged(domOwnershipChange );
 
-        final ArgumentCaptor<EntityOwnershipChange> ownershipChangeCaptor = ArgumentCaptor.forClass(EntityOwnershipChange.class);
+        final ArgumentCaptor<EntityOwnershipChange> ownershipChangeCaptor = ArgumentCaptor.forClass(
+                EntityOwnershipChange.class);
         verify(mockListener).ownershipChanged(ownershipChangeCaptor.capture());
 
         final EntityOwnershipChange change = ownershipChangeCaptor.getValue();