From 62777a1d5b1130c3e77c558d5d99efdc688bed5b Mon Sep 17 00:00:00 2001 From: Martial COULIBALY Date: Fri, 9 Feb 2018 17:48:56 +0100 Subject: [PATCH] Remove javadoc warnings Remove javadoc warnings from common and servicehandler projects. Change-Id: I50c81fb1705b3b9ec4e9c81e8d84c8e1a478447c Signed-off-by: Martial COULIBALY --- .../common/device/DeviceTransaction.java | 4 ++-- .../device/DeviceTransactionManagerImpl.java | 4 ++-- .../device/DeviceTransactionManagerTest.java | 5 ++-- .../impl/ServicehandlerImpl.java | 24 +++++++++---------- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java index 45c401dfe..056bbff5f 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java @@ -126,9 +126,9 @@ public class DeviceTransaction { } @Override - public void onFailure(Throwable t) { + public void onFailure(Throwable throwable) { LOG.error("Device transaction submit failed or submit took longer than {} {}!" - + " Unlocking device.", timeout, timeUnit, t); + + " Unlocking device.", timeout, timeUnit, throwable); afterClose(); } }, scheduledExecutorService); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java index 889b4795d..ca0e91976 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java @@ -115,9 +115,9 @@ public class DeviceTransactionManagerImpl implements DeviceTransactionManager { } @Override - public void onFailure(Throwable t) { + public void onFailure(Throwable throwable) { LOG.error("Exception thrown while getting device transaction for device {}! Unlocking device.", - deviceId, t); + deviceId, throwable); newLock.countDown(); } }, checkingExecutor); diff --git a/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java b/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java index 1815c184f..536aec4b5 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java @@ -102,9 +102,6 @@ public class DeviceTransactionManagerTest { transactionManager.getDeviceTransaction(defaultDeviceId); Assert.assertFalse(thirdDeviceTxFuture.isDone()); - Future> anotherDeviceTxFuture = - transactionManager.getDeviceTransaction("another-id"); - firstDeviceTx.put(defaultDatastore, defaultIid, defaultData); Assert.assertFalse(secondDeviceTxFuture.isDone()); Assert.assertFalse(thirdDeviceTxFuture.isDone()); @@ -112,6 +109,8 @@ public class DeviceTransactionManagerTest { Assert.assertFalse(secondDeviceTxFuture.isDone()); Assert.assertFalse(thirdDeviceTxFuture.isDone()); + Future> anotherDeviceTxFuture = + transactionManager.getDeviceTransaction("another-id"); Assert.assertTrue(anotherDeviceTxFuture.isDone()); anotherDeviceTxFuture.get().get().submit(defaultTimeout, defaultTimeUnit); diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java index 225fa272e..496334d97 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java @@ -1339,18 +1339,18 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService, Serviceha aend = new ServiceAEndBuilder(serviceReconfigureInput.getServiceAEnd()).build(); zend = new ServiceZEndBuilder(serviceReconfigureInput.getServiceZEnd()).build(); service.setServiceName(serviceReconfigureInput.getNewServiceName()) - .setAdministrativeState(State.OutOfService).setOperationalState(State.OutOfService) - .setCommonId(serviceReconfigureInput.getCommonId()) - .setConnectionType(serviceReconfigureInput.getConnectionType()) - .setCustomer(serviceReconfigureInput.getCustomer()) - .setCustomerContact(serviceReconfigureInput.getCustomerContact()) - .setHardConstraints(serviceReconfigureInput.getHardConstraints()) - .setSoftConstraints(serviceReconfigureInput.getSoftConstraints()) - .setLifecycleState(LifecycleState.Planned).setServiceAEnd(aend).setServiceZEnd(zend) - .setSdncRequestHeader(new SdncRequestHeaderBuilder() - .setRequestId("reconfigure_" + serviceReconfigureInput.getNewServiceName()) - .setRpcAction(RpcActions.ServiceReconfigure) - .build()); + .setAdministrativeState(State.OutOfService).setOperationalState(State.OutOfService) + .setCommonId(serviceReconfigureInput.getCommonId()) + .setConnectionType(serviceReconfigureInput.getConnectionType()) + .setCustomer(serviceReconfigureInput.getCustomer()) + .setCustomerContact(serviceReconfigureInput.getCustomerContact()) + .setHardConstraints(serviceReconfigureInput.getHardConstraints()) + .setSoftConstraints(serviceReconfigureInput.getSoftConstraints()) + .setLifecycleState(LifecycleState.Planned).setServiceAEnd(aend).setServiceZEnd(zend) + .setSdncRequestHeader(new SdncRequestHeaderBuilder() + .setRequestId("reconfigure_" + serviceReconfigureInput.getNewServiceName()) + .setRpcAction(RpcActions.ServiceReconfigure) + .build()); } org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.response -- 2.36.6