Use Java package mapping for both JAVA and JAVAUTF8

Author: Yoshito Umaoka

gp-ant-task/src/main/java/com/ibm/g11n/pipeline/ant/GPBaseTask.java

@@ -40,6 +40,7 @@
 import com.ibm.g11n.pipeline.client.ServiceAccount;
 import com.ibm.g11n.pipeline.client.ServiceClient;
 import com.ibm.g11n.pipeline.client.ServiceException;
+import com.ibm.g11n.pipeline.resfilter.impl.DefaultResourceFilterProvider;
 
 /**
  * Base class of GP download/upload ant tasks
@@ -240,7 +241,7 @@ private String pathToBundleId(String type, String path) {
             parent.getPath().replace(File.separatorChar, '.');
 
         String fileName = f.getName().replaceAll(" ", "_");
-        if (type.equals("JAVA")) {
+        if (DefaultResourceFilterProvider.isJavaType(type)) {
             int dotIdx = fileName.indexOf('.');
             if (dotIdx >= 0) {
                 fileName = fileName.substring(0, dotIdx);

gp-maven-plugin/src/main/java/com/ibm/g11n/pipeline/maven/GPBaseMojo.java

@@ -38,6 +38,7 @@
 import com.ibm.g11n.pipeline.client.ServiceAccount;
 import com.ibm.g11n.pipeline.client.ServiceClient;
 import com.ibm.g11n.pipeline.client.ServiceException;
+import com.ibm.g11n.pipeline.resfilter.impl.DefaultResourceFilterProvider;
 
 /**
  * Base class of GP download/upload Mojo.
@@ -207,7 +208,7 @@ private String pathToBundleId(String type, String path) {
             parent.getPath().replace(File.separatorChar, '.');
 
         String fileName = f.getName().replaceAll(" ", "_");
-        if (type.equals("JAVA")) {
+        if (DefaultResourceFilterProvider.isJavaType(type)) {
             int dotIdx = fileName.indexOf('.');
             if (dotIdx >= 0) {
                 fileName = fileName.substring(0, dotIdx);

gp-res-filter/src/main/java/com/ibm/g11n/pipeline/resfilter/impl/DefaultResourceFilterProvider.java

@@ -124,4 +124,12 @@ public MultiBundleResourceFilter getMultiBundleResourceFilter(String id) {
         return null;
     }
 
+    // TODO: GP Maven/Ant plugin uses different path-bundle name mapping for Java.
+    // This method is used for checking if the type is one of Java types.
+    // We probably should provide path-bundle name mapping "function" as a part
+    // of ResourceFilter/MultiBundleResourceFilter interface instead. Revisit this later.
+    public static boolean isJavaType(String type) {
+        type = type.toUpperCase(Locale.ROOT);
+        return type.equals(Filter.JAVA.name()) || type.equals(Filter.JAVAUTF8.name());
+    }
 }