From f5a8fe61d265bce36b2fca393d82685a22ac326a Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 27 Apr 2020 18:04:06 +0200 Subject: [PATCH] fix import extra separations This new checkstyle rule is now enforced by the releng merge job. JIRA: TRNSPRTPCE-235 Signed-off-by: guillaume.lambert Change-Id: I5e9f0ed9e8c0c3fa6db6fa8d27b6f460aab75972 --- .../transportpce/common/crossconnect/CrossConnectImpl.java | 1 - .../transportpce/common/crossconnect/CrossConnectImpl221.java | 1 - .../transportpce/common/device/DeviceTransaction.java | 1 - .../transportpce/common/device/DeviceTransactionManager.java | 1 - .../common/device/DeviceTransactionManagerImpl.java | 2 -- .../transportpce/common/mapping/PortMappingImpl.java | 1 - .../transportpce/common/mapping/SortPort121ByName.java | 1 - .../transportpce/common/mapping/SortPort221ByName.java | 1 - .../opendaylight/transportpce/inventory/DeviceInventory.java | 1 - .../java/org/opendaylight/transportpce/inventory/INode.java | 1 - .../org/opendaylight/transportpce/inventory/INode121.java | 2 -- .../org/opendaylight/transportpce/inventory/INode221.java | 2 -- .../transportpce/inventory/listener/DeviceConfigListener.java | 1 - .../transportpce/inventory/listener/DeviceListener.java | 1 - .../transportpce/networkmodel/NetConfTopologyListener.java | 2 -- .../transportpce/networkmodel/R2RLinkDiscovery.java | 1 - .../opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java | 1 - .../transportpce/networkmodel/dto/OtnTopoNode.java | 1 - .../transportpce/networkmodel/dto/TopologyShard.java | 1 - .../networkmodel/listeners/AlarmNotificationListener221.java | 1 - .../networkmodel/listeners/DeviceListener221.java | 3 +-- .../networkmodel/service/NetworkModelServiceImpl.java | 1 - .../transportpce/networkmodel/util/OpenRoadmOtnTopology.java | 2 -- .../transportpce/networkmodel/util/OpenRoadmTopology.java | 1 - .../transportpce/networkmodel/util/TopologyUtils.java | 1 - .../transportpce/networkmodel/util/TpceNetwork.java | 1 - .../opendaylight/transportpce/olm/power/PowerMgmtImpl.java | 1 - .../java/org/opendaylight/transportpce/olm/util/OlmUtils.java | 1 - .../org/opendaylight/transportpce/olm/util/OlmUtils121.java | 2 -- .../org/opendaylight/transportpce/olm/util/OlmUtils22.java | 1 - .../olm/service/OlmPowerServiceImplSpanLossBaseTest.java | 1 - .../opendaylight/transportpce/olm/stub/OlmServiceStub.java | 1 - .../transportpce/olm/util/OlmPowerServiceRpcImplUtil.java | 1 - .../transportpce/olm/util/OlmTransactionUtils.java | 1 - .../opendaylight/transportpce/olm/util/TransactionUtils.java | 1 - .../org/opendaylight/transportpce/pce/PcePathDescription.java | 2 -- .../transportpce/pce/constraints/PceConstraints.java | 1 - .../transportpce/pce/constraints/PceConstraintsCalc.java | 1 - .../transportpce/pce/gnpy/ConnectToGnpyServer.java | 2 -- .../org/opendaylight/transportpce/pce/gnpy/GnpyResult.java | 3 --- .../opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java | 1 - .../org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java | 1 - .../opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java | 1 - .../transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java | 3 --- .../org/opendaylight/transportpce/pce/graph/PceGraph.java | 1 - .../transportpce/pce/graph/PostAlgoPathValidator.java | 1 - .../opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java | 4 +--- .../transportpce/pce/networkanalyzer/MapUtils.java | 1 - .../transportpce/pce/networkanalyzer/PceCalculation.java | 1 - .../transportpce/pce/networkanalyzer/PceLink.java | 1 - .../transportpce/pce/networkanalyzer/PceOpticalNode.java | 1 - .../transportpce/pce/networkanalyzer/PceOtnNode.java | 1 - .../transportpce/pce/networkanalyzer/PceResult.java | 2 -- .../transportpce/pce/service/PathComputationService.java | 1 - .../transportpce/pce/service/PathComputationServiceImpl.java | 2 -- .../opendaylight/transportpce/pce/PceComplianceCheckTest.java | 1 - .../opendaylight/transportpce/pce/PcePathDescriptionTest.java | 1 - .../transportpce/pce/constraints/PceConstraintsTest.java | 2 -- .../transportpce/pce/networkanalyzer/PceLinkTest.java | 2 -- .../transportpce/pce/networkanalyzer/PceOpticalNodeTest.java | 1 - .../pce/utils/NotificationPublishServiceMock.java | 2 -- .../org/opendaylight/transportpce/pce/utils/PceTestData.java | 1 - .../opendaylight/transportpce/renderer/ModelMappingUtils.java | 2 -- .../org/opendaylight/transportpce/renderer/NodeLists.java | 1 - .../renderer/openroadminterface/OpenRoadmInterface121.java | 1 - .../renderer/openroadminterface/OpenRoadmInterface221.java | 1 - .../openroadminterface/OpenRoadmInterfaceFactory.java | 1 - .../renderer/openroadminterface/OpenRoadmOtnInterface221.java | 1 - .../renderer/provisiondevice/DeviceRendererServiceImpl.java | 2 -- .../provisiondevice/OtnDeviceRendererServiceImpl.java | 1 - .../renderer/provisiondevice/RendererServiceOperations.java | 1 - .../provisiondevice/RendererServiceOperationsImpl.java | 2 -- .../renderer/provisiondevice/otn/OtnDeviceOperations.java | 1 - .../renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java | 1 - .../provisiondevice/servicepath/ServiceListTopology.java | 1 - .../renderer/provisiondevice/tasks/DeviceRenderingTask.java | 1 - .../renderer/provisiondevice/tasks/OlmPowerSetupTask.java | 1 - .../renderer/provisiondevice/tasks/RollbackProcessor.java | 1 - .../transportpce/renderer/rpcs/DeviceRendererRPCImpl.java | 1 - .../renderer/rpcs/TransportPCEServicePathRPCImpl.java | 2 -- .../openroadminterface/OpenRoadMInterface221Test.java | 1 - .../DeviceRendererServiceImplCreateOtsOmsTest.java | 1 - .../RendererServiceOperationsImplDeleteTest.java | 1 - .../provisiondevice/RendererServiceOperationsImplTest.java | 1 - .../transportpce/renderer/stub/MountPointStub.java | 2 -- .../transportpce/renderer/stub/OlmServiceStub.java | 1 - .../renderer/utils/NotificationPublishServiceMock.java | 2 -- .../transportpce/servicehandler/DowngradeConstraints.java | 1 - .../transportpce/servicehandler/MappingConstraints.java | 1 - .../transportpce/servicehandler/ModelMappingUtils.java | 1 - .../transportpce/servicehandler/ServiceEndpointType.java | 1 - .../transportpce/servicehandler/impl/ServicehandlerImpl.java | 2 -- .../servicehandler/service/PCEServiceWrapper.java | 2 -- .../servicehandler/service/RendererServiceWrapper.java | 2 -- .../servicehandler/service/ServiceDataStoreOperations.java | 1 - .../servicehandler/service/ServiceHandlerOperationsImpl.java | 2 -- .../servicehandler/stub/StubPceServiceOperations.java | 2 -- .../transportpce/servicehandler/ModelMappingUtilsTest.java | 2 -- .../servicehandler/impl/ServicehandlerImplTest.java | 2 -- .../servicehandler/service/PCEServiceWrapperTest.java | 1 - .../servicehandler/service/RendererServiceWrapperTest.java | 1 - .../service/ServiceDataStoreOperationsImplTest.java | 1 - .../transportpce/servicehandler/utils/ModelMappingUtils.java | 1 - .../transportpce/servicehandler/utils/ServiceDataUtils.java | 2 -- .../validation/ServiceCreateValidationTest.java | 1 - .../org/opendaylight/transportpce/tapi/impl/TapiImpl.java | 2 -- .../tapi/topology/ConvertORTopoObjectToTapiTopoObject.java | 1 - .../transportpce/tapi/topology/TapiTopologyImpl.java | 2 -- .../transportpce/tapi/topology/TopologyUtils.java | 1 - .../opendaylight/transportpce/tapi/utils/MappingUtils.java | 1 - .../transportpce/tapi/utils/ServiceEndpointType.java | 1 - .../opendaylight/transportpce/tapi/utils/TapiListener.java | 1 - .../tapi/validation/CreateConnectivityServiceValidation.java | 1 - .../transportpce/tapi/validation/checks/EndPointCheck.java | 1 - .../transportpce/tapi/topology/TapiTopologyImplTest.java | 2 -- .../transportpce/tapi/utils/TopologyDataUtils.java | 1 - 116 files changed, 2 insertions(+), 153 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java index a4bc0dfaf..95cd58259 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java @@ -14,7 +14,6 @@ import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEV import java.math.BigDecimal; import java.util.List; import java.util.Optional; - import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.mapping.MappingUtils; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java index dec295b58..52abeced1 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java @@ -15,7 +15,6 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; - import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.api.MountPoint; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; 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 a5ae2a013..6fb91d21f 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 @@ -11,7 +11,6 @@ package org.opendaylight.transportpce.common.device; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.ListenableFuture; - import java.util.Optional; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManager.java b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManager.java index ae8f60123..1dbc128c9 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManager.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManager.java @@ -11,7 +11,6 @@ package org.opendaylight.transportpce.common.device; import java.util.Optional; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; - import org.opendaylight.mdsal.binding.api.MountPoint; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yangtools.yang.binding.DataObject; 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 6f424f511..eaa7773d9 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 @@ -13,7 +13,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -24,7 +23,6 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.MountPoint; import org.opendaylight.mdsal.binding.api.MountPointService; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java index f2f94d6db..b0fcb54a4 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java @@ -14,7 +14,6 @@ import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.binding.api.WriteTransaction; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort121ByName.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort121ByName.java index fe7b917a2..484053b2c 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort121ByName.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort121ByName.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.common.mapping; import java.io.Serializable; import java.util.Comparator; - import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.Port; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort221ByName.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort221ByName.java index f58d91580..6c31cec94 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort221ByName.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort221ByName.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.common.mapping; import java.io.Serializable; import java.util.Comparator; - import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.Port; diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/DeviceInventory.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/DeviceInventory.java index 6f749cf7d..07ad03067 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/DeviceInventory.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/DeviceInventory.java @@ -15,7 +15,6 @@ import java.util.Date; import java.util.concurrent.ExecutionException; import java.util.regex.Pattern; import javax.sql.DataSource; - import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode.java index 5279f1af3..425526381 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode.java @@ -13,7 +13,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import javax.sql.DataSource; - import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java index c4bc59011..5ba9a938f 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java @@ -13,7 +13,6 @@ import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareD import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareEmptyString; import com.google.common.base.Preconditions; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -21,7 +20,6 @@ import java.sql.SQLException; import java.util.Optional; import java.util.concurrent.ExecutionException; import javax.sql.DataSource; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java index a4c33830a..e394860a1 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java @@ -12,7 +12,6 @@ import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareD import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareEmptyString; import com.google.common.base.Preconditions; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -20,7 +19,6 @@ import java.sql.SQLException; import java.util.Optional; import java.util.concurrent.ExecutionException; import javax.sql.DataSource; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceConfigListener.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceConfigListener.java index 5e132da80..652d6ef53 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceConfigListener.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceConfigListener.java @@ -12,7 +12,6 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; - import org.opendaylight.mdsal.binding.api.DataObjectModification; import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceListener.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceListener.java index 70f582222..d5ba4047e 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceListener.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/listener/DeviceListener.java @@ -12,7 +12,6 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; - import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; import org.opendaylight.mdsal.binding.api.DataTreeModification; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java index 7917e6df9..63a020690 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.networkmodel; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import java.util.Collection; import java.util.Collections; import java.util.List; @@ -17,7 +16,6 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import javax.annotation.Nonnull; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectModification; import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java index 07616f721..f19ec938f 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java @@ -15,7 +15,6 @@ import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.MountPoint; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java index 3b8811cb8..363b5119f 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.networkmodel; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.FluentFuture; - import java.util.Optional; import java.util.concurrent.ExecutionException; import org.eclipse.jdt.annotation.NonNull; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/OtnTopoNode.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/OtnTopoNode.java index 5fcaff3fd..bca3a2dc9 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/OtnTopoNode.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/OtnTopoNode.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.networkmodel.dto; import java.util.Map; - import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.XpdrNodeTypes; public class OtnTopoNode { diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/TopologyShard.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/TopologyShard.java index 5a75412c5..7d0982bd7 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/TopologyShard.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/TopologyShard.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.networkmodel.dto; import java.util.List; - import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPoint; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java index 356462330..98dd7157d 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java @@ -11,7 +11,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutionException; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener221.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener221.java index 0124d2fbf..87b19e2e0 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener221.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/DeviceListener221.java @@ -12,7 +12,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.ChangeNo import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.CreateTechInfoNotification; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.OrgOpenroadmDeviceListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.OtdrScanResult; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,4 +46,4 @@ public class DeviceListener221 implements OrgOpenroadmDeviceListener { LOG.info("Notification {} received {}", OtdrScanResult.QNAME, notification); } -} \ No newline at end of file +} diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java index cc9aaf72c..9693d153e 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.networkmodel.service; import com.google.common.util.concurrent.ListenableFuture; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java index f3a9f37c5..0558a08a2 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java @@ -9,13 +9,11 @@ package org.opendaylight.transportpce.networkmodel.util; import com.google.common.collect.ImmutableList; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; - import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.networkmodel.dto.OtnTopoNode; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java index 2becccb35..9a9a7f153 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java @@ -17,7 +17,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.network.NetworkTransactionService; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java index 824d3348b..7e9239c27 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.networkmodel.util; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.network.NetworkTransactionService; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TpceNetwork.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TpceNetwork.java index c6a9ab3f8..4d7ad6229 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TpceNetwork.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TpceNetwork.java @@ -11,7 +11,6 @@ package org.opendaylight.transportpce.networkmodel.util; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.network.NetworkTransactionService; diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java index a536c6904..26bf5db9a 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java @@ -12,7 +12,6 @@ import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; import java.util.Optional; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.transportpce.common.crossconnect.CrossConnect; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java index 849ae2989..a3e8e0436 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java @@ -11,7 +11,6 @@ import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java index a843f00cd..a0ce4bf8a 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java @@ -8,13 +8,11 @@ package org.opendaylight.transportpce.olm.util; import com.google.common.base.Strings; - import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java index 9e433f011..05521a85e 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java @@ -13,7 +13,6 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.Timeouts; diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java index 7237f33f8..bf8b202ed 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.olm.service; import java.math.BigDecimal; import java.util.Optional; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/stub/OlmServiceStub.java b/olm/src/test/java/org/opendaylight/transportpce/olm/stub/OlmServiceStub.java index 96803ef06..28e6168cc 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/stub/OlmServiceStub.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/stub/OlmServiceStub.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.olm.stub; import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; - import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentInput; diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmPowerServiceRpcImplUtil.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmPowerServiceRpcImplUtil.java index c000cc8f5..0349c608e 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmPowerServiceRpcImplUtil.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmPowerServiceRpcImplUtil.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.olm.util; import java.util.ArrayList; import java.util.List; - import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseInputBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentInput; diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java index 093fc22a5..55d9aa266 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java @@ -14,7 +14,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; - import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java index a04ac0473..1a5effb99 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java @@ -14,7 +14,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java index ff38b7496..2f887aa98 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java @@ -8,11 +8,9 @@ package org.opendaylight.transportpce.pce; import com.google.common.collect.ImmutableList; - import java.util.ArrayList; import java.util.List; import java.util.Map; - import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.pce.networkanalyzer.PceLink; import org.opendaylight.transportpce.pce.networkanalyzer.PceResult; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraints.java b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraints.java index cfa9fd55e..74014d952 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraints.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraints.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.pce.constraints; import java.util.ArrayList; import java.util.List; - import org.opendaylight.transportpce.pce.networkanalyzer.PceOpticalNode; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.RoutingConstraintsSp; import org.slf4j.Logger; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java index 0c3cc1092..5e6213617 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java @@ -14,7 +14,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.network.NetworkTransactionService; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ConnectToGnpyServer.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ConnectToGnpyServer.java index 42365f99c..78980d8ac 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ConnectToGnpyServer.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ConnectToGnpyServer.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.pce.gnpy; import com.google.common.io.CharStreams; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -17,7 +16,6 @@ import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java index 829c50df4..fc1480cdd 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.pce.gnpy; //import com.google.common.base.Preconditions; import com.google.gson.stream.JsonReader; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -25,9 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Optional; - import javax.annotation.Nonnull; - import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry; import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java index a1ccc29f7..d7af8cbe3 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java @@ -15,7 +15,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; - import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.transportpce.pce.constraints.PceConstraints; import org.opendaylight.transportpce.pce.constraints.PceConstraints.ResourcePair; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java index d880ab943..94049b975 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java @@ -16,7 +16,6 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.regex.Pattern; import java.util.stream.IntStream; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.network.NetworkTransactionService; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java index 42541b749..b8ffdb5dc 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.pce.gnpy; import java.util.List; - import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.pce.constraints.PceConstraints; import org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev190103.GnpyApi; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java index 596c7025b..377e611c2 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java @@ -8,9 +8,7 @@ package org.opendaylight.transportpce.pce.gnpy; -//false positive in SpotBug -> cannot be used with FluentIterable... import com.google.common.collect.FluentIterable; - import java.io.BufferedWriter; import java.io.FileWriter; import java.io.IOException; @@ -19,7 +17,6 @@ import java.io.Writer; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.Optional; - import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry; import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext; import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java index b3dbae014..2aa77b901 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java @@ -13,7 +13,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; - import org.jgrapht.GraphPath; import org.jgrapht.alg.shortestpath.KShortestSimplePaths; import org.jgrapht.alg.shortestpath.PathValidator; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java index 2aa455cb7..bd4052d79 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java @@ -13,7 +13,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.jgrapht.GraphPath; import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.pce.constraints.PceConstraints; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java index 0d853d3c2..42fda976f 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java @@ -8,9 +8,7 @@ package org.opendaylight.transportpce.pce.impl; import com.google.common.util.concurrent.ListenableFuture; - import java.util.concurrent.ExecutionException; - import org.opendaylight.transportpce.pce.service.PathComputationService; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.CancelResourceReserveInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.CancelResourceReserveOutput; @@ -60,4 +58,4 @@ public class PceServiceRPCImpl implements TransportpcePceService { } return RpcResultBuilder.success(output).buildFuture(); } -} \ No newline at end of file +} diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java index bb946712d..2385de736 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java @@ -11,7 +11,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.TreeMap; - import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.pce.constraints.PceConstraints; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java index fd8f3a280..971bfba41 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java @@ -18,7 +18,6 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.ResponseCodes; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java index 68b6d12db..3020cab04 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java @@ -13,7 +13,6 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.List; - import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.span.attributes.LinkConcatenation.FiberType; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.link.oms.attributes.Span; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java index 38fa7347b..cdc764fd8 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.TreeMap; - import org.opendaylight.transportpce.pce.SortPortsByName; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java index 4966b9a44..47f3b7008 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java @@ -15,7 +15,6 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; import java.util.stream.Collectors; - import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.OduSwitchingPools; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java index 9f492b3dc..6c70f9fab 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java @@ -10,13 +10,11 @@ package org.opendaylight.transportpce.pce.networkanalyzer; import java.util.List; import java.util.Map; - import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.AToZDirection; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ZToADirection; import org.opendaylight.yangtools.yang.common.Uint16; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationService.java b/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationService.java index 95cd18723..8f443076b 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationService.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationService.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.pce.service; import com.google.common.util.concurrent.ListenableFuture; - import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.CancelResourceReserveInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.CancelResourceReserveOutput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInput; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImpl.java index 9fc410afb..9d860f8a3 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImpl.java @@ -10,12 +10,10 @@ package org.opendaylight.transportpce.pce.service; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.Executors; - import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.pce.PceComplianceCheck; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PceComplianceCheckTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PceComplianceCheckTest.java index 7b82fd4e0..a64d4c9be 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/PceComplianceCheckTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PceComplianceCheckTest.java @@ -11,7 +11,6 @@ package org.opendaylight.transportpce.pce; import org.junit.Assert; import org.junit.Before; import org.junit.Test; - import org.opendaylight.transportpce.pce.utils.PceTestData; import org.opendaylight.transportpce.test.AbstractTest; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTest.java index fbd6c270f..6b04f1a33 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTest.java @@ -11,7 +11,6 @@ package org.opendaylight.transportpce.pce; import java.util.ArrayList; import java.util.List; import java.util.Map; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsTest.java index 900061989..5434e8523 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsTest.java @@ -10,11 +10,9 @@ package org.opendaylight.transportpce.pce.constraints; import java.util.ArrayList; import java.util.List; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; - import org.opendaylight.transportpce.pce.networkanalyzer.PceOpticalNode; import org.opendaylight.transportpce.test.AbstractTest; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java index c796151fd..ed79f68d8 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java @@ -9,12 +9,10 @@ package org.opendaylight.transportpce.pce.networkanalyzer; import com.google.common.collect.ImmutableList; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java index 42e2ec2db..6ad7f9d8f 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.pce.networkanalyzer; import java.util.ArrayList; import java.util.List; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NotificationPublishServiceMock.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NotificationPublishServiceMock.java index bc62a7486..cc4237a78 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NotificationPublishServiceMock.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NotificationPublishServiceMock.java @@ -8,9 +8,7 @@ package org.opendaylight.transportpce.pce.utils; import com.google.common.util.concurrent.ListenableFuture; - import java.util.concurrent.TimeUnit; - import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.yangtools.yang.binding.Notification; import org.slf4j.Logger; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java index d471002db..3c78abc58 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.pce.utils; import java.util.Arrays; - import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInputBuilder; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java index 8c83cddb6..3cf5896a4 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java @@ -8,13 +8,11 @@ package org.opendaylight.transportpce.renderer; import com.google.common.util.concurrent.ListenableFuture; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeMap; - import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInputBuilder; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java index 292a38731..12170719d 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.renderer; import java.util.List; - import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200128.olm.renderer.input.Nodes; public class NodeLists { diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java index b20ef8e24..f4e7661b4 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java @@ -12,7 +12,6 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Optional; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java index 56da91256..e07fafe9e 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java @@ -13,7 +13,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Optional; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java index 4f43adc39..41e49fd50 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.renderer.openroadminterface; import java.util.List; - import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.mapping.MappingUtils; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java index 538bd2ee8..14635fe08 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.renderer.openroadminterface; import java.util.ArrayList; import java.util.List; import java.util.stream.IntStream; - import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java index b2c6edc01..a3fe1ef0e 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.renderer.provisiondevice; import com.google.common.collect.Sets; import com.google.common.util.concurrent.FluentFuture; - import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -24,7 +23,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; - import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java index 1713764f9..ee964c53d 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java @@ -18,7 +18,6 @@ import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinTask; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; - import org.opendaylight.transportpce.common.crossconnect.CrossConnect; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperations.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperations.java index 7b4cdbc26..18ce6a180 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperations.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperations.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.renderer.provisiondevice; import com.google.common.util.concurrent.ListenableFuture; - import org.opendaylight.transportpce.common.OperationResult; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceDeleteInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceDeleteOutput; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java index 3e34805ed..925935c6b 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java @@ -11,7 +11,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -21,7 +20,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.mdsal.binding.api.ReadTransaction; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperations.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperations.java index 0914b1362..361442f7e 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperations.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperations.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.renderer.provisiondevice.otn; import java.util.List; - import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.CircuitPacks; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.OduSwitchingPools; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.odu.switching.pools.non.blocking.list.PortList; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java index 1ff6acb72..1f3697242 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/otn/OtnDeviceOperationsImpl.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.renderer.provisiondevice.otn; import java.util.ArrayList; import java.util.List; - import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.CircuitPacks; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.circuit.pack.Ports; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.OduSwitchingPools; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/servicepath/ServiceListTopology.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/servicepath/ServiceListTopology.java index afab3a210..737fa7915 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/servicepath/ServiceListTopology.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/servicepath/ServiceListTopology.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.renderer.provisiondevice.servicepath; import java.util.ArrayList; import java.util.List; - import org.opendaylight.yang.gen.v1.http.org.openroadm.common.node.types.rev181130.NodeIdType; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service.Topology; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service.TopologyBuilder; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java index 37fa8e096..2ecb0b88f 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.renderer.provisiondevice.tasks; import java.util.List; import java.util.concurrent.Callable; - import org.opendaylight.transportpce.renderer.ServicePathInputData; import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererService; import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRenderingResult; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupTask.java index c64b5135c..f4b2f0236 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupTask.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.renderer.provisiondevice.tasks; import java.util.concurrent.Callable; import java.util.concurrent.Future; - import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.renderer.provisiondevice.OLMRenderingResult; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/RollbackProcessor.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/RollbackProcessor.java index 0405432a3..d4d53b522 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/RollbackProcessor.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/RollbackProcessor.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.renderer.provisiondevice.tasks; import java.util.Deque; import java.util.LinkedList; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImpl.java index 2caf1571a..62ad6be96 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImpl.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.renderer.rpcs; import com.google.common.util.concurrent.ListenableFuture; - import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererService; import org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererService; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java index b38781ec3..30e0dc10c 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java @@ -8,9 +8,7 @@ package org.opendaylight.transportpce.renderer.rpcs; import com.google.common.util.concurrent.ListenableFuture; - import java.util.concurrent.ExecutionException; - import org.opendaylight.transportpce.renderer.ModelMappingUtils; import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceDeleteInput; diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java index b05f5c373..57a4577b9 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.renderer.openroadminterface; import java.util.Arrays; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java index cab783017..c1dd9280a 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.renderer.provisiondevice; import java.util.ArrayList; - import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java index 629373484..d3dbecb31 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java @@ -11,7 +11,6 @@ package org.opendaylight.transportpce.renderer.provisiondevice; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.util.Collections; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java index ce1b7fcb1..42bbf4b32 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.renderer.provisiondevice; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/MountPointStub.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/MountPointStub.java index 639a4d9c3..e4c82b98c 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/MountPointStub.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/MountPointStub.java @@ -9,9 +9,7 @@ package org.opendaylight.transportpce.renderer.stub; import java.util.Optional; - import javax.annotation.Nonnull; - import org.opendaylight.mdsal.binding.api.BindingService; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.MountPoint; diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java index bc78541b5..f1292b7d4 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.renderer.stub; import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; - import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutput; diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/NotificationPublishServiceMock.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/NotificationPublishServiceMock.java index 3234b5e36..1b2ce3afb 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/NotificationPublishServiceMock.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/NotificationPublishServiceMock.java @@ -8,9 +8,7 @@ package org.opendaylight.transportpce.renderer.utils; import com.google.common.util.concurrent.ListenableFuture; - import java.util.concurrent.TimeUnit; - import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.yangtools.yang.binding.Notification; import org.slf4j.Logger; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/DowngradeConstraints.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/DowngradeConstraints.java index a08ae827b..ef75b6adf 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/DowngradeConstraints.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/DowngradeConstraints.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.servicehandler; import java.util.List; - import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.CoRoutingOrGeneral; import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.CoRouting; import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.CoRoutingBuilder; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/MappingConstraints.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/MappingConstraints.java index ab917bc7c..ed9c0210f 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/MappingConstraints.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/MappingConstraints.java @@ -11,7 +11,6 @@ package org.opendaylight.transportpce.servicehandler; import java.util.ArrayList; import java.util.List; - import org.opendaylight.yang.gen.v1.http.org.openroadm.common.node.types.rev181130.NodeIdType; import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.Constraints; import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.CoRoutingOrGeneral; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java index 93bf077fa..8561321a7 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.servicehandler; import com.google.common.util.concurrent.ListenableFuture; - import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.path.computation.request.input.ServiceAEnd; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.path.computation.request.input.ServiceAEndBuilder; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ServiceEndpointType.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ServiceEndpointType.java index 1b2b77abd..205720a18 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ServiceEndpointType.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ServiceEndpointType.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.servicehandler; import com.google.common.collect.ImmutableMap; - import java.util.Map; /** 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 5d61edd15..731ce9cff 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 @@ -8,12 +8,10 @@ package org.opendaylight.transportpce.servicehandler.impl; import com.google.common.util.concurrent.ListenableFuture; - import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.Optional; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.transportpce.common.OperationResult; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapper.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapper.java index 868fde0cd..e2c8fdc1e 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapper.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapper.java @@ -12,9 +12,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.util.concurrent.Executors; - import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.pce.service.PathComputationService; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapper.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapper.java index 2a118acc6..d01a30bcc 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapper.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapper.java @@ -12,9 +12,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.util.concurrent.Executors; - import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperations.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperations.java index d5b2f04cf..72018c207 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperations.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperations.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.servicehandler.service; import java.util.Optional; - import org.opendaylight.transportpce.common.OperationResult; import org.opendaylight.transportpce.servicehandler.ServiceInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutput; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperationsImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperationsImpl.java index e801d9e76..913a1772f 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperationsImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceHandlerOperationsImpl.java @@ -8,9 +8,7 @@ package org.opendaylight.transportpce.servicehandler.service; import com.google.common.util.concurrent.ListenableFuture; - import java.util.concurrent.ExecutionException; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.transportpce.pce.service.PathComputationService; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubPceServiceOperations.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubPceServiceOperations.java index be863a49e..64dccb48a 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubPceServiceOperations.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubPceServiceOperations.java @@ -10,10 +10,8 @@ package org.opendaylight.transportpce.servicehandler.stub; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.util.concurrent.Callable; import java.util.concurrent.Executors; - import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.pce.service.PathComputationService; diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java index 18b3f5c25..179d4bb40 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.servicehandler; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; @@ -18,7 +17,6 @@ import java.util.Arrays; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; - import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java index 7da179ff9..38c2cdc14 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java @@ -13,11 +13,9 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java index e57ccda34..d92f9e9df 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java @@ -12,7 +12,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import com.google.common.util.concurrent.ListenableFuture; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java index 51674681b..c8aeeef8c 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java @@ -12,7 +12,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import com.google.common.util.concurrent.ListenableFuture; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java index 650df8f41..c854702e4 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.servicehandler.service; import java.util.Optional; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ModelMappingUtils.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ModelMappingUtils.java index d9eec40ec..5f629488a 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ModelMappingUtils.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ModelMappingUtils.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.servicehandler.utils; import com.google.common.util.concurrent.ListenableFuture; - import org.opendaylight.transportpce.servicehandler.MappingConstraints; import org.opendaylight.transportpce.servicehandler.ServiceInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutput; diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java index a5cf6991b..53972b6f6 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java @@ -10,13 +10,11 @@ package org.opendaylight.transportpce.servicehandler.utils; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.concurrent.Callable; import java.util.concurrent.Executors; - import org.opendaylight.transportpce.servicehandler.MappingConstraints; import org.opendaylight.transportpce.servicehandler.ModelMappingUtils; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInput; diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidationTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidationTest.java index 48016de31..cc34ee83c 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidationTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidationTest.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.servicehandler.validation; import java.util.Arrays; - import org.junit.Assert; import org.junit.Test; import org.opendaylight.transportpce.common.OperationResult; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java index c33392cf2..6c591a5e7 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java @@ -8,12 +8,10 @@ package org.opendaylight.transportpce.tapi.impl; import com.google.common.util.concurrent.ListenableFuture; - import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.UUID; - import org.opendaylight.transportpce.common.OperationResult; import org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperations; import org.opendaylight.transportpce.tapi.utils.GenericServiceEndpoint; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java index 39421923d..3d90c2e25 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java @@ -15,7 +15,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; import java.util.stream.Collectors; - import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.OduSwitchingPools; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java index 68bfc31e7..aa4c4233e 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.tapi.topology; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.ListenableFuture; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -20,7 +19,6 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; - import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.api.DataBroker; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TopologyUtils.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TopologyUtils.java index 61f04fbf0..606d4455b 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TopologyUtils.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TopologyUtils.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.tapi.topology; import com.google.common.util.concurrent.ListenableFuture; - import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsOutputBuilder; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/MappingUtils.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/MappingUtils.java index 232c95168..3abc859ba 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/MappingUtils.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/MappingUtils.java @@ -11,7 +11,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.Set; - import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input.ServiceAEnd; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input.ServiceZEnd; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/ServiceEndpointType.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/ServiceEndpointType.java index bc1f05f50..875b53eee 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/ServiceEndpointType.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/ServiceEndpointType.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.tapi.utils; import com.google.common.collect.ImmutableMap; - import java.util.Map; /** diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiListener.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiListener.java index 41cf08452..c1e598d56 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiListener.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiListener.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.tapi.utils; import java.util.Collection; import java.util.Iterator; import java.util.List; - import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.api.DataObjectModification; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java index ec3bce4a9..e1090a102 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.tapi.validation; import java.util.List; - import org.opendaylight.transportpce.common.OperationResult; import org.opendaylight.transportpce.servicehandler.validation.checks.ComplianceCheckResult; import org.opendaylight.transportpce.tapi.validation.checks.ConnConstraintCheck; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/checks/EndPointCheck.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/checks/EndPointCheck.java index ca09f0e08..a29b278de 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/checks/EndPointCheck.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/checks/EndPointCheck.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.tapi.validation.checks; import java.util.List; - import org.opendaylight.transportpce.servicehandler.validation.checks.ComplianceCheckResult; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.create.connectivity.service.input.EndPoint; import org.slf4j.Logger; diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java index db4f645d5..517f34e71 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java @@ -10,11 +10,9 @@ package org.opendaylight.transportpce.tapi.topology; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; - import org.junit.Before; import org.junit.Test; import org.opendaylight.transportpce.common.DataStoreContext; diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java index b9119fb0e..5dc201435 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java @@ -8,7 +8,6 @@ package org.opendaylight.transportpce.tapi.utils; import edu.umd.cs.findbugs.annotations.NonNull; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -- 2.36.6