Rename blacklist to blocklist

See e.g. https://twitter.com/leahculver/status/1269109776983547904

Author: ctrueden

src/main/java/org/scijava/plugin/DefaultPluginFinder.java

@@ -53,7 +53,7 @@ public class DefaultPluginFinder implements PluginFinder {
 	/** Class loader to use when querying the annotation indexes. */
 	private final ClassLoader customClassLoader;
 
-	private final PluginBlacklist blacklist;
+	private final PluginBlocklist blocklist;
 
 	// -- Constructors --
 
@@ -63,7 +63,7 @@ public DefaultPluginFinder() {
 
 	public DefaultPluginFinder(final ClassLoader classLoader) {
 		customClassLoader = classLoader;
-		blacklist = new SysPropBlacklist();
+		blocklist = new SysPropBlocklist();
 	}
 
 	// -- PluginFinder methods --
@@ -82,7 +82,7 @@ public HashMap<String, Throwable> findPlugins(
 
 		// create a PluginInfo object for each item in the index
 		for (final IndexItem<Plugin> item : annotationIndex) {
-			if (blacklist.contains(item.className())) continue;
+			if (blocklist.contains(item.className())) continue;
 			try {
 				final PluginInfo<?> info = createInfo(item, classLoader);
 				plugins.add(info);
@@ -117,23 +117,23 @@ private ClassLoader getClassLoader() {
 
 	// -- Helper classes --
 
-	private interface PluginBlacklist {
+	private interface PluginBlocklist {
 		boolean contains(String className);
 	}
 
 	/**
-	 * A blacklist defined by the {@code scijava.plugin.blacklist} system
+	 * A blocklist defined by the {@code scijava.plugin.blocklist} system
 	 * property, formatted as a colon-separated list of regexes.
 	 * <p>
 	 * If a plugin class matches any of the regexes, it is excluded from the
 	 * plugin index.
 	 * </p>
 	 */
-	private class SysPropBlacklist implements PluginBlacklist {
+	private class SysPropBlocklist implements PluginBlocklist {
 		private final List<Pattern> patterns;
 
-		public SysPropBlacklist() {
-			final String sysProp = System.getProperty("scijava.plugin.blacklist");
+		public SysPropBlocklist() {
+			final String sysProp = System.getProperty("scijava.plugin.blocklist");
 			final String[] regexes = //
 				sysProp == null ? new String[0] : sysProp.split(":");
 			patterns = new ArrayList<>(regexes.length);
@@ -147,7 +147,7 @@ public SysPropBlacklist() {
 			}
 		}
 
-		// -- PluginBlacklist methods --
+		// -- PluginBlocklist methods --
 
 		@Override
 		public boolean contains(final String className) {

src/test/java/org/scijava/plugin/PluginFinderTest.java

@@ -43,33 +43,33 @@
 public class PluginFinderTest {
 
 	/**
-	 * Tests that the {@code scijava.plugin.blacklist} system property works to
+	 * Tests that the {@code scijava.plugin.blocklist} system property works to
 	 * exclude plugins from the index, even when they are on the classpath.
 	 */
 	@Test
-	public void testPluginBlacklistSystemProperty() {
+	public void testPluginBlocklistSystemProperty() {
 		// check that the plugin is there, normally
 		Context context = new Context(PluginService.class);
 		PluginService pluginService = context.service(PluginService.class);
 		PluginInfo<SciJavaPlugin> plugin = //
-			pluginService.getPlugin(BlacklistedPlugin.class);
-		assertSame(BlacklistedPlugin.class.getName(), plugin.getClassName());
+			pluginService.getPlugin(BlocklistedPlugin.class);
+		assertSame(BlocklistedPlugin.class.getName(), plugin.getClassName());
 		context.dispose();
 
-		// blacklist the plugin, then check that it is absent
-		System.setProperty("scijava.plugin.blacklist", ".*BlacklistedPlugin");
+		// blocklist the plugin, then check that it is absent
+		System.setProperty("scijava.plugin.blocklist", ".*BlocklistedPlugin");
 		context = new Context(PluginService.class);
 		pluginService = context.service(PluginService.class);
-		plugin = pluginService.getPlugin(BlacklistedPlugin.class);
+		plugin = pluginService.getPlugin(BlocklistedPlugin.class);
 		assertNull(plugin);
 		context.dispose();
 
 		// reset the system
-		System.getProperties().remove("scijava.plugin.blacklist");
+		System.getProperties().remove("scijava.plugin.blocklist");
 	}
 
 	@Plugin(type = SciJavaPlugin.class)
-	public static class BlacklistedPlugin implements SciJavaPlugin {
+	public static class BlocklistedPlugin implements SciJavaPlugin {
 		// NB: No implementation needed.
 	}