commit 8c7bccbd973ee287e18cd2d467f3161d90d02782
author Gal Paikin <paiking@google.com> Tue Mar 30 14:29:21 2021 +0200
committer Gal Paikin <paiking@google.com> Tue Mar 30 14:29:21 2021 +0200
tree e21ead7dd1fb23aeeb7ee93079ea8b53ee82d73f
parent a0f3b4e6277c607b373986c3471c9f281cab7bbc

Replace whitelist/blacklist usage for allowlist/forbidden

Bug: Issue 13014
Change-Id: I3f87787c523784090267084c67576cfc69ad689e

src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditRendererToJson.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditRendererToJson.java b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditRendererToJson.java
index 2c4133b..59c0763 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditRendererToJson.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditRendererToJson.java
@@ -34,9 +34,9 @@
 import java.util.Optional;
 
 public class AuditRendererToJson implements AuditFormatRenderer {
-  private final ExclusionStrategy INCLUDE_ONLY_WHITELISTED =
+  private final ExclusionStrategy INCLUDE_ONLY_ALLOWED =
       new ExclusionStrategy() {
-        private final HashSet<Class<?>> WHITELIST_CLASSES =
+        private final HashSet<Class<?>> ALLOWLIST_CLASSES =
             new HashSet<>(
                 Arrays.asList(
                     String.class,
@@ -50,12 +50,12 @@
                     CurrentUser.PropertyKey.class,
                     Account.Id.class,
                     AuditRecord.class));
-        private final HashSet<String> BLACKLIST_FIELDS =
+        private final HashSet<String> FORBIDDEN_FIELDS =
             new HashSet<>(Arrays.asList("anonymousCowardName"));
 
         @Override
         public boolean shouldSkipField(FieldAttributes f) {
-          return BLACKLIST_FIELDS.contains(f.getName());
+          return FORBIDDEN_FIELDS.contains(f.getName());
         }
 
         @Override
@@ -65,7 +65,7 @@
               && !ListMultimap.class.isAssignableFrom(clazz)
               && !AuditEvent.UUID.class.isAssignableFrom(clazz)
               && !Response.class.isAssignableFrom(clazz)
-              && !WHITELIST_CLASSES.contains(clazz);
+              && !ALLOWLIST_CLASSES.contains(clazz);
         }
       };
 
@@ -94,7 +94,7 @@
   private final Gson gson =
       OutputFormat.JSON_COMPACT
           .newGsonBuilder()
-          .setExclusionStrategies(INCLUDE_ONLY_WHITELISTED)
+          .setExclusionStrategies(INCLUDE_ONLY_ALLOWED)
           .registerTypeAdapter(CurrentUser.class, CURRENT_USER_SERIALIZER)
           .create();