CI: Add SonarCloud scan GHA workflow

[nonrtric/plt/ranpm.git] / datafilecollector / src / main / java / org / oran / datafile / tasks / FileCollector.java

diff --git a/datafilecollector/src/main/java/org/oran/datafile/tasks/FileCollector.java b/datafilecollector/src/main/java/org/oran/datafile/tasks/FileCollector.java
index 812e5b0..999d2e8 100644 (file)
--- a/datafilecollector/src/main/java/org/oran/datafile/tasks/FileCollector.java
+++ b/datafilecollector/src/main/java/org/oran/datafile/tasks/FileCollector.java
@@ -24,7 +24,6 @@ import java.time.Duration;
 import java.util.Optional;
 
 import org.oran.datafile.commons.FileCollectClient;
-import org.oran.datafile.commons.Scheme;
 import org.oran.datafile.configuration.AppConfig;
 import org.oran.datafile.configuration.CertificateConfig;
 import org.oran.datafile.exceptions.DatafileTaskException;
@@ -39,6 +38,7 @@ import org.oran.datafile.model.Counters;
 import org.oran.datafile.model.FileData;
 import org.oran.datafile.model.FilePublishInformation;
 import org.oran.datafile.model.FileReadyMessage;
+import org.oran.datafile.oauth2.SecurityContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,15 +53,17 @@ public class FileCollector {
     private static final Logger logger = LoggerFactory.getLogger(FileCollector.class);
     private final AppConfig appConfig;
     private final Counters counters;
+    private final SecurityContext securityContext;
 
     /**
      * Constructor.
      *
      * @param appConfig application configuration
      */
-    public FileCollector(AppConfig appConfig, Counters counters) {
+    public FileCollector(SecurityContext securityContext, AppConfig appConfig, Counters counters) {
         this.appConfig = appConfig;
         this.counters = counters;
+        this.securityContext = securityContext;
     }
 
     /**
@@ -123,7 +125,7 @@ public class FileCollector {
     }
 
     private void incFailedAttemptsCounter(FileData fileData) {
-        if (Scheme.isFtpScheme(fileData.scheme())) {
+        if (FileData.Scheme.isFtpScheme(fileData.scheme())) {
             counters.incNoOfFailedFtpAttempts();
         } else {
             counters.incNoOfFailedHttpAttempts();
@@ -167,7 +169,7 @@ public class FileCollector {
         return new SftpClient(fileData.fileServerData(), new SftpClientSettings(appConfig.getSftpConfiguration()));
     }
 
-    protected FtpesClient createFtpesClient(FileData fileData) throws DatafileTaskException {
+    protected FtpesClient createFtpesClient(FileData fileData) {
         CertificateConfig config = appConfig.getCertificateConfiguration();
         Path trustedCa = config.trustedCa.isEmpty() ? null : Paths.get(config.trustedCa);
 
@@ -176,10 +178,11 @@ public class FileCollector {
     }
 
     protected FileCollectClient createHttpClient(FileData fileData) {
-        return new DfcHttpClient(fileData.fileServerData());
+        return new DfcHttpClient(securityContext, fileData.fileServerData());
     }
 
     protected FileCollectClient createHttpsClient(FileData fileData) throws DatafileTaskException {
-        return new DfcHttpsClient(fileData.fileServerData(), HttpsClientConnectionManagerUtil.instance());
+        return new DfcHttpsClient(securityContext, fileData.fileServerData(),
+            HttpsClientConnectionManagerUtil.instance());
     }
 }