Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Fix NPE if component renderer returns null #4361

Merged
merged 6 commits into from
Dec 16, 2022
Merged

fix: Fix NPE if component renderer returns null #4361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2778452
fix: Fix NPE if component renderer returns null
mstahv Dec 15, 2022
71b7972
fixed test
mstahv Dec 15, 2022
f75d955
Alternative solution
mstahv Dec 15, 2022
739e8be
test and bit more sophisticated place for the placeholder component g…
mstahv Dec 15, 2022
f8f3b90
use Text instead of Div
mstahv Dec 16, 2022
8a7fa4a
Merge branch 'master' into bugfix/component-renderer-null-values-master
tomivirkki Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...din-renderer-flow/src/main/java/com/vaadin/flow/data/renderer/ComponentDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.slf4j.LoggerFactory;

import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.Text;
import com.vaadin.flow.data.provider.AbstractComponentDataGenerator;
import com.vaadin.flow.dom.Element;
import com.vaadin.flow.function.ValueProvider;
Expand Down Expand Up @@ -100,7 +101,11 @@ public void generateData(T item, JsonObject jsonObject) {

@Override
protected Component createComponent(T item) {
return componentRenderer.createComponent(item);
Component c = componentRenderer.createComponent(item);
if (c == null) {
c = new Text("");
}
return c;
}

@Override
Expand Down
18 changes: 18 additions & 0 deletions ...adin-renderer-flow/src/test/java/com/vaadin/flow/data/renderer/ComponentRendererTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;

import com.vaadin.flow.function.ValueProvider;
import org.junit.Assert;
import org.junit.Test;

Expand Down Expand Up @@ -132,6 +133,23 @@ public void componentRenderer_childAttachedBeforeParent() {

}

@Test
public void nullValues() {
ComponentRenderer<Component, String> renderer = new ComponentRenderer<>(
e -> {
return null;
});

ValueProvider<String, String> keyMapper = s -> "foo";
ComponentDataGenerator cdg = new ComponentDataGenerator<>(renderer,
keyMapper);

Component c = cdg.createComponent("foo");
Assert.assertNotNull(
"Placeholder component should be generated for null values", c);
Assert.assertEquals(0, c.getElement().getChildCount());
}

private void attachElement(UI ui, Element contentTemplate) {
ui.getElement().appendChild(contentTemplate);
}
Expand Down