package org.hildan.fxlog.filtering;

import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;

import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;

import org.hildan.fxlog.core.LogEntry;
import org.jetbrains.annotations.NotNull;

/**
 * A log filter based on a regexp matching the raw log entry or a column in a log.
 */
public class Filter implements Predicate<LogEntry> {

    private final StringProperty columnName;

    private final Pattern pattern;

    /**
     * Creates a new filter.
     *
     * @param columnName
     *         the capturing group name corresponding to the column to apply this filter to, or null to apply this
     *         filter to the whole raw log line
     * @param regex
     *         the regex that the given column (or whole line) should match
     * @throws PatternSyntaxException
     *         if the given regex is not well formed
     */
    private Filter(String columnName, String regex) throws PatternSyntaxException {
        this.pattern = Pattern.compile(regex);
        this.columnName = new SimpleStringProperty(columnName);
    }

    /**
     * Creates a new raw log filter.
     *
     * @param regex
     *         the regex that the raw log line should match
     * @throws PatternSyntaxException
     *         if the given regex is not well formed
     */
    @NotNull
    public static Filter matchRawLog(@NotNull String regex) {
        return new Filter(null, regex);
    }

    /**
     * Creates a new column filter.
     *
     * @param columnName
     *         the capturing group name corresponding to the column to apply this filter to
     * @param regex
     *         the regex that the given column should match
     * @throws PatternSyntaxException
     *         if the given regex is not well formed
     */
    @NotNull
    public static Filter matchColumn(@NotNull String columnName, @NotNull String regex) {
        return new Filter(columnName, regex);
    }

    public String getColumnName() {
        return columnName.get();
    }

    public StringProperty columnNameProperty() {
        return columnName;
    }

    public void setColumnName(String columnName) {
        this.columnName.set(columnName);
    }

    public Pattern getPattern() {
        return pattern;
    }

    @Override
    public boolean test(LogEntry log) {
        if (columnName == null) {
            return pattern.matcher(log.rawLine()).matches();
        } else {
            String columnValue = log.getColumnValues().get(columnName.get());
            return columnValue != null && pattern.matcher(columnValue).matches();
        }
    }
}

@@ -2437,16 +2437,22 @@
 lumnName
+.get()
  == null

Fix raw filter having no effect