From 2b8bb7bfd6f3586ecdf914ce4ed95f21dd0ee46b Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Mon, 24 May 2021 10:55:42 +0200 Subject: [PATCH] Fix Sonar complains Issue-ID: OAM-215 Signed-off-by: Claudio D. Gasparini Change-Id: Iee8cb89a8d7742ea49e774c4d4535b1c11dc69e2 --- docs/pm/index.rst | 1 - tox.ini | 2 +- .../ran/oam/nf/oam/adopter/app/http/HttpCientFactory.java | 2 +- .../oam/adopter/event/notifier/NotificationProvider.java | 5 ++--- .../o/ran/oam/nf/oam/adopter/mock/app/SnmpNotifier.java | 4 ++-- .../nf/oam/adopter/mock/app/controller/RanController.java | 4 ++-- .../nf/oam/adopter/pm/rest/manager/AdaptersDeployer.java | 2 +- .../PerformanceManagementMapperConfigProvider.java | 5 ++--- .../pm/rest/manager/PerformanceManagementRestAgent.java | 5 ++--- .../manager/PerformanceManagementRestAgentFactory.java | 4 ++-- .../pm/rest/manager/mapper/MeasurementFieldsHandler.java | 4 ++-- .../mapper/PerformanceManagementFile2VesMapper.java | 10 +++++----- .../adopter/pm/sb/rest/client/DefaultHttpRestClient.java | 6 ++---- .../http/DownloadPerformanceManagementFilesHandler.java | 4 ++-- .../oam/adopter/pm/sb/rest/client/http/TokenHandler.java | 7 +++---- .../oam/nf/oam/adopter/snmp/manager/SnmpManagerImpl.java | 3 +-- .../snmp/manager/SnmpMappingConfigurationProvider.java | 5 ++--- .../oam/nf/oam/adopter/snmp/manager/SnmpTrapListener.java | 15 ++++++--------- .../snmp/manager/mapper/CommonEventHeaderHandler.java | 10 +++++----- .../adopter/snmp/manager/mapper/FaultFieldsHandler.java | 7 +++---- .../oam/adopter/snmp/manager/mapper/SnmpMapperImpl.java | 10 ++++------ 21 files changed, 50 insertions(+), 65 deletions(-) diff --git a/docs/pm/index.rst b/docs/pm/index.rst index f47ad48..2ed6600 100644 --- a/docs/pm/index.rst +++ b/docs/pm/index.rst @@ -187,7 +187,6 @@ Rest Adapter configuration Configuration file **application.yml** contains global definitions required to be consumed by PM REST adapters services. -- **token-api-username** Defines the username to be used for login - **synchronization-time-start** Defines the time for execution of pull of PM files and forwarding as VES Message - **synchronization-time-frequency** Defines the time for execution of pull of PM files and forwarding as VES Message - **mapping-config-path** Defines the path where mapping configuration file is located diff --git a/tox.ini b/tox.ini index 2705e16..51d2b1b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ # ================================================================================== -# Copyright (c) 2020 Nordix +# Copyright (C) 2021 AT&T Intellectual Property # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-app/src/main/java/org/o/ran/oam/nf/oam/adopter/app/http/HttpCientFactory.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-app/src/main/java/org/o/ran/oam/nf/oam/adopter/app/http/HttpCientFactory.java index 7184c28..974c972 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-app/src/main/java/org/o/ran/oam/nf/oam/adopter/app/http/HttpCientFactory.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-app/src/main/java/org/o/ran/oam/nf/oam/adopter/app/http/HttpCientFactory.java @@ -53,7 +53,7 @@ public final class HttpCientFactory { final String trustStorePassword, final Long conectionTimeout, final Long responseTimeout) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException, IOException, CertificateException { - final SSLContext sslContext = getSslContext(new File(trustStore), trustStorePassword); + final var sslContext = getSslContext(new File(trustStore), trustStorePassword); return trustTrustStore(sslContext, conectionTimeout, responseTimeout); } diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-event-notifier/src/main/java/org/o/ran/oam/nf/oam/adopter/event/notifier/NotificationProvider.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-event-notifier/src/main/java/org/o/ran/oam/nf/oam/adopter/event/notifier/NotificationProvider.java index 2814706..02980a4 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-event-notifier/src/main/java/org/o/ran/oam/nf/oam/adopter/event/notifier/NotificationProvider.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-event-notifier/src/main/java/org/o/ran/oam/nf/oam/adopter/event/notifier/NotificationProvider.java @@ -25,7 +25,6 @@ import com.google.gson.Gson; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Single; import java.util.List; -import org.apache.hc.client5.http.async.methods.SimpleHttpRequest; import org.apache.hc.client5.http.async.methods.SimpleHttpRequests; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; @@ -78,7 +77,7 @@ public final class NotificationProvider implements VesEventNotifier { } private Completable notify(final String url, final String payload) { - final SimpleHttpRequest request = SimpleHttpRequests.post(url); + final var request = SimpleHttpRequests.post(url); request.setBody(payload, ContentType.APPLICATION_JSON); request.setHeader(HttpHeaders.AUTHORIZATION, authHeader); return Single.fromFuture(httpClient.execute(request, null)) @@ -89,7 +88,7 @@ public final class NotificationProvider implements VesEventNotifier { } private static Completable validatePost(final SimpleHttpResponse response) { - final String statusLine = new StatusLine(response).toString(); + final var statusLine = new StatusLine(response).toString(); final String entity; final int code = response.getCode(); if (code == HttpStatus.SC_OK || code == HttpStatus.SC_ACCEPTED) { diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/src/main/java/org/o/ran/oam/nf/oam/adopter/mock/app/SnmpNotifier.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/src/main/java/org/o/ran/oam/nf/oam/adopter/mock/app/SnmpNotifier.java index 60961f4..e79c143 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/src/main/java/org/o/ran/oam/nf/oam/adopter/mock/app/SnmpNotifier.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/src/main/java/org/o/ran/oam/nf/oam/adopter/mock/app/SnmpNotifier.java @@ -76,7 +76,7 @@ public class SnmpNotifier { private static void sendTrap(final CommunityTarget target, final HashMap trap, final String trapType) throws IOException { - final PDU pdu = new PDU(); + final var pdu = new PDU(); pdu.setType(PDU.TRAP); trap.forEach((key, value) -> { try { @@ -86,7 +86,7 @@ public class SnmpNotifier { } }); - try (final Snmp snmp = new Snmp(new DefaultUdpTransportMapping())) { + try (final var snmp = new Snmp(new DefaultUdpTransportMapping())) { snmp.send(pdu, target, null, null); LOG.info("Trap {} sent successfully.", trapType); } diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/src/main/java/org/o/ran/oam/nf/oam/adopter/mock/app/controller/RanController.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/src/main/java/org/o/ran/oam/nf/oam/adopter/mock/app/controller/RanController.java index 3b35d94..f3b0bef 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/src/main/java/org/o/ran/oam/nf/oam/adopter/mock/app/controller/RanController.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-mock/src/main/java/org/o/ran/oam/nf/oam/adopter/mock/app/controller/RanController.java @@ -53,14 +53,14 @@ public class RanController implements ControllerApi { @Override public ResponseEntity getPerformanceManagementFiles() { LOG.info("Read pm files."); - final HttpHeaders headers = new HttpHeaders(); + final var headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); return new ResponseEntity<>(ZipUtil.read(), headers, HttpStatus.OK); } @Override public ResponseEntity getTimeZone() { - final ZoneId zoneId = ZoneId.systemDefault(); + final var zoneId = ZoneId.systemDefault(); final ZoneOffset offset = zoneId.getRules().getOffset(Instant.now()); LOG.info("ZoneId {} / Offset {}", zoneId, offset); return ResponseEntity.ok(GSON.toJson(new TimeZoneOffsetResponse(OFFSET_FORMATTER.format(offset)))); diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/AdaptersDeployer.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/AdaptersDeployer.java index 2cd5c5c..3fcc725 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/AdaptersDeployer.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/AdaptersDeployer.java @@ -54,7 +54,7 @@ public final class AdaptersDeployer implements PerformanceManagementAdaptersDepl if (adapters.get(hostIpAddress) != null) { throw new AlreadyPresentException(hostIpAddress); } - final Adapter adapter = + final var adapter = Adapter.builder().username(username).password(password).hostIpAddress(hostIpAddress).build(); final PerformanceManagementRestAgent pmRestAgent = pmRestAgentFactory.createPerformanceManagementRestAgent(adapter).blockingGet(); diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementMapperConfigProvider.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementMapperConfigProvider.java index 36ff149..04b5067 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementMapperConfigProvider.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementMapperConfigProvider.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import java.io.IOException; import java.io.StringWriter; -import java.net.URI; import java.nio.file.Paths; import javax.annotation.PostConstruct; import org.apache.commons.configuration2.YAMLConfiguration; @@ -55,7 +54,7 @@ public class PerformanceManagementMapperConfigProvider { @PostConstruct public void init() throws IOException, ConfigurationException { requireNonNull(mappingFilePath); - final URI filePath = Paths.get(mappingFilePath).toUri(); + final var filePath = Paths.get(mappingFilePath).toUri(); builder = new ReloadingFileBasedConfigurationBuilder<>(YAMLConfiguration.class) .configure(new Parameters().hierarchical().setURL(filePath.toURL())); builder.addEventListener(ConfigurationBuilderEvent.CONFIGURATION_REQUEST, event -> { @@ -71,7 +70,7 @@ public class PerformanceManagementMapperConfigProvider { */ public VesMappingConfiguration getVesMappingConfiguration() throws ConfigurationException, IOException { final YAMLConfiguration configuration = builder.getConfiguration(); - final StringWriter output = new StringWriter(); + final var output = new StringWriter(); configuration.write(output); return YAML_READER.readValue(output.toString(), VesMappingConfiguration.class); } diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementRestAgent.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementRestAgent.java index 66693fc..c8133f4 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementRestAgent.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementRestAgent.java @@ -56,7 +56,7 @@ public final class PerformanceManagementRestAgent implements AutoCloseable { } private long initialDelay() { - final ZonedDateTime now = ZonedDateTime.now(zoneId); + final var now = ZonedDateTime.now(zoneId); ZonedDateTime nextRun = now .withHour(synchronizationTimeStart.getHour()) @@ -65,8 +65,7 @@ public final class PerformanceManagementRestAgent implements AutoCloseable { if (now.compareTo(nextRun) > 0) { nextRun = nextRun.plusSeconds(synchronizationTimeFrequency); } - final Duration duration = Duration.between(now, nextRun); - return duration.getSeconds(); + return Duration.between(now, nextRun).getSeconds(); } public ZoneId getTimeZone() { diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementRestAgentFactory.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementRestAgentFactory.java index 0ebaa6c..b6c9860 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementRestAgentFactory.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/PerformanceManagementRestAgentFactory.java @@ -58,8 +58,8 @@ public class PerformanceManagementRestAgentFactory { */ public final Single createPerformanceManagementRestAgent(final Adapter adapter) { return httpRestClient.getTimeZone(adapter).map(timeZone -> { - final PerformanceManagementAgentRunnable pmAgentRunnable = - new PerformanceManagementAgentRunnable(httpRestClient, eventListener, pmFileMapper, adapter); + final var pmAgentRunnable = new PerformanceManagementAgentRunnable(httpRestClient, eventListener, + pmFileMapper, adapter); return new PerformanceManagementRestAgent(pmAgentRunnable, properties.getSynchronizationTimeStart(), properties.getSynchronizationTimeFrequency(), timeZone); }); diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/MeasurementFieldsHandler.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/MeasurementFieldsHandler.java index 166af50..3b28d31 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/MeasurementFieldsHandler.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/MeasurementFieldsHandler.java @@ -39,7 +39,7 @@ final class MeasurementFieldsHandler { .stream().filter(records::containsKey) .collect(Collectors.toMap(Function.identity(), records::get))); - final NamedHashMap namedHashMap = new NamedHashMap(); + final var namedHashMap = new NamedHashMap(); namedHashMap.setName(csv.getAdditionalMeasurementsName()); namedHashMap.setHashMap(csv.getAdditionalMeasurements().stream() .filter(records::containsKey) @@ -68,7 +68,7 @@ final class MeasurementFieldsHandler { static MeasurementFields toMeasurementFields(final VesMappingConfiguration config, final Map records) { - final MeasurementFields measurementFields = new MeasurementFields(); + final var measurementFields = new MeasurementFields(); setMandatoryFields(measurementFields, config); setOptionalsFields(measurementFields, records, config); return measurementFields; diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/PerformanceManagementFile2VesMapper.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/PerformanceManagementFile2VesMapper.java index 1f5bedf..97197cf 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/PerformanceManagementFile2VesMapper.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/PerformanceManagementFile2VesMapper.java @@ -66,11 +66,11 @@ public class PerformanceManagementFile2VesMapper { LOG.info("Converting ZIP files to VES Message started"); final List listOfNotifications = new ArrayList<>(); final CsvSchema schema = CsvSchema.emptySchema().withHeader(); - final CsvMapper mapper = new CsvMapper(); + final var mapper = new CsvMapper(); mapper.configure(JsonParser.Feature.AUTO_CLOSE_SOURCE, false); try { ZipEntry entry; - final VesMappingConfiguration mappingConfiguration = pmConfigProvider.getVesMappingConfiguration(); + final var mappingConfiguration = pmConfigProvider.getVesMappingConfiguration(); while ((entry = zipInputStream.getNextEntry()) != null) { if (entry.getSize() > THRESHOLD_SIZE || entry.getSize() == -1) { throw new IllegalStateException("File to be unzipped too big."); @@ -85,7 +85,7 @@ public class PerformanceManagementFile2VesMapper { final List> mappedEvents = toEvent(mappingConfiguration, hostIp, iterator); mappedEvents.forEach(mapped -> { - final CommonEventFormat302ONAP eventFormat = new CommonEventFormat302ONAP(); + final var eventFormat = new CommonEventFormat302ONAP(); eventFormat.setEventList(mapped); listOfNotifications.add(eventFormat); }); @@ -107,11 +107,11 @@ public class PerformanceManagementFile2VesMapper { final Iterator> iterator) { final List> globalList = new ArrayList<>(); final int batchSize = mappingConfiguration.getBatchSize(); - int sequence = 0; + var sequence = 0; List events = new ArrayList<>(); final CsvConfiguration csv = mappingConfiguration.getCsv(); while (iterator.hasNext()) { - final Event event = new Event(); + final var event = new Event(); final Map recordMap = iterator.next(); event.setCommonEventHeader(CommonEventHeaderHandler.toCommonEventHeader(mappingConfiguration, hostIp, csv, recordMap, sequence)); diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/DefaultHttpRestClient.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/DefaultHttpRestClient.java index 2c0cab7..cbea02f 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/DefaultHttpRestClient.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/DefaultHttpRestClient.java @@ -34,7 +34,6 @@ import java.time.format.DateTimeFormatter; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.zip.ZipInputStream; -import org.apache.hc.client5.http.async.methods.SimpleHttpRequest; import org.apache.hc.client5.http.async.methods.SimpleHttpRequests; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; @@ -105,7 +104,7 @@ public final class DefaultHttpRestClient implements HttpRestClient { @Override public Single getTimeZone(final Adapter adapter) { try { - final ZoneId zoneId = zoneIdCache.get(adapter); + final var zoneId = zoneIdCache.get(adapter); final String offset = OFFSET_FORMATTER.format(zoneId.getRules().getOffset(Instant.now())); LOG.info("Adapter {} has offset {}", adapter.getHostIpAddress(), offset); return Single.just(zoneId); @@ -126,8 +125,7 @@ public final class DefaultHttpRestClient implements HttpRestClient { */ public Single get(final Adapter adapter, final String url) { return getToken(adapter).flatMap(token -> { - final SimpleHttpRequest request = - SimpleHttpRequests.get(HTTPS + adapter.getHostIpAddress() + url); + final var request = SimpleHttpRequests.get(HTTPS + adapter.getHostIpAddress() + url); request.addHeader(HttpHeaders.CONTENT_TYPE, APPLICATION_JSON_VALUE); request.addHeader(HttpHeaders.AUTHORIZATION, BEARER + token); return Single.fromFuture(client.execute(request, null)) diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/http/DownloadPerformanceManagementFilesHandler.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/http/DownloadPerformanceManagementFilesHandler.java index a9fae30..5a47591 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/http/DownloadPerformanceManagementFilesHandler.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/http/DownloadPerformanceManagementFilesHandler.java @@ -53,8 +53,8 @@ public final class DownloadPerformanceManagementFilesHandler { } private static Single validateGetZipFile(final Adapter adapter, final SimpleHttpResponse response) { - final String statusLine = new StatusLine(response).toString(); - final ContentType contentType = response.getContentType(); + final var statusLine = new StatusLine(response).toString(); + final var contentType = response.getContentType(); final SimpleBody entity = response.getBody(); if (response.getCode() == HttpStatus.SC_OK && entity != null && ContentType.APPLICATION_OCTET_STREAM .getMimeType().equals(contentType.getMimeType())) { diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/http/TokenHandler.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/http/TokenHandler.java index 26c62b5..a154d11 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/http/TokenHandler.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/http/TokenHandler.java @@ -8,7 +8,6 @@ import java.util.Base64; import java.util.concurrent.ExecutionException; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.hc.client5.http.async.methods.SimpleHttpRequest; import org.apache.hc.client5.http.async.methods.SimpleHttpRequests; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; @@ -31,15 +30,15 @@ public final class TokenHandler { public static synchronized String returnToken(final CloseableHttpAsyncClient client, final String tokenEndpoint, final Adapter adapter) throws ExecutionException, InterruptedException { final String host = HTTPS + adapter.getHostIpAddress(); - final SimpleHttpRequest request = SimpleHttpRequests.post(host + tokenEndpoint); - final String basicAuth = Base64.getEncoder().encodeToString( + final var request = SimpleHttpRequests.post(host + tokenEndpoint); + final var basicAuth = Base64.getEncoder().encodeToString( (adapter.getUsername() + ":" + adapter.getPassword()).getBytes(StandardCharsets.UTF_8)); request.setHeader(HttpHeaders.AUTHORIZATION, "Basic " + basicAuth); request.addHeader(HttpHeaders.CONTENT_TYPE, APPLICATION_JSON_VALUE); request.addHeader(HttpHeaders.ACCEPT, APPLICATION_JSON_VALUE); final SimpleHttpResponse response = client.execute(request, null).get(); - final String statusLine = new StatusLine(response).toString(); + final var statusLine = new StatusLine(response).toString(); if (response.getCode() != HttpStatus.SC_OK) { throw new TokenGenerationException("Failed to obtain a token for host " + host + ": " + statusLine); } diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpManagerImpl.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpManagerImpl.java index fdd7a7b..b3aa381 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpManagerImpl.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpManagerImpl.java @@ -33,8 +33,7 @@ public class SnmpManagerImpl implements AutoCloseable { */ public SnmpManagerImpl(final String host, final int port, final SnmpMapper mapper, final VesEventNotifier vesEventNotifier, final TimeZoneOffsetService timeZoneOffsetService) { - final SnmpTrapListener trapListener = - new SnmpTrapListener(host, port, mapper, vesEventNotifier, timeZoneOffsetService); + final var trapListener = new SnmpTrapListener(host, port, mapper, vesEventNotifier, timeZoneOffsetService); this.snmpThread = new Thread(trapListener, SNMP_MANAGER_THREAD); } diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpMappingConfigurationProvider.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpMappingConfigurationProvider.java index 9797e5c..1cd98be 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpMappingConfigurationProvider.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpMappingConfigurationProvider.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import java.io.IOException; import java.io.StringWriter; -import java.net.URI; import java.nio.file.Paths; import javax.annotation.PostConstruct; import org.apache.commons.configuration2.YAMLConfiguration; @@ -58,7 +57,7 @@ public class SnmpMappingConfigurationProvider { @PostConstruct public void init() throws IOException, ConfigurationException { requireNonNull(mappingFilePath); - final URI filePath = Paths.get(mappingFilePath).toUri(); + final var filePath = Paths.get(mappingFilePath).toUri(); builder = new ReloadingFileBasedConfigurationBuilder<>(YAMLConfiguration.class) .configure(new Parameters().hierarchical().setURL(filePath.toURL())); builder.addEventListener(ConfigurationBuilderEvent.CONFIGURATION_REQUEST, event -> { @@ -76,7 +75,7 @@ public class SnmpMappingConfigurationProvider { */ public VesMappingConfiguration getVesMappingConfiguration() throws ConfigurationException, IOException { final YAMLConfiguration configuration = builder.getConfiguration(); - final StringWriter output = new StringWriter(); + final var output = new StringWriter(); configuration.write(output); return YAML_READER.readValue(output.toString(), VesMappingConfiguration.class); } diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpTrapListener.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpTrapListener.java index eead114..a4b7bb0 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpTrapListener.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/SnmpTrapListener.java @@ -23,7 +23,6 @@ import com.google.gson.Gson; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.time.LocalDateTime; -import java.time.ZoneId; import java.util.Optional; import org.o.ran.oam.nf.oam.adopter.api.VesEventNotifier; import org.o.ran.oam.nf.oam.adopter.snmp.manager.api.TimeZoneOffsetService; @@ -34,7 +33,6 @@ import org.snmp4j.CommandResponder; import org.snmp4j.CommandResponderEvent; import org.snmp4j.MessageDispatcher; import org.snmp4j.MessageDispatcherImpl; -import org.snmp4j.PDU; import org.snmp4j.Snmp; import org.snmp4j.mp.MPv2c; import org.snmp4j.smi.UdpAddress; @@ -63,11 +61,10 @@ final class SnmpTrapListener implements CommandResponder, Runnable { @Override public synchronized void run() { - try (final DefaultUdpTransportMapping snmpTarget = new DefaultUdpTransportMapping( + try (final var snmpTarget = new DefaultUdpTransportMapping( new UdpAddress(hostPortAddress))) { - final ThreadPool threadPool = ThreadPool.create("SNMP_V2_Listener", THREADS_SIZE); - final MessageDispatcher dispatcher = - new MultiThreadedMessageDispatcher(threadPool, new MessageDispatcherImpl()); + final var threadPool = ThreadPool.create("SNMP_V2_Listener", THREADS_SIZE); + final var dispatcher = new MultiThreadedMessageDispatcher(threadPool, new MessageDispatcherImpl()); dispatcher.addMessageProcessingModel(new MPv2c()); listenSnmp(dispatcher, snmpTarget); } catch (final IOException e) { @@ -78,7 +75,7 @@ final class SnmpTrapListener implements CommandResponder, Runnable { @SuppressFBWarnings("WA_NOT_IN_LOOP") private synchronized void listenSnmp(final MessageDispatcher dispatcher, final DefaultUdpTransportMapping snmpTarget) { - try (final Snmp snmp = new Snmp(dispatcher, snmpTarget)) { + try (final var snmp = new Snmp(dispatcher, snmpTarget)) { snmp.addCommandResponder(this); snmpTarget.listen(); LOG.debug("Listening on {}", snmpTarget); @@ -95,14 +92,14 @@ final class SnmpTrapListener implements CommandResponder, Runnable { @Override public synchronized void processPdu(final CommandResponderEvent cmdRespEvent) { LOG.info("Received PDU"); - final PDU pdu = cmdRespEvent.getPDU(); + final var pdu = cmdRespEvent.getPDU(); if (pdu == null) { LOG.warn("Ignoring PDU."); return; } final UdpAddress address = (UdpAddress) cmdRespEvent.getPeerAddress(); - final ZoneId optZoneId = timeZoneOffsetService.getTimeZone(address.getInetAddress().getHostAddress()); + final var optZoneId = timeZoneOffsetService.getTimeZone(address.getInetAddress().getHostAddress()); final String timeZone = Optional.ofNullable(optZoneId) .map(zoneId -> "UTC" + LocalDateTime.now().atZone(zoneId).getOffset().toString()).orElse(null); diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/CommonEventHeaderHandler.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/CommonEventHeaderHandler.java index c2d052c..cd34be8 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/CommonEventHeaderHandler.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/CommonEventHeaderHandler.java @@ -39,7 +39,7 @@ final class CommonEventHeaderHandler { static CommonEventHeader toCommonEventHeader(final UdpAddress peerAddress, final VesMappingConfiguration vesMappingConfig, final TrapsMappingConfiguration mappingConfiguration, final PDU pdu, final String timeZone) { - final CommonEventHeader header = new CommonEventHeader(); + final var header = new CommonEventHeader(); setMandatoryFields(header, peerAddress, vesMappingConfig, mappingConfiguration, pdu); setOptionalFields(header, vesMappingConfig, mappingConfiguration, pdu, timeZone); return header; @@ -51,7 +51,7 @@ final class CommonEventHeaderHandler { header.setNfVendorName(vesMappingConfig.getNfVendorName()); final String oidEntityId = mappingConfiguration.getOidReportingEntityID(); if (oidEntityId != null) { - final Variable uuid = pdu.getVariable(new OID(oidEntityId)); + final var uuid = pdu.getVariable(new OID(oidEntityId)); header.setReportingEntityId(uuid == null ? null : uuid.toString()); } header.setNfNamingCode(null); //NOP @@ -76,7 +76,7 @@ final class CommonEventHeaderHandler { final String oidStartEpoch = mappingConfiguration.getEventStartEpochMicrosec(); if (oidStartEpoch != null) { - final Variable uuid = pdu.getVariable(new OID(oidStartEpoch)); + final var uuid = pdu.getVariable(new OID(oidStartEpoch)); header.setStartEpochMicrosec(uuid == null ? null : Long.valueOf(uuid.toString())); } else { header.setStartEpochMicrosec(System.currentTimeMillis()); @@ -84,7 +84,7 @@ final class CommonEventHeaderHandler { final String oidLastEpoch = mappingConfiguration.getEventLastEpochMicrosec(); if (oidLastEpoch != null) { - final Variable uuid = pdu.getVariable(new OID(oidLastEpoch)); + final var uuid = pdu.getVariable(new OID(oidLastEpoch)); header.setLastEpochMicrosec(uuid == null ? null : Long.valueOf(uuid.toString())); } else { header.setLastEpochMicrosec(System.currentTimeMillis()); @@ -95,7 +95,7 @@ final class CommonEventHeaderHandler { header.setSequence(extractEventSequence(mappingConfiguration, pdu)); final String oidSourceName = mappingConfiguration.getOidSourceName(); if (oidSourceName != null) { - final Variable sourceName = pdu.getVariable(new OID(oidSourceName)); + final var sourceName = pdu.getVariable(new OID(oidSourceName)); header.setSourceName(sourceName.toString()); } else { header.setSourceName(peerAddress.getInetAddress().getHostAddress()); diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/FaultFieldsHandler.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/FaultFieldsHandler.java index 600f503..acec2d8 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/FaultFieldsHandler.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/FaultFieldsHandler.java @@ -31,7 +31,6 @@ import org.o.ran.oam.nf.oam.adopter.api.FaultFields; import org.o.ran.oam.nf.oam.adopter.snmp.manager.pojos.TrapsMappingConfiguration; import org.snmp4j.PDU; import org.snmp4j.smi.OID; -import org.snmp4j.smi.Variable; import org.snmp4j.smi.VariableBinding; @NoArgsConstructor(access = AccessLevel.PRIVATE) @@ -40,7 +39,7 @@ final class FaultFieldsHandler { private static final String SNMP_UNKNOWN = "Unknown"; public static FaultFields toFaultFields(final TrapsMappingConfiguration trapsDescription, final PDU pdu) { - final FaultFields faultFields = new FaultFields(); + final var faultFields = new FaultFields(); setMandatoryFields(faultFields, trapsDescription, pdu); setOptionalFields(faultFields, trapsDescription, pdu); return faultFields; @@ -55,7 +54,7 @@ final class FaultFieldsHandler { final String descOid = trapsDescription.getOidSpecificProblemDesc(); faultFields.setSpecificProblem(SNMP_FAULT); if (descOid != null && !DEFAULT.equals(descOid)) { - final Variable desc = pdu.getVariable(new OID(descOid)); + final var desc = pdu.getVariable(new OID(descOid)); faultFields.setSpecificProblem(desc == null ? SNMP_FAULT : desc.toString()); } faultFields.setVfStatus(FaultFields.VfStatus.ACTIVE); @@ -70,7 +69,7 @@ final class FaultFieldsHandler { faultFields.setAlarmAdditionalInformation(map.isEmpty() ? null : map); final String interfaceOid = trapsDescription.getOidAlarmInterfaceName(); if (interfaceOid != null) { - final Variable desc = pdu.getVariable(new OID(interfaceOid)); + final var desc = pdu.getVariable(new OID(interfaceOid)); faultFields.setAlarmInterfaceA(desc == null ? SNMP_FAULT : desc.toString()); } final String eCategory = trapsDescription.getEventCategory(); diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/SnmpMapperImpl.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/SnmpMapperImpl.java index 901ac2f..b777d79 100644 --- a/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/SnmpMapperImpl.java +++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-snmp-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/snmp/manager/mapper/SnmpMapperImpl.java @@ -28,7 +28,6 @@ import org.o.ran.oam.nf.oam.adopter.api.CommonEventFormat302ONAP; import org.o.ran.oam.nf.oam.adopter.api.Event; import org.o.ran.oam.nf.oam.adopter.snmp.manager.SnmpMappingConfigurationProvider; import org.o.ran.oam.nf.oam.adopter.snmp.manager.pojos.TrapsMappingConfiguration; -import org.o.ran.oam.nf.oam.adopter.snmp.manager.pojos.VesMappingConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.snmp4j.PDU; @@ -60,10 +59,9 @@ public class SnmpMapperImpl implements SnmpMapper { } LOG.info("Starting Mapping of SNMP Event."); LOG.trace("Pdu received {}.", pdu); - final Event event = new Event(); - final String trapOidVariable = pdu.getVariable(SNMP_TRAP_OID).toString(); - final VesMappingConfiguration vesMappingConfig = - snmpMappingConfigurationProvider.getVesMappingConfiguration(); + final var event = new Event(); + final var trapOidVariable = pdu.getVariable(SNMP_TRAP_OID).toString(); + final var vesMappingConfig = snmpMappingConfigurationProvider.getVesMappingConfiguration(); final Map trapsDescriptions = vesMappingConfig.getTraps().stream() .collect(Collectors.toMap(TrapsMappingConfiguration::getOid, trapsDescription -> trapsDescription)); final TrapsMappingConfiguration trapsDescription = @@ -71,7 +69,7 @@ public class SnmpMapperImpl implements SnmpMapper { event.setCommonEventHeader(CommonEventHeaderHandler.toCommonEventHeader(peerAddress, vesMappingConfig, trapsDescription, pdu, timeZone)); event.setFaultFields(FaultFieldsHandler.toFaultFields(trapsDescription, pdu)); - final CommonEventFormat302ONAP eventFormat = new CommonEventFormat302ONAP(); + final var eventFormat = new CommonEventFormat302ONAP(); eventFormat.setEvent(event); eventFormat.setEventList(null); LOG.info("Mapping of SNMP Event type {} finished.", eventType); -- 2.16.6