X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=datafilecollector%2Fsrc%2Fmain%2Fjava%2Forg%2Foran%2Fdatafile%2Fdatastore%2FS3ObjectStore.java;h=5da27b0ddff540f263d7aefd4faf0d20a02b6d82;hb=5a2b5a8c4af4e390224db81fa546c780b7ab265c;hp=2581735af1eda9452b47b6be33ed7f0bb798951d;hpb=f0af18429aec79a590835103fedd753ee5ea93a9;p=nonrtric%2Fplt%2Franpm.git diff --git a/datafilecollector/src/main/java/org/oran/datafile/datastore/S3ObjectStore.java b/datafilecollector/src/main/java/org/oran/datafile/datastore/S3ObjectStore.java index 2581735..5da27b0 100644 --- a/datafilecollector/src/main/java/org/oran/datafile/datastore/S3ObjectStore.java +++ b/datafilecollector/src/main/java/org/oran/datafile/datastore/S3ObjectStore.java @@ -2,7 +2,7 @@ * ========================LICENSE_START================================= * O-RAN-SC * %% - * Copyright (C) 2021 Nordix Foundation + * Copyright (C) 2021-2023 Nordix Foundation * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -73,6 +73,12 @@ public class S3ObjectStore implements DataStore { getS3AsynchClient(applicationConfig); } + @SuppressWarnings({"java:S3010", "java:S2209"}) + public S3ObjectStore(AppConfig applicationConfig, S3AsyncClient s3AsynchClient) { + this.applicationConfig = applicationConfig; + this.s3AsynchClient = s3AsynchClient; + } + private static synchronized S3AsyncClient getS3AsynchClient(AppConfig applicationConfig) { if (applicationConfig.isS3Enabled() && s3AsynchClient == null) { s3AsynchClient = getS3AsyncClientBuilder(applicationConfig).build(); @@ -209,13 +215,9 @@ public class S3ObjectStore implements DataStore { oids.add(oid); } - Delete delete = Delete.builder() // - .objects(oids) // - .build(); - DeleteObjectsRequest request = DeleteObjectsRequest.builder() // .bucket(bucket(bucket)) // - .delete(delete) // + .delete(Delete.builder().objects(oids).build()) //NOSONAR .build(); CompletableFuture future = s3AsynchClient.deleteObjects(request);