action: Improve resource name matching

We clean up the abstraction to use a predicate which allows us to
capture extensions and their length without having to recompute.
We can now support multiple extensions for an action type.

Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>

org.eclipse.transformer/src/main/java/org/eclipse/transformer/action/ActionType.java

@@ -11,16 +11,19 @@
 
 package org.eclipse.transformer.action;
 
+import java.util.Arrays;
+import java.util.function.Predicate;
+
 public enum ActionType {
-	RENAME("Rename Action", ""),
+	RENAME("Rename Action"),
 
 	CLASS("Class Action", ".class"),
 	MANIFEST("Manifest Action", "manifest.mf"),
 	FEATURE("Feature Action", ".mf"), // Sub of MANIFEST
-	SERVICE_LOADER_CONFIG("Service Config Action", ""),
+	SERVICE_LOADER_CONFIG("Service Config Action"),
 	PROPERTIES("Properties Action", ".properties"), // Sub of TEXT
 
-	TEXT("Text Action", ""),
+	TEXT("Text Action"),
 	JAVA("Java Action", ".java"), // Sub of TEXT
 	JSP("JSP Action", ".jsp"), // Sub of TEXT
 	XML("XML Action", ".xml"), // Sub of TEXT
@@ -31,18 +34,30 @@ public enum ActionType {
 	RAR("RAR Action", ".rar"),
 	EAR("EAR Action", ".ear"),
 
-	DIRECTORY("Directory Action", "");
+	DIRECTORY("Directory Action");
 
 	private final String name;
-	private final String extension;
+	private final Predicate<String> matcher;
 
-	ActionType(String name, String extension) {
+	ActionType(String name, String... extensions) {
 		this.name = name;
-		this.extension = extension;
+		this.matcher = Arrays.stream(extensions)
+			.map(this::extensionPredicate)
+			.reduce(Predicate::or)
+			.orElse(this::matchingUnsupported);
+	}
+
+	private Predicate<String> extensionPredicate(String extension) {
+		int length = extension.length();
+		return resourceName -> resourceName.regionMatches(true, resourceName.length() - length, extension, 0, length);
+	}
+
+	private boolean matchingUnsupported(String resourceName) {
+		throw new UnsupportedOperationException(getName().concat(" does not support resource name matching"));
 	}
 
-	public String getExtension() {
-		return extension;
+	public Predicate<String> resourceNameMatcher() {
+		return matcher;
 	}
 
 	public String getName() {

org.eclipse.transformer/src/main/java/org/eclipse/transformer/action/impl/ActionImpl.java

@@ -184,21 +184,8 @@ public boolean acceptResource(String resourceName, File resourceFile) {
 		throw new UnsupportedOperationException(getClass().getSimpleName() + " does not support this method");
 	}
 
-	protected boolean acceptExtension(String resourceName, File resourceFile) {
-		String ext = getAcceptExtension();
-		int extLen = ext.length();
-		int resLen = resourceName.length();
-
-		boolean accept = ((resLen >= extLen) && resourceName.regionMatches(true, resLen - extLen, ext, 0, extLen));
-		return accept;
-	}
-
-	public String getAcceptExtension() {
-		String acceptExtension = getActionType().getExtension();
-		if (acceptExtension.isEmpty()) {
-			throw new UnsupportedOperationException(getClass().getSimpleName() + " does not support this method");
-		}
-		return acceptExtension;
+	protected boolean matchResourceName(String resourceName) {
+		return getActionType().resourceNameMatcher().test(resourceName);
 	}
 
 	//

org.eclipse.transformer/src/main/java/org/eclipse/transformer/action/impl/ElementActionImpl.java

@@ -58,7 +58,7 @@ public void addReplacements(int additions) {
 
 	@Override
 	public boolean acceptResource(String resourceName, File resourceFile) {
-		return acceptExtension(resourceName, resourceFile);
+		return matchResourceName(resourceName);
 	}
 
 	// Entry from the transformer, and from the directory action.

org.eclipse.transformer/src/main/java/org/eclipse/transformer/action/impl/JSPActionImpl.java

@@ -61,6 +61,6 @@ public ActionType getActionType() {
 
 	@Override
 	public boolean acceptResource(String resourceName, File resourceFile) {
-		return acceptExtension(resourceName, resourceFile);
+		return matchResourceName(resourceName);
 	}
 }

org.eclipse.transformer/src/main/java/org/eclipse/transformer/action/impl/JavaActionImpl.java

@@ -65,6 +65,6 @@ public ActionType getActionType() {
 
 	@Override
 	public boolean acceptResource(String resourceName, File resourceFile) {
-		return acceptExtension(resourceName, resourceFile);
+		return matchResourceName(resourceName);
 	}
 }

org.eclipse.transformer/src/main/java/org/eclipse/transformer/action/impl/PropertiesActionImpl.java

@@ -51,6 +51,6 @@ public ActionType getActionType() {
 
 	@Override
 	public boolean acceptResource(String resourceName, File resourceFile) {
-		return acceptExtension(resourceName, resourceFile);
+		return matchResourceName(resourceName);
 	}
 }

org.eclipse.transformer/src/main/java/org/eclipse/transformer/action/impl/XmlActionImpl.java

@@ -51,6 +51,6 @@ public ActionType getActionType() {
 
 	@Override
 	public boolean acceptResource(String resourceName, File resourceFile) {
-		return acceptExtension(resourceName, resourceFile);
+		return matchResourceName(resourceName);
 	}
 }

org.eclipse.transformer/src/main/java/org/eclipse/transformer/action/impl/ZipActionImpl.java

@@ -71,7 +71,7 @@ public boolean isArchiveAction() {
 
 	@Override
 	public boolean acceptResource(String resourceName, File resourceFile) {
-		return acceptExtension(resourceName, resourceFile);
+		return matchResourceName(resourceName);
 	}
 
 	// Entry from the transformer, or, from the directory action.