Skip to content

Commit 33150bd

Browse files
refactor: use Jackson 3 with Flow APIs (#8055)
* feat!: update to jackson3 Update components to use jackson 3 to support the change in vaadin/flow#22205 * Charts changes apart from serializers * run formatter * update remaining map, spreadsheet, charts parts --------- Co-authored-by: Mikael Grankvist <mgrankvi@vaadin.com>
1 parent 3e60913 commit 33150bd

81 files changed

Lines changed: 191 additions & 144 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/AppLayout.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Objects;
2121

2222
import com.fasterxml.jackson.annotation.JsonInclude;
23-
import com.fasterxml.jackson.databind.node.ObjectNode;
2423
import com.vaadin.flow.component.AttachEvent;
2524
import com.vaadin.flow.component.Component;
2625
import com.vaadin.flow.component.HasElement;
@@ -37,6 +36,8 @@
3736
import com.vaadin.flow.internal.JacksonUtils;
3837
import com.vaadin.flow.router.RouterLayout;
3938

39+
import tools.jackson.databind.node.ObjectNode;
40+
4041
/**
4142
* App Layout is a component for building common application layouts.
4243
* <p>

vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/Avatar.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.Objects;
2020

2121
import com.fasterxml.jackson.annotation.JsonInclude;
22-
import com.fasterxml.jackson.databind.node.ObjectNode;
2322
import com.vaadin.flow.component.Component;
2423
import com.vaadin.flow.component.HasSize;
2524
import com.vaadin.flow.component.HasStyle;
@@ -33,6 +32,8 @@
3332
import com.vaadin.flow.server.streams.AbstractDownloadHandler;
3433
import com.vaadin.flow.server.streams.DownloadHandler;
3534

35+
import tools.jackson.databind.node.ObjectNode;
36+
3637
/**
3738
* Avatar is a graphical representation of an object or entity, for example a
3839
* person or an organisation.

vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/AvatarGroup.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import com.fasterxml.jackson.annotation.JsonInclude;
3434
import com.fasterxml.jackson.annotation.JsonIncludeProperties;
3535
import com.fasterxml.jackson.annotation.JsonProperty;
36-
import com.fasterxml.jackson.databind.node.ArrayNode;
37-
import com.fasterxml.jackson.databind.node.ObjectNode;
3836
import com.vaadin.flow.component.Component;
3937
import com.vaadin.flow.component.HasSize;
4038
import com.vaadin.flow.component.HasStyle;
@@ -55,6 +53,9 @@
5553
import com.vaadin.flow.server.streams.DownloadHandler;
5654
import com.vaadin.flow.shared.Registration;
5755

56+
import tools.jackson.databind.node.ArrayNode;
57+
import tools.jackson.databind.node.ObjectNode;
58+
5859
/**
5960
* Avatar Group is used to group multiple Avatars together. It can be used, for
6061
* example, to show that there are multiple users viewing the same page or for

vaadin-charts-flow-parent/vaadin-charts-flow/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<description>Vaadin Charts</description>
1313
<properties>
1414
<osgi.bundle.license>https://vaadin.com/commercial-license-and-service-terms</osgi.bundle.license>
15-
<jackson.version>3.0.0-rc9</jackson.version>
1615
</properties>
1716
<dependencies>
1817
<dependency>
@@ -44,11 +43,6 @@
4443
<artifactId>slf4j-simple</artifactId>
4544
<scope>test</scope>
4645
</dependency>
47-
<dependency>
48-
<groupId>tools.jackson.core</groupId>
49-
<artifactId>jackson-databind</artifactId>
50-
<version>${jackson.version}</version>
51-
</dependency>
5246
</dependencies>
5347
<build>
5448
<plugins>

vaadin-charts-flow-parent/vaadin-charts-flow/src/main/java/com/vaadin/flow/component/charts/Chart.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import java.util.stream.Collectors;
1717
import java.util.stream.Stream;
1818

19-
import com.fasterxml.jackson.databind.node.ObjectNode;
2019
import com.vaadin.flow.component.AttachEvent;
2120
import com.vaadin.flow.component.Component;
2221
import com.vaadin.flow.component.ComponentEventListener;
@@ -73,6 +72,8 @@
7372
import com.vaadin.flow.internal.UsageStatistics;
7473
import com.vaadin.flow.shared.Registration;
7574

75+
import tools.jackson.databind.node.ObjectNode;
76+
7677
/**
7778
* Vaadin Charts is a feature-rich interactive charting library for Vaadin. It
7879
* provides multiple different chart types for visualizing one- or

vaadin-charts-flow-parent/vaadin-charts-flow/src/main/java/com/vaadin/flow/component/charts/ChartOptions.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import java.util.Objects;
1212

1313
import com.fasterxml.jackson.annotation.JsonUnwrapped;
14-
import com.fasterxml.jackson.databind.node.ObjectNode;
1514
import com.vaadin.flow.component.ComponentUtil;
1615
import com.vaadin.flow.component.UI;
1716
import com.vaadin.flow.component.charts.model.AbstractConfigurationObject;
@@ -20,6 +19,8 @@
2019
import com.vaadin.flow.component.charts.util.ChartSerialization;
2120
import com.vaadin.flow.internal.JacksonUtils;
2221

22+
import tools.jackson.databind.node.ObjectNode;
23+
2324
/**
2425
* The ChartOptions configures a page local global options like localized texts
2526
* for charts.

vaadin-charts-flow-parent/vaadin-charts-flow/src/main/java/com/vaadin/flow/component/charts/events/ChartAddSeriesEvent.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
*/
99
package com.vaadin.flow.component.charts.events;
1010

11-
import com.fasterxml.jackson.databind.node.ArrayNode;
1211
import com.vaadin.flow.component.ComponentEvent;
1312
import com.vaadin.flow.component.DomEvent;
1413
import com.vaadin.flow.component.EventData;
1514
import com.vaadin.flow.component.charts.Chart;
1615

16+
import tools.jackson.databind.node.ArrayNode;
17+
1718
/**
1819
* The ChartAddSeriesEvent class stores data about new series added to an
1920
* existing chart.

vaadin-checkbox-flow-parent/vaadin-checkbox-flow/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroup.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.util.stream.Collectors;
3030
import java.util.stream.Stream;
3131

32-
import com.fasterxml.jackson.databind.node.ArrayNode;
3332
import com.vaadin.flow.component.AbstractField;
3433
import com.vaadin.flow.component.AbstractSinglePropertyField;
3534
import com.vaadin.flow.component.Component;
@@ -75,6 +74,8 @@
7574
import com.vaadin.flow.internal.JacksonUtils;
7675
import com.vaadin.flow.shared.Registration;
7776

77+
import tools.jackson.databind.node.ArrayNode;
78+
7879
/**
7980
* CheckBoxGroup is a multi-selection component where items are displayed as
8081
* check boxes.

vaadin-checkbox-flow-parent/vaadin-checkbox-flow/src/test/java/com/vaadin/flow/component/checkbox/tests/CheckboxGroupTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.junit.rules.ExpectedException;
3434
import org.mockito.Mockito;
3535

36-
import com.fasterxml.jackson.databind.node.ArrayNode;
3736
import com.vaadin.flow.component.AbstractField;
3837
import com.vaadin.flow.component.Component;
3938
import com.vaadin.flow.component.HasAriaLabel;
@@ -57,6 +56,8 @@
5756
import com.vaadin.flow.server.VaadinService;
5857
import com.vaadin.flow.server.VaadinSession;
5958

59+
import tools.jackson.databind.node.ArrayNode;
60+
6061
public class CheckboxGroupTest {
6162

6263
@Rule

vaadin-combo-box-flow-parent/vaadin-combo-box-flow/src/main/java/com/vaadin/flow/component/combobox/ComboBox.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Objects;
2121
import java.util.stream.Stream;
2222

23-
import com.fasterxml.jackson.databind.node.ObjectNode;
2423
import com.vaadin.flow.component.HasSize;
2524
import com.vaadin.flow.component.Tag;
2625
import com.vaadin.flow.component.Unit;
@@ -35,6 +34,8 @@
3534
import com.vaadin.flow.function.SerializableBiPredicate;
3635
import com.vaadin.flow.internal.JacksonUtils;
3736

37+
import tools.jackson.databind.node.ObjectNode;
38+
3839
/**
3940
* Combo Box allows the user to choose a value from a filterable list of options
4041
* presented in an overlay.

0 commit comments

Comments
 (0)