refactor: rename to MetadataBlockList

ICIJ · Sep 29, 2023 · d3bf52f · d3bf52f
1 parent 884dcab
commit d3bf52f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/...va/org/icij/spewer/MetadataBlacklist.java → ...va/org/icij/spewer/MetadataBlockList.java b/...va/org/icij/spewer/MetadataBlacklist.java → ...va/org/icij/spewer/MetadataBlockList.java
@@ -2,23 2,22 @@
 
 import java.io.IOException;
 import java.net.URL;
-import java.nio.charset.Charset;
 import java.nio.file.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 
-public class MetadataBlacklist {
- static final String METADATA_BLACKLIST_FILE = "/metadata_blacklist";
- private final List<String> blacklist;
 public class MetadataBlockList {
  static final String METADATA_BLOCK_LIST_FILE = "/metadata_block_list";
  private final List<String> list;
 
- public MetadataBlacklist() {
- blacklist = load(getClass().getResource(METADATA_BLACKLIST_FILE));
  public MetadataBlockList() {
  list = load(getClass().getResource(METADATA_BLOCK_LIST_FILE));
  }
 
  public Boolean ok(String value) {
- return blacklist.stream().allMatch(pattern -> {
  return list.stream().allMatch(pattern -> {
  String globPattern = "glob:" pattern;
  return ok(value, globPattern);
  });

diff --git a/extract-lib/src/main/java/org/icij/spewer/MetadataTransformer.java b/extract-lib/src/main/java/org/icij/spewer/MetadataTransformer.java
@@ -4,7 4,6 @@
 import org.apache.tika.metadata.*;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.Serializable;
 
 import java.time.Instant;
@@ -65,7 64,7 @@ public class MetadataTransformer implements Serializable {
  private final Metadata metadata;
  private final FieldNames fields;
  private final Map<String, String> fieldMap = new HashMap<>();
- private final MetadataBlacklist metadata_blacklist = new MetadataBlacklist();
  private final MetadataBlockList metadata_block_list = new MetadataBlockList();
 
  public MetadataTransformer(final Metadata metadata, final FieldNames fields) {
  this.metadata = metadata;
@@ -85,8 84,8 @@ public void transform(final ValueConsumer single, final ValueArrayConsumer multi
  continue;
  }
 
- // The field name might be blacklisted
- if (!metadata_blacklist.ok(name)) {
  // The field name might be blocked
  if (!metadata_block_list.ok(name)) {
  continue;
  }
 

diff --git a/...lib/src/main/resources/metadata_blacklist → ...ib/src/main/resources/metadata_block_list b/...lib/src/main/resources/metadata_blacklist → ...ib/src/main/resources/metadata_block_list
diff --git a/extract-lib/src/test/java/org/icij/extract/spewer/SpewerTest.java b/extract-lib/src/test/java/org/icij/extract/spewer/SpewerTest.java
@@ -92,14 92,14 @@ public void testWritesISO8601Dates() throws IOException {
  }
 
  @Test
- public void testSpewDocumentWithoutBlacklistedMetadata() throws IOException {
  public void testSpewDocumentWithoutBlockedMetadata() throws IOException {
  final SpewerStub spewer = new SpewerStub();
  final TikaDocument tikaDocument = factory.create("test.txt");
  final Metadata metadata = tikaDocument.getMetadata();
  metadata.set("bar", "bar");
  metadata.set("unknown_tag_0x", "foo");
  spewer.writeMetadata(tikaDocument);
- // Those value should not be blacklisted
  // Those value should not be blocked
  Assert.assertEquals(spewer.metadata.get("tika_metadata_resourcename"), "test.txt");
  Assert.assertEquals(spewer.metadata.get("tika_metadata_bar"), "bar");
  // But this one should

diff --git a/...rg/icij/spewer/MetadataBlacklistTest.java → ...rg/icij/spewer/MetadataBlockListTest.java b/...rg/icij/spewer/MetadataBlacklistTest.java → ...rg/icij/spewer/MetadataBlockListTest.java
@@ -3,24 3,24 @@
 import org.junit.Test;
 import static org.fest.assertions.Assertions.assertThat;
 
-public class MetadataBlacklistTest {
 public class MetadataBlockListTest {
 
- MetadataBlacklist metadataBlacklist = new MetadataBlacklist();
  MetadataBlockList metadataBlockList = new MetadataBlockList();
 
  @Test
  public void test_given_metadata_dcterms_is_ok() {
- assertThat(metadataBlacklist.ok("tika_metadata_dcterms_created")).isTrue();
  assertThat(metadataBlockList.ok("tika_metadata_dcterms_created")).isTrue();
  }
 
  @Test
  public void test_given_metadata_unknown_tags_are_not_ok() {
- assertThat(metadataBlacklist.ok("tika_metadata_unknown_tag_0x")).isFalse();
- assertThat(metadataBlacklist.ok("tika_metadata_unknown_tag_foo")).isFalse();
- assertThat(metadataBlacklist.ok("tika_metadata_unknown_tag_bar")).isFalse();
  assertThat(metadataBlockList.ok("tika_metadata_unknown_tag_0x")).isFalse();
  assertThat(metadataBlockList.ok("tika_metadata_unknown_tag_foo")).isFalse();
  assertThat(metadataBlockList.ok("tika_metadata_unknown_tag_bar")).isFalse();
  }
 
  @Test
  public void test_given_range_is_not_ok() {
- assertThat(metadataBlacklist.ok("foo_1", "glob:foo_[123456789]")).isFalse();
  assertThat(metadataBlockList.ok("foo_1", "glob:foo_[123456789]")).isFalse();
  }
 }