hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-13 21:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-4440 GDPR - Anonymize statistics feature - feedback: default configuration & spelling

Browse Source
This commit is contained in:
Samuel
2020-04-09 14:52:51 +02:00
committed by Samuel
parent 10f38d3fe5
commit d71472fcc3
4 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dspace-api/src/main/java/org/dspace/statistics/AnonymizeStatistics.java
View File

@@ -51,7 +51,7 @@ public class AnonymizeStatistics {
private static Logger log = getLogger(AnonymizeStatistics.class);
private static Context context = new Context();
private static String action = "anonymise_statistics";
private static String action = "anonymize_statistics";
private static final String HELP_OPTION = "h";
private static final String SLEEP_OPTION = "s";
@@ -68,14 +68,14 @@ public class AnonymizeStatistics {
private static int batchSize = 100;
private static int threads = 2;
private static final Object ANONYMISED =
configurationService.getProperty("anonymise_statistics.dns_mask", "anonymised");
private static final Object ANONYMIZE =
configurationService.getProperty("anonymize_statistics.dns_mask", "anonymized");
private static final String TIME_LIMIT;
static {
Calendar calendar = Calendar.getInstance();
calendar.add(DAY_OF_YEAR, -configurationService.getIntProperty("anonymise_statistics.time_limit", 90));
calendar.add(DAY_OF_YEAR, -configurationService.getIntProperty("anonymize_statistics.time_threshold", 90));
TIME_LIMIT = format(calendar, DATE_FORMAT_8601);
}
@@ -87,7 +87,7 @@ public class AnonymizeStatistics {
public static void main(String... args) throws ParseException {
parseCommandLineOptions(createCommandLineOptions(), args);
anonymiseStatistics();
anonymizeStatistics();
}
private static Options createCommandLineOptions() {
@@ -170,7 +170,7 @@ public class AnonymizeStatistics {
}
private static void anonymiseStatistics() {
private static void anonymizeStatistics() {
try {
long updated = 0;
long total = getDocuments().getResults().getNumFound();
@@ -233,7 +233,7 @@ public class AnonymizeStatistics {
return solrLoggerService.query(
"ip:*",
"time:[* TO " + TIME_LIMIT + "] AND -dns:" + ANONYMISED,
"time:[* TO " + TIME_LIMIT + "] AND -dns:" + ANONYMIZE,
null, batchSize, -1, null, null, null, null, null, false, false, true
);
}
@@ -258,8 +258,8 @@ public class AnonymizeStatistics {
"dns"
),
asList(
singletonList(solrLoggerService.anonymiseIp(document.getFieldValue("ip").toString())),
singletonList(ANONYMISED)
singletonList(solrLoggerService.anonymizeIp(document.getFieldValue("ip").toString())),
singletonList(ANONYMIZE)
),
false
);