Added support for using oauth token for Kafka

[nonrtric/plt/ranpm.git] / datafilecollector / src / main / java / org / oran / datafile / datastore / FileStore.java

diff --git a/datafilecollector/src/main/java/org/onap/dcaegen2/collectors/datafile/datastore/FileStore.java b/datafilecollector/src/main/java/org/oran/datafile/datastore/FileStore.java
similarity index 88%
rename from datafilecollector/src/main/java/org/onap/dcaegen2/collectors/datafile/datastore/FileStore.java
rename to datafilecollector/src/main/java/org/oran/datafile/datastore/FileStore.java
index 7f497be..a8408a8 100644 (file)
--- a/datafilecollector/src/main/java/org/onap/dcaegen2/collectors/datafile/datastore/FileStore.java
+++ b/datafilecollector/src/main/java/org/oran/datafile/datastore/FileStore.java
@@ -18,7 +18,7 @@
  * ========================LICENSE_END===================================
  */
 
-package org.onap.dcaegen2.collectors.datafile.datastore;
+package org.oran.datafile.datastore;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
 
-import org.onap.dcaegen2.collectors.datafile.configuration.AppConfig;
+import org.oran.datafile.configuration.AppConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.FileSystemUtils;
@@ -40,15 +40,15 @@ import reactor.core.publisher.Mono;
 public class FileStore implements DataStore {
     private static final Logger logger = LoggerFactory.getLogger(java.lang.invoke.MethodHandles.lookup().lookupClass());
 
-    AppConfig applicationConfig;
+    AppConfig appConfig;
 
     public FileStore(AppConfig applicationConfig) {
-        this.applicationConfig = applicationConfig;
+        this.appConfig = applicationConfig;
     }
 
     @Override
     public Flux<String> listObjects(Bucket bucket, String prefix) {
-        Path root = Path.of(applicationConfig.collectedFilesPath, prefix);
+        Path root = Path.of(appConfig.getCollectedFilesPath(), prefix);
         if (!root.toFile().exists()) {
             root = root.getParent();
         }
@@ -76,7 +76,7 @@ public class FileStore implements DataStore {
 
     private String externalName(Path path) {
         String fullName = path.toString();
-        String externalName = fullName.substring(applicationConfig.collectedFilesPath.length());
+        String externalName = fullName.substring(appConfig.getCollectedFilesPath().length());
         if (externalName.startsWith("/")) {
             externalName = externalName.substring(1);
         }
@@ -139,7 +139,7 @@ public class FileStore implements DataStore {
     }
 
     private Path path(String name) {
-        return Path.of(applicationConfig.collectedFilesPath, name);
+        return Path.of(appConfig.getCollectedFilesPath(), name);
     }
 
     public Mono<Boolean> fileExists(Bucket bucket, String key) {
@@ -149,9 +149,9 @@ public class FileStore implements DataStore {
     @Override
     public Mono<String> deleteBucket(Bucket bucket) {
         try {
-            FileSystemUtils.deleteRecursively(Path.of(applicationConfig.collectedFilesPath));
+            FileSystemUtils.deleteRecursively(Path.of(appConfig.getCollectedFilesPath()));
         } catch (IOException e) {
-            logger.debug("Could not delete directory: {}, reason; {}", applicationConfig.collectedFilesPath,
+            logger.debug("Could not delete directory: {}, reason; {}", appConfig.getCollectedFilesPath(),
                 e.getMessage());
         }
         return Mono.just("OK");