[CAMEL-16745] camel-ftp - excludeExt/includeExt not getting the right filename extension

• Type: Improvement
• Status: Resolved
• Priority: Major
• Resolution: Information Provided
• Affects Version/s: 3.10.0
• Fix Version/s: 3.11.0
• Component/s: camel-ftp
• Labels: excludeExt includeExt
• Estimated Complexity: Novice
• Assignee: Unassigned
• Reporter: Huang
• Created: 23/Jun/21 01:35
• Updated: 23/Jun/21 07:02
• Resolved: 23/Jun/21 05:19

Description

When I use includeExt=zip to filter files in FTP component, it not worked as I expected.

If I have a file named aaa.bbb.ccc.zip, it will get "bbb.ccc.zip" as the extension, which I expected was "zip".

From the code of GenericFileConsumer<T>.isMatched in camel-file I found that

 

if (includeExt != null) {
    String ext = FileUtil.onlyExt(file.getFileName());
    boolean any = false;
    for (String include : includeExt) {
        any |= include.equalsIgnoreCase(ext);.




    }
   if (!any) {
        return false;
   }
}

Class FileUtil from camel-util:

    public static String onlyExt(String name) {
        return onlyExt(name, false);
    }    
    public static String onlyExt(String name, boolean singleMode) {
        if (name == null) {
            return null;
        }
        name = stripPath(name);        // extension is the first dot, as a file may have double extension such as .tar.gz
        // if single ext mode, then only return last extension
        int pos = singleMode ? name.lastIndexOf('.') : name.indexOf('.');
        if (pos != -1) {
            return name.substring(pos + 1);
        }
        return null;
    }

 

May be we should change "String ext = FileUtil.onlyExt(file.getFileName());" to "String ext = FileUtil.onlyExt(file.getFileName(), true);" or add an "singleMode" parameter for compatibility。