X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=datafilecollector%2Fsrc%2Fmain%2Fjava%2Forg%2Foran%2Fdatafile%2Ftasks%2FFileCollector.java;h=999d2e89ceb9cd0b8b26948d22e603d544637b6a;hb=HEAD;hp=26c3df6ad04051579e8f16a973b34d148e9c9b1b;hpb=d806dbef4f43bb9c631c818e96c1a39e440c5e6c;p=nonrtric%2Fplt%2Franpm.git 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 26c3df6..999d2e8 100644 --- a/datafilecollector/src/main/java/org/oran/datafile/tasks/FileCollector.java +++ b/datafilecollector/src/main/java/org/oran/datafile/tasks/FileCollector.java @@ -38,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; @@ -52,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; } /** @@ -166,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); @@ -175,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()); } }