Skip to content

Commit a33200e

Browse files
authored
fix: fix jackson imports (#2009)
1 parent f202025 commit a33200e

6 files changed

Lines changed: 8 additions & 12 deletions

File tree

vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/grid/GridTester.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121
import com.vaadin.testbench.unit.MouseButton;
2222
import com.vaadin.testbench.unit.Tests;
2323
import com.vaadin.testbench.unit.component.GridKt;
24+
import tools.jackson.databind.node.ArrayNode;
2425

2526
import java.lang.reflect.Field;
2627
import java.util.ArrayList;
2728
import java.util.Collection;
2829
import java.util.List;
2930
import java.util.Objects;
3031

31-
import com.fasterxml.jackson.databind.node.ArrayNode;
32-
3332
/**
3433
* Tester for Grid components.
3534
*

vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/virtuallist/VirtualListTester.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717
import com.vaadin.testbench.unit.ComponentTester;
1818
import com.vaadin.testbench.unit.LitRendererTestUtil;
1919
import com.vaadin.testbench.unit.Tests;
20+
import tools.jackson.databind.node.ArrayNode;
2021

2122
import java.util.Collections;
2223

23-
import com.fasterxml.jackson.databind.node.ArrayNode;
24-
2524
/**
2625
* Tester for VirtualList components.
2726
*

vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.stream.Collectors;
1919
import java.util.stream.Stream;
2020

21-
import com.fasterxml.jackson.databind.node.ObjectNode;
2221
import org.slf4j.LoggerFactory;
2322

2423
import com.vaadin.flow.component.AbstractField;
@@ -29,6 +28,7 @@
2928
import com.vaadin.flow.internal.JacksonUtils;
3029
import com.vaadin.flow.internal.nodefeature.ElementListenerMap;
3130
import com.vaadin.testbench.unit.internal.PrettyPrintTreeKt;
31+
import tools.jackson.databind.node.ObjectNode;
3232

3333
/**
3434
* Test wrapper for components with helpful methods for testing a component.

vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/LitRendererTestUtil.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
import com.vaadin.flow.data.renderer.LitRenderer;
1212
import com.vaadin.flow.function.SerializableBiConsumer;
1313
import com.vaadin.flow.function.ValueProvider;
14+
import tools.jackson.databind.node.ArrayNode;
1415

1516
import java.lang.reflect.Field;
1617
import java.util.Map;
1718
import java.util.Set;
1819
import java.util.function.BiFunction;
1920
import java.util.function.IntFunction;
2021

21-
import com.fasterxml.jackson.databind.node.ArrayNode;
22-
2322
/**
2423
* Utility methods for unit testing properties and functions of LitRenderers.
2524
*/

vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/BasicUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
package com.vaadin.testbench.unit.internal
1313

14-
import com.fasterxml.jackson.databind.node.ObjectNode
1514
import com.vaadin.flow.component.BlurNotifier
1615
import com.vaadin.flow.component.Component
1716
import com.vaadin.flow.component.ComponentEvent
@@ -27,6 +26,7 @@ import com.vaadin.flow.dom.DomEvent
2726
import com.vaadin.flow.internal.JacksonUtils
2827
import com.vaadin.flow.router.InternalServerError
2928
import com.vaadin.flow.server.VaadinSession
29+
import tools.jackson.databind.node.ObjectNode
3030

3131
/**
3232
* Allows us to fire any Vaadin event on any Vaadin component.

vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/Shortcuts.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package com.vaadin.testbench.unit.internal
22

3-
import com.fasterxml.jackson.databind.JsonNode
4-
import com.fasterxml.jackson.databind.ObjectMapper
5-
import com.fasterxml.jackson.databind.node.ObjectNode
63
import com.vaadin.flow.component.Component
74
import com.vaadin.flow.component.Key
85
import com.vaadin.flow.component.ShortcutRegistration
96
import com.vaadin.flow.internal.JacksonUtils
7+
import tools.jackson.databind.JsonNode
8+
import tools.jackson.databind.node.ObjectNode
109

1110
/**
1211
* Take a look at `DomEventListenerWrapper.matchesFilter()` to see why this is necessary.
1312
* If this stuff stops working, place a breakpoint into the [getBoolean]/[hasKey] function,
1413
* to see what kind of keys you're receiving and whether it matches [filter].
1514
*/
1615
private class MockFilterJsonObject(val key: Key, val modifiers: Set<Key>) : ObjectNode(
17-
ObjectMapper().nodeFactory
16+
JacksonUtils.getMapper().nodeFactory
1817
) {
1918
val filter: String
2019
var filterString: String = ""

0 commit comments

Comments
 (0)