From eedfcf046eadaa5ca9d38792c0af8769a4006f32 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Wed, 24 Jan 2024 11:54:05 +0100 Subject: [PATCH] Remove some useless code Remove few useless properties in common, tapi, nbinotifications and dmaap-client modules. JIRA: TRNSPRTPCE-778 Signed-off-by: Gilles Thouenon Change-Id: I06135cddd40b073c41e4ce37d3032a36a2c02c98 --- .../transportpce/common/crossconnect/CrossConnectImpl.java | 2 -- .../dmaap/client/listener/NbiNotificationsHandler.java | 2 -- .../nbinotifications/listener/NbiNotificationsHandler.java | 2 -- .../org/opendaylight/transportpce/tapi/impl/TapiProvider.java | 3 --- 4 files changed, 9 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 7babab074..b9a12e588 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 @@ -32,7 +32,6 @@ public class CrossConnectImpl implements CrossConnect { private static final Logger LOG = LoggerFactory.getLogger(CrossConnectImpl.class); - protected CrossConnect crossConnect; private final MappingUtils mappingUtils; private CrossConnectImpl121 crossConnectImpl121; private CrossConnectImpl221 crossConnectImpl221; @@ -56,7 +55,6 @@ public class CrossConnectImpl implements CrossConnect { this.crossConnectImpl121 = crossConnectImpl121; this.crossConnectImpl221 = crossConnectImpl221; this.crossConnectImpl710 = crossConnectImpl710; - this.crossConnect = null; } public Optional getCrossConnect(String nodeId, String connectionNumber) { diff --git a/dmaap-client/src/main/java/org/opendaylight/transportpce/dmaap/client/listener/NbiNotificationsHandler.java b/dmaap-client/src/main/java/org/opendaylight/transportpce/dmaap/client/listener/NbiNotificationsHandler.java index 71edc7fb5..861f9ca2d 100644 --- a/dmaap-client/src/main/java/org/opendaylight/transportpce/dmaap/client/listener/NbiNotificationsHandler.java +++ b/dmaap-client/src/main/java/org/opendaylight/transportpce/dmaap/client/listener/NbiNotificationsHandler.java @@ -22,7 +22,6 @@ import org.opendaylight.transportpce.dmaap.client.resource.model.CreatedEvent; import org.opendaylight.yang.gen.v1.nbi.notifications.rev230726.PublishNotificationAlarmService; import org.opendaylight.yang.gen.v1.nbi.notifications.rev230726.PublishNotificationProcessService; import org.opendaylight.yang.gen.v1.nbi.notifications.rev230726.PublishTapiNotificationService; -import org.opendaylight.yangtools.concepts.Registration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +29,6 @@ public class NbiNotificationsHandler { private static final Logger LOG = LoggerFactory.getLogger(NbiNotificationsHandler.class); private String topic = "unauthenticated.TPCE"; private EventsApi api; - private Registration reg; public NbiNotificationsHandler(String baseUrl, String username, String password) { LOG.info("Dmaap server {} for user {}", baseUrl, username); diff --git a/nbinotifications/src/main/java/org/opendaylight/transportpce/nbinotifications/listener/NbiNotificationsHandler.java b/nbinotifications/src/main/java/org/opendaylight/transportpce/nbinotifications/listener/NbiNotificationsHandler.java index af6a1ce4d..7b9817cf6 100644 --- a/nbinotifications/src/main/java/org/opendaylight/transportpce/nbinotifications/listener/NbiNotificationsHandler.java +++ b/nbinotifications/src/main/java/org/opendaylight/transportpce/nbinotifications/listener/NbiNotificationsHandler.java @@ -21,7 +21,6 @@ import org.opendaylight.yang.gen.v1.nbi.notifications.rev230726.NotificationTapi import org.opendaylight.yang.gen.v1.nbi.notifications.rev230726.PublishNotificationAlarmService; import org.opendaylight.yang.gen.v1.nbi.notifications.rev230726.PublishNotificationProcessService; import org.opendaylight.yang.gen.v1.nbi.notifications.rev230726.PublishTapiNotificationService; -import org.opendaylight.yangtools.concepts.Registration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +29,6 @@ public class NbiNotificationsHandler { private Map> publishersServiceMap; private Map> publishersAlarmMap; private Map> tapiPublisherMap; - private Registration reg; public NbiNotificationsHandler(Map> publishersServiceMap, Map> publishersAlarmMap, diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java index 657b9c200..fd1f87e68 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiProvider.java @@ -39,7 +39,6 @@ import org.opendaylight.transportpce.tapi.utils.TapiLinkImpl; import org.opendaylight.transportpce.tapi.utils.TapiListener; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.Network; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OrgOpenroadmServiceService; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks; @@ -48,7 +47,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top 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.opendaylight.params.xml.ns.yang.tapi.rev180928.ServiceInterfacePoints; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; -import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.osgi.service.component.annotations.Activate; @@ -80,7 +78,6 @@ public class TapiProvider { private final NetworkTransactionService networkTransactionService; private final OrgOpenroadmServiceService serviceHandler; private final ServiceDataStoreOperations serviceDataStoreOperations; - private ObjectRegistration tapiNetworkutilsServiceRpcRegistration; private List listeners; private List rpcRegistrations = new ArrayList<>(); private Registration pcelistenerRegistration; -- 2.36.6