michal.politowski
/
UrlsController
forked from lsmyrnaios/UrlsController
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' of https://code-repo.d4science.org/antonis.lempesis/UrlsController

This commit is contained in:
Antonis Lempesis 2022-01-31 13:49:34 +02:00
parent 3da6fd98e9 1c82088a7c
commit 0772e9cdfb
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/openaire/urls_controller/configuration/ImpalaConnector.java
View File

@ -19,9 +19,9 @@ public final class ImpalaConnector {
@Autowired @Autowired
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Value("services.pdfaggregation.controller.db.oldDatabaseName:pdfaggregation_i") @Value("${services.pdfaggregation.controller.db.oldDatabaseName}:pdfaggregation_i")
public static String oldDatabaseName; public static String oldDatabaseName;
@Value("services.pdfaggregation.controller.db.databaseName:pdfAggregationDatabase") @Value("${services.pdfaggregation.controller.db.databaseName}:pdfAggregationDatabase")
public static String databaseName; public static String databaseName;
public static final Lock databaseLock = new ReentrantLock(true); // This lock is locking the threads trying to execute queries in the database. public static final Lock databaseLock = new ReentrantLock(true); // This lock is locking the threads trying to execute queries in the database.

2
src/main/java/eu/openaire/urls_controller/controllers/TestController.java
View File

@ -28,7 +28,7 @@ public class TestController extends GeneralController {
@Autowired @Autowired
private TestFileUtils fileUtils; private TestFileUtils fileUtils;
@Value("services.pdfaggregation.controller.assignmentLimit") @Value("${services.pdfaggregation.controller.assignmentLimit}")
private int assignmentLimit; private int assignmentLimit;
private static final AtomicLong assignmentsBatchCounter = new AtomicLong(0); // Just for the "getTestUrls"-endpoint. private static final AtomicLong assignmentsBatchCounter = new AtomicLong(0); // Just for the "getTestUrls"-endpoint.

4
src/main/java/eu/openaire/urls_controller/controllers/UrlController.java
View File

@ -38,10 +38,10 @@ public class UrlController {
private static final AtomicLong assignmentsBatchCounter = new AtomicLong(0); // Just for the "getTestUrls"-endpoint. private static final AtomicLong assignmentsBatchCounter = new AtomicLong(0); // Just for the "getTestUrls"-endpoint.
private static final Pattern MALICIOUS_INPUT_STRING = Pattern.compile(".*[';`\"]+.*"); private static final Pattern MALICIOUS_INPUT_STRING = Pattern.compile(".*[';`\"]+.*");
@Value("services.pdfaggregation.controller.maxAttemptsPerRecord") @Value("${services.pdfaggregation.controller.maxAttemptsPerRecord}")
private int maxAttemptsPerRecord; private int maxAttemptsPerRecord;
@Value("services.pdfaggregation.controller.assignmentLimit") @Value("${services.pdfaggregation.controller.assignmentLimit}")
private int assignmentLimit; private int assignmentLimit;
@GetMapping("") @GetMapping("")

14
src/main/java/eu/openaire/urls_controller/util/S3ObjectStore.java
View File

@ -19,20 +19,20 @@ public class S3ObjectStore {
private static final Logger logger = LoggerFactory.getLogger(S3ObjectStore.class); private static final Logger logger = LoggerFactory.getLogger(S3ObjectStore.class);
private String s3Protocol = "s3://"; private String s3Protocol = "s3://";
@Value("services.pdfaggregation.controller.s3.endpoint") @Value("${services.pdfaggregation.controller.s3.endpoint}")
private String endpoint = null; // This is useful to be "public", to test file-locations. private String endpoint = null; // This is useful to be "public", to test file-locations.
@Value("services.pdfaggregation.controller.s3.accessKey") @Value("${services.pdfaggregation.controller.s3.accessKey}")
private String accessKey = null; private String accessKey = null;
@Value("services.pdfaggregation.controller.s3.secretKey") @Value("${services.pdfaggregation.controller.s3.secretKey}")
private String secretKey = null; private String secretKey = null;
@Value("services.pdfaggregation.controller.s3.region") @Value("${services.pdfaggregation.controller.s3.region}")
private String region = null; private String region = null;
@Value("services.pdfaggregation.controller.s3.bucketName") @Value("${services.pdfaggregation.controller.s3.bucketName}")
private String bucketName = null; private String bucketName = null;
@Value("services.pdfaggregation.controller.s3.shouldEmptyBucket") @Value("${services.pdfaggregation.controller.s3.shouldEmptyBucket}")
private boolean shouldEmptyBucket = false; // Set true only for testing! private boolean shouldEmptyBucket = false; // Set true only for testing!
@Value("services.pdfaggregation.controller.s3.shouldShowAllS3Buckets") @Value("${services.pdfaggregation.controller.s3.shouldShowAllS3Buckets}")
private boolean shouldShowAllS3Buckets = false; private boolean shouldShowAllS3Buckets = false;
private MinioClient minioClient; private MinioClient minioClient;