remove deprecation support code

zendesk · Jan 31, 2022 · 929db4d · 929db4d
1 parent 558cfbd
commit 929db4d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 107 deletions.
diff --git a/src/main/java/com/zendesk/maxwell/filtering/Filter.java b/src/main/java/com/zendesk/maxwell/filtering/Filter.java
@@ -145,67 +145,4 @@ public static boolean couldIncludeFromColumnFilters(Filter filter, String databa
 			return filter.couldIncludeFromColumnFilters(database, table, columnNames);
 		}
 	}
-
-	public static Filter fromOldFormat(
-		String maxwellDB,
-		String includeDatabases,
-		String excludeDatabases,
-		String includeTables,
-		String excludeTables,
-		String blacklistDatabases,
-		String blacklistTables,
-		String includeValues
-	) throws InvalidFilterException {
-		ArrayList<String> filterRules = new ArrayList<>();
-
-		if ( blacklistDatabases != null ) {
-			for ( String s : blacklistDatabases.split(",") )
-				filterRules.add("blacklist: " + s + ".*");
-		}
-
-		if ( blacklistTables != null ) {
-			for (String s : blacklistTables.split(","))
-				filterRules.add("blacklist: *." + s);
-		}
-
-		/* any include in old-filters is actually exclude *.* */
-		if ( includeDatabases != null || includeTables != null ) {
-			filterRules.add("exclude: *.*");
-		}
-
-		if ( includeDatabases != null ) {
-			for ( String s : includeDatabases.split(",") )
-				filterRules.add("include: " + s + ".*");
-
-		}
-
-		if ( excludeDatabases != null ) {
-			for (String s : excludeDatabases.split(","))
-				filterRules.add("exclude: " + s + ".*");
-		}
-
-		if ( includeTables != null ) {
-			for ( String s : includeTables.split(",") )
-				filterRules.add("include: *." + s);
-		}
-
-		if ( excludeTables != null ) {
-			for ( String s : excludeTables.split(",") )
-				filterRules.add("exclude: *." + s);
-		}
-
-		if (includeValues != null && !"".equals(includeValues)) {
-			for (String s : includeValues.split(",")) {
-				String[] columnAndValue = s.split("=");
-				filterRules.add("exclude: *.*." + columnAndValue[0] + "=*");
-				filterRules.add("include: *.*." + columnAndValue[0] + "=" + columnAndValue[1]);
-			}
-		}
-
-		String filterRulesAsString = String.join(", ", filterRules);
-		LOGGER.warn("using exclude/include/includeColumns is deprecated.  Please update your configuration to use: ");
-		LOGGER.warn("filter = \"" + filterRulesAsString + "\"");
-
-		return new Filter(maxwellDB, filterRulesAsString);
-	}
 }
diff --git a/src/test/java/com/zendesk/maxwell/filtering/FilterTest.java b/src/test/java/com/zendesk/maxwell/filtering/FilterTest.java
@@ -159,49 +159,5 @@ public void TestEmptyToString() throws Exception {
 		Filter f = new Filter("");
 		assertEquals(f.toString(), "");
 	}
-
-	@Test
-	public void TestOldFiltersExcludeDB() throws Exception {
-		Filter f = Filter.fromOldFormat("maxwell", null, "foo, /bar/", null, null, null, null, null);
-		List<FilterPattern> rules = f.getRules();
-		assertEquals(2, rules.size());
-		assertEquals("exclude: foo.*", rules.get(0).toString());
-		assertEquals("exclude: /bar/.*", rules.get(1).toString());
-	}
-
-	@Test
-	public void TestOldFiltersIncludeDB() throws Exception {
-		Filter f = Filter.fromOldFormat("maxwell", "foo", null, null, null, null, null, null);
-		List<FilterPattern> rules = f.getRules();
-		assertEquals(2, rules.size());
-		assertEquals("exclude: *.*", rules.get(0).toString());
-		assertEquals("include: foo.*", rules.get(1).toString());
-	}
-
-	@Test
-	public void TestOldFiltersExcludeTable() throws Exception {
-		Filter f = Filter.fromOldFormat("maxwell", null, null, null, "tbl", null, null, null);
-		List<FilterPattern> rules = f.getRules();
-		assertEquals(1, rules.size());
-		assertEquals("exclude: *.tbl", rules.get(0).toString());
-	}
-
-	@Test
-	public void TestOldFiltersIncludeTable() throws Exception {
-		Filter f = Filter.fromOldFormat("maxwell", null, null, "/foo.*bar/", null, null, null, null);
-		List<FilterPattern> rules = f.getRules();
-		assertEquals(2, rules.size());
-		assertEquals("exclude: *.*", rules.get(0).toString());
-		assertEquals("include: *./foo.*bar/", rules.get(1).toString());
-	}
-
-	@Test
-	public void TestOldFiltersIncludeColumnValues() throws Exception {
-		Filter f = Filter.fromOldFormat("maxwell", null, null, null, null, null, null, "foo=bar");
-		List<FilterPattern> rules = f.getRules();
-		assertEquals(2, rules.size());
-		assertEquals("exclude: *.*.foo=*", rules.get(0).toString());
-		assertEquals("include: *.*.foo=bar", rules.get(1).toString());
-	}
 }