Minor checkstyle corrections 50/73550/6
authorguillaume.lambert <guillaume.lambert@orange.com>
Mon, 23 Apr 2018 09:42:24 +0000 (11:42 +0200)
committerguillaume.lambert <guillaume.lambert@orange.com>
Wed, 18 Jul 2018 13:30:30 +0000 (15:30 +0200)
Change-Id: Ie9f5ba977615211e5813cc47d39fb7f363d961e1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/RollbackProcessor.java

index 793bffc78eaad62b18c083936b177314460d977c..d85b36db1e3a2d65de67656b049cf7a7a0f5db1b 100644 (file)
@@ -86,8 +86,8 @@ public class OpenRoadmInterfacesImpl implements OpenRoadmInterfaces {
     public Optional<Interface> getInterface(String nodeId, String interfaceName) throws OpenRoadmInterfaceException {
         InstanceIdentifier<Interface> interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
                 .child(Interface.class, new InterfaceKey(interfaceName));
     public Optional<Interface> getInterface(String nodeId, String interfaceName) throws OpenRoadmInterfaceException {
         InstanceIdentifier<Interface> interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
                 .child(Interface.class, new InterfaceKey(interfaceName));
-        return this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, interfacesIID,
-                Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+        return this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION,
+                interfacesIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
     }
 
     @Override
     }
 
     @Override
@@ -144,7 +144,8 @@ public class OpenRoadmInterfacesImpl implements OpenRoadmInterfaces {
 
             InstanceIdentifier<Interface> interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
                     .child(Interface.class, new InterfaceKey(interfaceName));
 
             InstanceIdentifier<Interface> interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
                     .child(Interface.class, new InterfaceKey(interfaceName));
-            Future<Optional<DeviceTransaction>> deviceTxFuture = this.deviceTransactionManager.getDeviceTransaction(nodeId);
+            Future<Optional<DeviceTransaction>> deviceTxFuture =
+                this.deviceTransactionManager.getDeviceTransaction(nodeId);
             DeviceTransaction deviceTx;
             try {
                 Optional<DeviceTransaction> deviceTxOpt = deviceTxFuture.get();
             DeviceTransaction deviceTx;
             try {
                 Optional<DeviceTransaction> deviceTxOpt = deviceTxFuture.get();
index 709fc170afc25d08a90a21bd918a8cf625fbe03f..2531a426058f400d26ca0f924f5aa9374b091c9c 100644 (file)
@@ -60,6 +60,7 @@ public class RollbackProcessor {
      * @return
      *   number of tasks rolled back
      */
      * @return
      *   number of tasks rolled back
      */
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public int rollbackAll() {
         int rollbackCounter = 0;
         while (this.tasks.size() > 0) {
     public int rollbackAll() {
         int rollbackCounter = 0;
         while (this.tasks.size() > 0) {
@@ -68,6 +69,7 @@ public class RollbackProcessor {
             try {
                 LOG.info("rolling back: {}", task.getId());
                 task.call();
             try {
                 LOG.info("rolling back: {}", task.getId());
                 task.call();
+            //this methode prototype only use the generic Exception and no specific and useable subclasse
             } catch (Exception e) {
                 LOG.error("ERROR: Rollback task {} has failed", task.getId(), e);
             }
             } catch (Exception e) {
                 LOG.error("ERROR: Rollback task {} has failed", task.getId(), e);
             }