diff --git a/core/pom.xml b/core/pom.xml new file mode 100644 index 0000000..4e01a02 --- /dev/null +++ b/core/pom.xml @@ -0,0 +1,309 @@ + + + 4.0.0 + + com.flowingcode.vaadin + json-migration-helper + 0.9.4-SNAPSHOT + Json Migration Helper + Json Migration Helper for Vaadin Flow + https://www.flowingcode.com/en/open-source/ + + + + + 14.11.13 + 1.8 + 1.8 + UTF-8 + UTF-8 + ${project.basedir}/drivers + + + + Flowing Code + https://www.flowingcode.com + + + 2025 + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + https://github.com/FlowingCode/JsonMigrationHelper + scm:git:git://github.com/FlowingCode/JsonMigrationHelper.git + scm:git:ssh://git@github.com:/FlowingCode/JsonMigrationHelper.git + master + + + + + flowingcode + Flowing Code + https://www.flowingcode.com + + + + + + + com.vaadin + vaadin-bom + pom + import + ${vaadin.version} + + + + + + + com.vaadin + vaadin-core + true + + + org.ow2.asm + asm + 9.8 + true + + + org.ow2.asm + asm-commons + 9.8 + true + + + tools.jackson.core + jackson-databind + 3.0.0 + true + + + org.projectlombok + lombok + 1.18.38 + provided + + + com.vaadin.external.gwt + gwt-elemental + 2.8.2.vaadin2 + compile + + + + + + + + org.apache.maven.plugins + maven-release-plugin + 3.0.1 + + @{project.version} + release + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + + + + + org.codehaus.mojo + exec-maven-plugin + 3.1.0 + + + patch-elemental-nodes + process-classes + + java + + + com.flowingcode.vaadin.jsonmigration.ElementalNodeAsmPostProcessor + + ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalArrayNode.class + ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalBooleanNode.class + ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalNullNode.class + ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalNumberNode.class + ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalObjectNode.class + ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalStringNode.class + + + + + patch-lit-renderer + process-classes + + java + + + com.flowingcode.vaadin.jsonmigration.LitRendererAsmPostProcessor + + ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtension.class + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.2 + + + true + + false + true + + + 1 + + + + + + org.codehaus.mojo + license-maven-plugin + 2.3.0 + + apache_v2 + false + + **/main/dev-bundle/** + **/main/bundles/** + **/main/frontend/** + + + java + + + + + + + + + directory + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + package + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.11.1 + + + attach-javadocs + package + + jar + + + + + true + none + true + + **/ElementalNodeAsmPostProcessor.java + **/LitRendererAsmPostProcessor.java + + + https://javadoc.io/doc/com.vaadin/vaadin-platform-javadoc/${vaadin.version} + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.2 + + + + META-INF/VAADIN/config/flow-build-info.json + com/flowingcode/vaadin/jsonmigration/ElementalNodeAsmPostProcessor.class + com/flowingcode/vaadin/jsonmigration/ElementalNodeAsmPostProcessor$*.class + com/flowingcode/vaadin/jsonmigration/LitRendererAsmPostProcessor.class + com/flowingcode/vaadin/jsonmigration/LitRendererAsmPostProcessor$*.class + + + + + + + + + gpg + + + env.MAVEN_GPG_PASSPHRASE + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.7 + + + sign-artifacts + verify + + sign + + + + + + + + + + release + + + + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 + true + + + + + + + diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/ClassInstrumentationJacksonHelper.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/ClassInstrumentationJacksonHelper.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/ClassInstrumentationJacksonHelper.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/ClassInstrumentationJacksonHelper.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/ClassInstrumentationUtil.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/ClassInstrumentationUtil.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/ClassInstrumentationUtil.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/ClassInstrumentationUtil.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalArrayNode.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalArrayNode.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalArrayNode.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalArrayNode.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalBooleanNode.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalBooleanNode.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalBooleanNode.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalBooleanNode.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNodeAsmPostProcessor.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNodeAsmPostProcessor.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNodeAsmPostProcessor.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNodeAsmPostProcessor.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNullNode.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNullNode.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNullNode.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNullNode.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNumberNode.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNumberNode.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNumberNode.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalNumberNode.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalObjectNode.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalObjectNode.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalObjectNode.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalObjectNode.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalPendingJavaScriptResult.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalPendingJavaScriptResult.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalPendingJavaScriptResult.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalPendingJavaScriptResult.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalStringNode.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalStringNode.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalStringNode.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/ElementalStringNode.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/InstrumentationViewInitializer.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/InstrumentationViewInitializer.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/InstrumentationViewInitializer.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/InstrumentationViewInitializer.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/InstrumentedRoute.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/InstrumentedRoute.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/InstrumentedRoute.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/InstrumentedRoute.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonCodec.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonCodec.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/JsonCodec.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonCodec.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigration.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigration.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigration.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigration.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonSerializer.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonSerializer.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/JsonSerializer.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonSerializer.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/LegacyJsonMigrationHelper.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/LegacyJsonMigrationHelper.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/LegacyJsonMigrationHelper.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/LegacyJsonMigrationHelper.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/LitRendererAsmPostProcessor.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/LitRendererAsmPostProcessor.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/LitRendererAsmPostProcessor.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/LitRendererAsmPostProcessor.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtension.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtension.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtension.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtension.java diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/UnsupportedJsonValueImpl.java b/core/src/main/java/com/flowingcode/vaadin/jsonmigration/UnsupportedJsonValueImpl.java similarity index 100% rename from src/main/java/com/flowingcode/vaadin/jsonmigration/UnsupportedJsonValueImpl.java rename to core/src/main/java/com/flowingcode/vaadin/jsonmigration/UnsupportedJsonValueImpl.java diff --git a/pom.xml b/pom.xml index b8001b0..bd66a33 100644 --- a/pom.xml +++ b/pom.xml @@ -3,49 +3,48 @@ 4.0.0 com.flowingcode.vaadin - json-migration-helper + json-migration-helper-parent 0.9.4-SNAPSHOT - Json Migration Helper - Json Migration Helper for Vaadin Flow - https://www.flowingcode.com/en/open-source/ + pom + Json Migration Helper Parent + Aggregator build: the json-migration-helper library plus cross-version test modules. + + + + + core + tests-shared + tests-v14 + tests-v23 + tests-v24 + tests-v25 + + 14.11.13 + 1.8 1.8 UTF-8 UTF-8 - ${project.basedir}/drivers - - - Flowing Code - https://www.flowingcode.com - + + true - 2025 - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - + 3.0.0 + 4.13.2 + 1.3 + 9.8 - - https://github.com/FlowingCode/JsonMigrationHelper - scm:git:git://github.com/FlowingCode/JsonMigrationHelper.git - scm:git:ssh://git@github.com:/FlowingCode/JsonMigrationHelper.git - master - - - - - flowingcode - Flowing Code - https://www.flowingcode.com - - + + 0.9.4-SNAPSHOT + @@ -56,80 +55,42 @@ import ${vaadin.version} + + com.flowingcode.vaadin + json-migration-helper + ${core.version} + + + tools.jackson.core + jackson-databind + ${jackson.version} + + + org.ow2.asm + asm + ${asm.version} + + + org.ow2.asm + asm-commons + ${asm.version} + + + junit + junit + ${junit.version} + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + - - - com.vaadin - vaadin-core - true - - - org.ow2.asm - asm - 9.8 - true - - - org.ow2.asm - asm-commons - 9.8 - true - - - tools.jackson.core - jackson-databind - 3.0.0 - true - - - org.projectlombok - lombok - 1.18.38 - provided - - - com.vaadin.external.gwt - gwt-elemental - 2.8.2.vaadin2 - compile - - - org.slf4j - slf4j-simple - test - - - com.vaadin - vaadin-testbench - test - - - org.hamcrest - hamcrest-library - 1.3 - test - - - - - org.apache.maven.plugins - maven-release-plugin - 3.0.1 - - @{project.version} - release - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - org.apache.maven.plugins maven-surefire-plugin @@ -138,197 +99,13 @@ false + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.0 + - - - - org.codehaus.mojo - exec-maven-plugin - 3.1.0 - - - patch-elemental-nodes - process-classes - - java - - - com.flowingcode.vaadin.jsonmigration.ElementalNodeAsmPostProcessor - - ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalArrayNode.class - ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalBooleanNode.class - ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalNullNode.class - ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalNumberNode.class - ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalObjectNode.class - ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/ElementalStringNode.class - - - - - patch-lit-renderer - process-classes - - java - - - com.flowingcode.vaadin.jsonmigration.LitRendererAsmPostProcessor - - ${project.build.outputDirectory}/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtension.class - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - true - - false - true - - - 1 - - - - - - org.codehaus.mojo - license-maven-plugin - 2.3.0 - - apache_v2 - false - - **/main/dev-bundle/** - **/main/bundles/** - **/main/frontend/** - - - java - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - - - - directory - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - package - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.11.1 - - - attach-javadocs - package - - jar - - - - - true - none - true - - **/ElementalNodeAsmPostProcessor.java - **/LitRendererAsmPostProcessor.java - - - https://javadoc.io/doc/com.vaadin/vaadin-platform-javadoc/${vaadin.version} - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - - META-INF/VAADIN/config/flow-build-info.json - com/flowingcode/vaadin/jsonmigration/ElementalNodeAsmPostProcessor.class - com/flowingcode/vaadin/jsonmigration/ElementalNodeAsmPostProcessor$*.class - com/flowingcode/vaadin/jsonmigration/LitRendererAsmPostProcessor.class - com/flowingcode/vaadin/jsonmigration/LitRendererAsmPostProcessor$*.class - - - - - - - - - gpg - - - env.MAVEN_GPG_PASSPHRASE - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.7 - - - sign-artifacts - verify - - sign - - - - - - - - - - release - - - - org.sonatype.central - central-publishing-maven-plugin - 0.8.0 - true - - - - - - - diff --git a/tests-shared/pom.xml b/tests-shared/pom.xml new file mode 100644 index 0000000..3fabdc3 --- /dev/null +++ b/tests-shared/pom.xml @@ -0,0 +1,121 @@ + + + 4.0.0 + + + com.flowingcode.vaadin + json-migration-helper-parent + 0.9.4-SNAPSHOT + + + json-migration-helper-tests + pom + Json Migration Helper :: Shared Tests + + Holds the single, shared copy of the test sources (src/test/java) and the common test + configuration. The tests-v* modules inherit from this module and add these sources via + build-helper, each running them against a different Vaadin runtime. + + + + + true + + + + + + com.flowingcode.vaadin + json-migration-helper + test + + + + + com.vaadin + vaadin-core + test + + + + + tools.jackson.core + jackson-databind + test + + + org.ow2.asm + asm + test + + + org.ow2.asm + asm-commons + test + + + + junit + junit + test + + + org.hamcrest + hamcrest-library + test + + + org.slf4j + slf4j-simple + test + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-shared-test-sources + generate-test-sources + + add-test-source + + + + ${project.basedir}/../tests-shared/src/test/java + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Test24.java + **/JsonMigrationHelper25Test.java + **/LitRendererMigrationExtensionTest.java + + + + + + + diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/BaseClientCallable.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/BaseClientCallable.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/BaseClientCallable.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/BaseClientCallable.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_ArrayOfJsonObject__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_ArrayOfJsonObject__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_ArrayOfJsonObject__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_ArrayOfJsonObject__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_D__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_D__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_D__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_D__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_I__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_I__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_I__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_I__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonArray__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonArray__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonArray__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonArray__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonBoolean__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonBoolean__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonBoolean__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonBoolean__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonNull__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonNull__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonNull__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonNull__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonNumber__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonNumber__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonNumber__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonNumber__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonObjectVarargs__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonObjectVarargs__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonObjectVarargs__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonObjectVarargs__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonObject__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonObject__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonObject__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonObject__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonString__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonString__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonString__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonString__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonValue__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonValue__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonValue__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_JsonValue__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_String__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_String__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_String__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_String__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_Z__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_Z__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_Z__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable_Z__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__D.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__D.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__D.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__D.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__I.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__I.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__I.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__I.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__Integer.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__Integer.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__Integer.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__Integer.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonArray.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonArray.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonArray.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonArray.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonBoolean.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonBoolean.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonBoolean.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonBoolean.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonNull.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonNull.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonNull.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonNull.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonNumber.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonNumber.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonNumber.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonNumber.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonObject.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonObject.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonObject.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonObject.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonString.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonString.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonString.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonString.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonValue.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonValue.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonValue.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__JsonValue.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__Z.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__Z.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__Z.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallable__Z.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest24.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest24.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest24.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest24.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest25.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest25.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest25.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ClientCallablesTest25.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/ExtendsLegacyClientCallablePrivate__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ExtendsLegacyClientCallablePrivate__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/ExtendsLegacyClientCallablePrivate__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/ExtendsLegacyClientCallablePrivate__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25Test.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25Test.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25Test.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25Test.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_D__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_D__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_D__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_D__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_I__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_I__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_I__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_I__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonArray__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonArray__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonArray__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonArray__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonBoolean__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonBoolean__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonBoolean__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonBoolean__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonNull__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonNull__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonNull__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonNull__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonNumber__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonNumber__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonNumber__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonNumber__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonObject__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonObject__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonObject__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonObject__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonString__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonString__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonString__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonString__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonValue__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonValue__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonValue__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_JsonValue__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_String__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_String__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_String__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_String__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_Z__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_Z__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_Z__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate_Z__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__D.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__D.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__D.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__D.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__I.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__I.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__I.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__I.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__Integer.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__Integer.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__Integer.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__Integer.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonArray.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonArray.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonArray.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonArray.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonBoolean.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonBoolean.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonBoolean.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonBoolean.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonNull.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonNull.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonNull.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonNull.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonNumber.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonNumber.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonNumber.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonNumber.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonObject.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonObject.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonObject.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonObject.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonString.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonString.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonString.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonString.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonValue.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonValue.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonValue.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__JsonValue.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__Z.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__Z.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__Z.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablePrivate__Z.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_AllowInert__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_AllowInert__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_AllowInert__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_AllowInert__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_ArrayOfJsonObject__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_ArrayOfJsonObject__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_ArrayOfJsonObject__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_ArrayOfJsonObject__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_ArrayOfJsonString__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_ArrayOfJsonString__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_ArrayOfJsonString__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_ArrayOfJsonString__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_D__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_D__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_D__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_D__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_I__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_I__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_I__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_I__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonArray__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonArray__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonArray__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonArray__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonBoolean__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonBoolean__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonBoolean__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonBoolean__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonNull__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonNull__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonNull__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonNull__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonNumber__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonNumber__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonNumber__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonNumber__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonObjectVarargs__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonObjectVarargs__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonObjectVarargs__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonObjectVarargs__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonObject__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonObject__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonObject__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonObject__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonString__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonString__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonString__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonString__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonValue__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonValue__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonValue__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_JsonValue__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_String__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_String__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_String__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_String__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_Z__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_Z__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_Z__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable_Z__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__D.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__D.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__D.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__D.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__I.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__I.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__I.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__I.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__Integer.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__Integer.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__Integer.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__Integer.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonArray.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonArray.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonArray.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonArray.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonBoolean.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonBoolean.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonBoolean.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonBoolean.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonNull.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonNull.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonNull.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonNull.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonNumber.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonNumber.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonNumber.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonNumber.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonObject.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonObject.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonObject.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonObject.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonString.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonString.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonString.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonString.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonValue.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonValue.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonValue.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__JsonValue.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__V.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__V.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__V.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__V.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__Z.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__Z.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__Z.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallable__Z.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest24.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest24.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest24.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest24.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest25.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest25.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest25.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesPrivateTest25.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest24.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest24.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest24.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest24.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest25.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest25.java similarity index 100% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest25.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LegacyClientCallablesTest25.java diff --git a/src/test/java/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtensionTest.java b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtensionTest.java similarity index 64% rename from src/test/java/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtensionTest.java rename to tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtensionTest.java index 350f7ab..5723c50 100644 --- a/src/test/java/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtensionTest.java +++ b/tests-shared/src/test/java/com/flowingcode/vaadin/jsonmigration/LitRendererMigrationExtensionTest.java @@ -21,13 +21,13 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; -import static org.junit.Assume.assumeTrue; +import com.vaadin.flow.component.UI; +import com.vaadin.flow.data.renderer.LitRenderer; import com.vaadin.flow.function.SerializableBiConsumer; import com.vaadin.flow.server.Version; import elemental.json.JsonArray; import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.Map; import org.junit.Test; @@ -35,21 +35,28 @@ public class LitRendererMigrationExtensionTest { @Test public void testWithFunctionRegistersHandler() throws Exception { - assumeTrue("LitRenderer requires Vaadin 24+", Version.getMajorVersion() >= 24); - Class litRendererClass = Class.forName("com.vaadin.flow.data.renderer.LitRenderer"); - Method of = litRendererClass.getMethod("of", String.class); - Object renderer = of.invoke(null, "
"); + // Vaadin 23's LitRenderer.of() reads UI.getCurrent(); 24+ does not. Create a UI only on 23 so + // that 24/25 never load the UI class (and so don't need the servlet API on the test classpath). + boolean needsUi = Version.getMajorVersion() < 24; + if (needsUi) { + UI.setCurrent(new UI()); + } + try { + LitRenderer renderer = LitRenderer.of("
"); - SerializableBiConsumer handler = (source, array) -> {}; + SerializableBiConsumer handler = (source, array) -> {}; - Method withFunction = LitRendererMigrationExtension.class.getDeclaredMethod( - "withFunction", litRendererClass, String.class, SerializableBiConsumer.class); - withFunction.setAccessible(true); - Object result = withFunction.invoke(null, renderer, "click", handler); + LitRenderer result = + LitRendererMigrationExtension.withFunction(renderer, "click", handler); - assertSame(renderer, result); - assertNotNull("Handler for 'click' should be registered on the renderer", - findRegisteredHandler(renderer, "click")); + assertSame(renderer, result); + assertNotNull("Handler for 'click' should be registered on the renderer", + findRegisteredHandler(renderer, "click")); + } finally { + if (needsUi) { + UI.setCurrent(null); + } + } } private static Object findRegisteredHandler(Object renderer, String functionName) diff --git a/src/test/java/com/vaadin/flow/component/internal/AllowInert.java b/tests-shared/src/test/java/com/vaadin/flow/component/internal/AllowInert.java similarity index 100% rename from src/test/java/com/vaadin/flow/component/internal/AllowInert.java rename to tests-shared/src/test/java/com/vaadin/flow/component/internal/AllowInert.java diff --git a/tests-v14/pom.xml b/tests-v14/pom.xml new file mode 100644 index 0000000..4bf26f4 --- /dev/null +++ b/tests-v14/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + + com.flowingcode.vaadin + json-migration-helper-tests + 0.9.4-SNAPSHOT + ../tests-shared + + + json-migration-helper-tests-v14 + jar + Json Migration Helper :: Tests :: Vaadin 14 + Runs the shared test suite against the Vaadin 14 runtime. + + + 14.11.13 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + + **/LitRendererMigrationExtensionTest.java + + + + + + + diff --git a/tests-v23/pom.xml b/tests-v23/pom.xml new file mode 100644 index 0000000..ac887ab --- /dev/null +++ b/tests-v23/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + + com.flowingcode.vaadin + json-migration-helper-tests + 0.9.4-SNAPSHOT + ../tests-shared + + + json-migration-helper-tests-v23 + jar + Json Migration Helper :: Tests :: Vaadin 23 + Runs the shared test suite against the Vaadin 23 runtime. + + + 23.3.35 + + + + + + javax.servlet + javax.servlet-api + 3.1.0 + test + + + + diff --git a/tests-v24/pom.xml b/tests-v24/pom.xml new file mode 100644 index 0000000..43cc800 --- /dev/null +++ b/tests-v24/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + + com.flowingcode.vaadin + json-migration-helper-tests + 0.9.4-SNAPSHOT + ../tests-shared + + + json-migration-helper-tests-v24 + jar + Json Migration Helper :: Tests :: Vaadin 24 + Runs the shared test suite against the Vaadin 24 runtime. + + + 24.10.6 + + + diff --git a/tests-v25/pom.xml b/tests-v25/pom.xml new file mode 100644 index 0000000..ad433df --- /dev/null +++ b/tests-v25/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + + com.flowingcode.vaadin + json-migration-helper-tests + 0.9.4-SNAPSHOT + ../tests-shared + + + json-migration-helper-tests-v25 + jar + Json Migration Helper :: Tests :: Vaadin 25 + Runs the shared test suite against the Vaadin 25 runtime. + + + 25.1.5 + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Test25.java + **/JsonMigrationHelper25Test.java + **/LitRendererMigrationExtensionTest.java + + + + + + +