Fix Sonar complains

[oam/nf-oam-adopter.git] / ves-nf-oam-adopter / ves-nf-oam-adopter-snmp-manager / src / main / java / org / o / ran / oam / nf / oam / adopter / snmp / manager / SnmpMappingConfigurationProvider.java

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 1cd98be..54b92e8 100644 (file)
--- 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
@@ -19,22 +19,8 @@
 
 package org.o.ran.oam.nf.oam.adopter.snmp.manager;
 
-import static java.util.Objects.requireNonNull;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.file.Paths;
-import javax.annotation.PostConstruct;
-import org.apache.commons.configuration2.YAMLConfiguration;
-import org.apache.commons.configuration2.builder.ConfigurationBuilderEvent;
-import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder;
-import org.apache.commons.configuration2.builder.fluent.Parameters;
-import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.o.ran.oam.nf.oam.adopter.snmp.manager.pojos.VesMappingConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.o.ran.oam.nf.oam.adopter.spi.MapperConfigProvider;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -42,41 +28,18 @@ import org.springframework.stereotype.Service;
  * Reads and listens for changes on snmp mapping configuration.
  */
 @Service
-public class SnmpMappingConfigurationProvider {
-    private static final Logger LOG = LoggerFactory.getLogger(SnmpMappingConfigurationProvider.class);
+public class SnmpMappingConfigurationProvider extends MapperConfigProvider<VesMappingConfiguration> {
 
-    private static final ObjectMapper YAML_READER = new ObjectMapper(new YAMLFactory());
     @Value("${snmp-manager.mapping-config-path:#{null}}")
     private String mappingFilePath;
-    private ReloadingFileBasedConfigurationBuilder<YAMLConfiguration> builder;
 
-    /**
-     * Initialize service.
-     * @throws IOException on error
-     */
-    @PostConstruct
-    public void init() throws IOException, ConfigurationException {
-        requireNonNull(mappingFilePath);
-        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 -> {
-            builder.getReloadingController().checkForReloading(null);
-            LOG.info("Reloading {}", filePath);
-        });
-        //Test initial configuration
-        builder.getConfiguration();
+    @Override
+    public String getMappingFilePath() {
+        return mappingFilePath;
     }
 
-    /**
-     * Reads VesMappingConfiguration from yaml file.
-     *
-     * @return Ves Mapping Configuration
-     */
-    public VesMappingConfiguration getVesMappingConfiguration() throws ConfigurationException, IOException {
-        final YAMLConfiguration configuration = builder.getConfiguration();
-        final var output = new StringWriter();
-        configuration.write(output);
-        return YAML_READER.readValue(output.toString(), VesMappingConfiguration.class);
+    @Override
+    public Class<VesMappingConfiguration> getClazz() {
+        return VesMappingConfiguration.class;
     }
 }