fix: fix filter problem when column value provider is not string based

Author: paodb

enhanced-grid-flow/src/main/java/com/vaadin/componentfactory/enhancedgrid/EnhancedColumn.java

@@ -153,15 +153,16 @@ void updateFilterButtonStyle(){
 			filterButton.getClassNames().add("filter-selected");
 		}
 	}
-
+	
 	ValueProvider<T, ?> getValueProvider(){
-		if (this.getRenderer() instanceof ColumnPathRenderer) { 
-			valueProvider = ((ColumnPathRenderer<T>)this.getRenderer()).getValueProviders().values().iterator().next();
-		} else if(valueProvider == null){
+		if (this.valueProvider != null) {
+			 return this.valueProvider;
+		} else if (this.getRenderer() instanceof ColumnPathRenderer) { 
+			return ((ColumnPathRenderer<T>)this.getRenderer()).getValueProviders().values().iterator().next();
+		} else {
 			throw new UnsupportedOperationException("Value provider for column is unknown. "
 					+ "Please set one calling setValueProvider method.");
 		}
-		return valueProvider;
 	}
 
 	public void setValueProvider(ValueProvider<T, ?> valueProvider) {

enhanced-grid-flow/src/main/java/com/vaadin/componentfactory/enhancedgrid/EnhancedGrid.java

@@ -378,7 +378,7 @@ public void beforeLeave(BeforeLeaveEvent event) {
 	 */
 	@Override
 	protected BiFunction<Renderer<T>, String, Column<T>> getDefaultColumnFactory() {
-		return (renderer, columnId) -> new EnhancedColumn(this, columnId, renderer);
+		return (renderer, columnId) -> new EnhancedColumn<>(this, columnId, renderer);
 	}
 
 	/**
@@ -387,10 +387,18 @@ protected BiFunction<Renderer<T>, String, Column<T>> getDefaultColumnFactory() {
 	 */
 	@Override
 	public EnhancedColumn<T> addColumn(ValueProvider<T, ?> valueProvider) {
-        BiFunction<Renderer<T>, String, Column<T>> defaultFactory = getDefaultColumnFactory();
-        return (EnhancedColumn<T>) super.addColumn(valueProvider, defaultFactory);
+        return (EnhancedColumn<T>) super.addColumn(valueProvider);
     }
 
+	@SuppressWarnings("unchecked")
+	@Override
+	protected <C extends Column<T>> C addColumn(ValueProvider<T, ?> valueProvider,
+		BiFunction<Renderer<T>, String, C> columnFactory) {
+		EnhancedColumn<T> column = (EnhancedColumn<T>) super.addColumn(valueProvider, columnFactory);
+		column.setValueProvider(valueProvider);
+		return (C) column;
+	}
+	
 	/**
 	 * @see Grid#addColumn(ValueProvider, String...)
 	 * 
@@ -428,6 +436,15 @@ public <V extends Component> EnhancedColumn<T> addComponentColumn(ValueProvider<
 		return (EnhancedColumn<T>) super.addComponentColumn(componentProvider);
 	}
 
+	/**
+	 * @see Grid#getColumnByKey(String)
+	 * 
+	 */
+	@Override
+	public EnhancedColumn<T> getColumnByKey(String columnKey) {
+		return (EnhancedColumn<T>) super.getColumnByKey(columnKey);
+	}
+	
 	@Override
 	public void onApplyFilter(Object filter) {
 		applyFilter();