From fab27e537b04753adf944bf6b13673e6edb66042 Mon Sep 17 00:00:00 2001 From: elmot Date: Thu, 3 May 2018 11:24:56 +0300 Subject: Make FW fully-Java 10 compatible --- .../com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java | 2 +- .../main/java/com/vaadin/v7/data/util/BeanItem.java | 4 ++-- .../vaadin/v7/data/util/PropertyDescriptorTest.java | 4 ++-- pom.xml | 19 +++++++++++++++++-- server/pom.xml | 5 +++++ .../vaadin/data/AbstractBeanPropertyDefinition.java | 2 +- .../main/java/com/vaadin/data/BeanPropertySet.java | 4 ++-- .../src/main/java/com/vaadin/data/util/BeanUtil.java | 8 ++++---- server/src/main/java/com/vaadin/server/JsonCodec.java | 6 +++--- .../main/java/com/vaadin/ui/ComponentRootSetter.java | 9 +++++---- .../ui/components/colorpicker/ColorPickerPreview.java | 2 +- .../vaadin/ui/declarative/DesignAttributeHandler.java | 8 ++++---- .../src/main/java/com/vaadin/util/ReflectTools.java | 4 ++-- .../com/vaadin/tests/design/DeclarativeTestBase.java | 6 +++--- .../tests/performance/AbstractBeansMemoryTest.java | 8 +++++--- 15 files changed, 57 insertions(+), 34 deletions(-) diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java index 901349d42a..5329ae67fe 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java @@ -15,7 +15,7 @@ */ package com.vaadin.v7.data.fieldgroup; -import java.beans.IntrospectionException; +import com.googlecode.openbeans.IntrospectionException; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java index d9a3a40a39..a0ba2dbb11 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java @@ -16,8 +16,8 @@ package com.vaadin.v7.data.util; -import java.beans.IntrospectionException; -import java.beans.PropertyDescriptor; +import com.googlecode.openbeans.IntrospectionException; +import com.googlecode.openbeans.PropertyDescriptor; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collection; diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertyDescriptorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertyDescriptorTest.java index 19147fdef4..ba9bf91b86 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertyDescriptorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertyDescriptorTest.java @@ -3,8 +3,8 @@ package com.vaadin.v7.data.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; +import com.googlecode.openbeans.Introspector; +import com.googlecode.openbeans.PropertyDescriptor; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; diff --git a/pom.xml b/pom.xml index 93c01248b8..14fe5498d2 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,16 @@ + + redhat-ga + https://maven.repository.redhat.com/ga/ + + true + + + false + + vaadin-snapshots https://oss.sonatype.org/content/repositories/vaadin-snapshots/ @@ -116,6 +126,11 @@ commons-io 2.4 + + com.googlecode + openbeans + 1.0 + commons-cli commons-cli @@ -219,7 +234,7 @@ org.hibernate hibernate-validator - 4.2.0.Final + 4.3.2.Final org.jsoup @@ -229,7 +244,7 @@ org.mockito mockito-core - 1.9.5 + 2.18.3 hamcrest-core diff --git a/server/pom.xml b/server/pom.xml index 846a21cf54..77fbc8d4bc 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -47,6 +47,11 @@ provided + + com.googlecode + openbeans + + javax.validation diff --git a/server/src/main/java/com/vaadin/data/AbstractBeanPropertyDefinition.java b/server/src/main/java/com/vaadin/data/AbstractBeanPropertyDefinition.java index adb543ec31..809c1f4d7a 100644 --- a/server/src/main/java/com/vaadin/data/AbstractBeanPropertyDefinition.java +++ b/server/src/main/java/com/vaadin/data/AbstractBeanPropertyDefinition.java @@ -15,7 +15,7 @@ */ package com.vaadin.data; -import java.beans.PropertyDescriptor; +import com.googlecode.openbeans.PropertyDescriptor; import com.vaadin.shared.util.SharedUtil; import com.vaadin.util.ReflectTools; diff --git a/server/src/main/java/com/vaadin/data/BeanPropertySet.java b/server/src/main/java/com/vaadin/data/BeanPropertySet.java index 90c264eaa1..da305d4c57 100644 --- a/server/src/main/java/com/vaadin/data/BeanPropertySet.java +++ b/server/src/main/java/com/vaadin/data/BeanPropertySet.java @@ -15,8 +15,8 @@ */ package com.vaadin.data; -import java.beans.IntrospectionException; -import java.beans.PropertyDescriptor; +import com.googlecode.openbeans.IntrospectionException; +import com.googlecode.openbeans.PropertyDescriptor; import java.io.IOException; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; diff --git a/server/src/main/java/com/vaadin/data/util/BeanUtil.java b/server/src/main/java/com/vaadin/data/util/BeanUtil.java index ac59586d1b..8f4134e6e8 100644 --- a/server/src/main/java/com/vaadin/data/util/BeanUtil.java +++ b/server/src/main/java/com/vaadin/data/util/BeanUtil.java @@ -15,10 +15,10 @@ */ package com.vaadin.data.util; -import java.beans.BeanInfo; -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; +import com.googlecode.openbeans.BeanInfo; +import com.googlecode.openbeans.IntrospectionException; +import com.googlecode.openbeans.Introspector; +import com.googlecode.openbeans.PropertyDescriptor; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/server/src/main/java/com/vaadin/server/JsonCodec.java b/server/src/main/java/com/vaadin/server/JsonCodec.java index eeb27b0e5a..545f2af087 100644 --- a/server/src/main/java/com/vaadin/server/JsonCodec.java +++ b/server/src/main/java/com/vaadin/server/JsonCodec.java @@ -16,9 +16,9 @@ package com.vaadin.server; -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; +import com.googlecode.openbeans.IntrospectionException; +import com.googlecode.openbeans.Introspector; +import com.googlecode.openbeans.PropertyDescriptor; import java.io.Serializable; import java.lang.reflect.Array; import java.lang.reflect.Field; diff --git a/server/src/main/java/com/vaadin/ui/ComponentRootSetter.java b/server/src/main/java/com/vaadin/ui/ComponentRootSetter.java index fe0a8e6a88..92116e49df 100644 --- a/server/src/main/java/com/vaadin/ui/ComponentRootSetter.java +++ b/server/src/main/java/com/vaadin/ui/ComponentRootSetter.java @@ -52,7 +52,8 @@ public class ComponentRootSetter implements Serializable { } /** - * Checks if the given custom component or composite may accept a root component. + * Checks if the given custom component or composite may accept a root + * component. *

* For internal use only. * @@ -63,11 +64,11 @@ public class ComponentRootSetter implements Serializable { * */ public static boolean canSetRoot(Component customComponent) { - if(customComponent instanceof CustomComponent) { + if (customComponent instanceof CustomComponent) { return true; } - if(customComponent instanceof Composite) { - return ((Composite)customComponent).getCompositionRoot() == null; + if (customComponent instanceof Composite) { + return ((Composite) customComponent).getCompositionRoot() == null; } return false; } diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java index 8c7af4273a..ea593041ab 100644 --- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java +++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java @@ -209,4 +209,4 @@ public class ColorPickerPreview extends CssLayout implements HasValue { .concat("' is not in any recognized format"); } -} \ No newline at end of file +} diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java index 21bef12317..759faf4038 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java @@ -15,10 +15,10 @@ */ package com.vaadin.ui.declarative; -import java.beans.BeanInfo; -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; +import com.googlecode.openbeans.BeanInfo; +import com.googlecode.openbeans.IntrospectionException; +import com.googlecode.openbeans.Introspector; +import com.googlecode.openbeans.PropertyDescriptor; import java.io.Serializable; import java.lang.reflect.Method; import java.lang.reflect.Type; diff --git a/server/src/main/java/com/vaadin/util/ReflectTools.java b/server/src/main/java/com/vaadin/util/ReflectTools.java index 245b864169..340a060fd0 100644 --- a/server/src/main/java/com/vaadin/util/ReflectTools.java +++ b/server/src/main/java/com/vaadin/util/ReflectTools.java @@ -15,8 +15,8 @@ */ package com.vaadin.util; -import java.beans.IntrospectionException; -import java.beans.PropertyDescriptor; +import com.googlecode.openbeans.IntrospectionException; +import com.googlecode.openbeans.PropertyDescriptor; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java index 07d9f9f9f5..e2da2cd3cf 100644 --- a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java +++ b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java @@ -1,8 +1,8 @@ package com.vaadin.tests.design; -import java.beans.BeanInfo; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; +import com.googlecode.openbeans.BeanInfo; +import com.googlecode.openbeans.Introspector; +import com.googlecode.openbeans.PropertyDescriptor; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; diff --git a/uitest/src/main/java/com/vaadin/tests/performance/AbstractBeansMemoryTest.java b/uitest/src/main/java/com/vaadin/tests/performance/AbstractBeansMemoryTest.java index c4d2b4d195..f56f5cd847 100644 --- a/uitest/src/main/java/com/vaadin/tests/performance/AbstractBeansMemoryTest.java +++ b/uitest/src/main/java/com/vaadin/tests/performance/AbstractBeansMemoryTest.java @@ -1,5 +1,6 @@ package com.vaadin.tests.performance; +import java.lang.instrument.Instrumentation; import java.lang.reflect.Field; import java.math.BigDecimal; import java.util.Collections; @@ -24,7 +25,7 @@ import com.vaadin.ui.MenuBar.MenuItem; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; -import jdk.nashorn.internal.ir.debug.ObjectSizeCalculator; +//import jdk.nashorn.internal.ir.debug.ObjectSizeCalculator; /** * @author Vaadin Ltd @@ -140,8 +141,9 @@ public abstract class AbstractBeansMemoryTest HasComponents container = component.getParent(); setParent(component, null); - memoryLabel.setValue( - String.valueOf(ObjectSizeCalculator.getObjectSize(component))); +// todo enable back +// memoryLabel.setValue( +// String.valueOf(Instrumentation.getObjectSize(component))); setParent(component, container); } -- cgit v1.2.3