From 69d63c7f263a98e375bdc9c7ddb27fc9e2fea30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leif=20=C3=85strand?= Date: Thu, 26 Oct 2017 10:45:56 +0300 Subject: [PATCH] Move internal container annotations to the appropriate packages (#2771) --- .../src/main/java/com/vaadin/flow/model/Convert.java | 12 ++++-------- .../InternalContainerAnnotationForConvert.java | 6 ++---- .../main/java/com/vaadin/ui/common/HtmlImport.java | 1 - .../common}/InternalContainerAnnotationForHtml.java | 4 +--- .../common}/InternalContainerAnnotationForJS.java | 4 +--- .../common}/InternalContainerAnnotationForSS.java | 4 +--- .../common}/InternalContainerAnnotationForUses.java | 4 +--- .../main/java/com/vaadin/ui/common/JavaScript.java | 1 - .../main/java/com/vaadin/ui/common/StyleSheet.java | 1 - .../src/main/java/com/vaadin/ui/common/Uses.java | 1 - 10 files changed, 10 insertions(+), 28 deletions(-) rename flow-server/src/main/java/com/vaadin/{annotations => flow/model}/InternalContainerAnnotationForConvert.java (94%) rename flow-server/src/main/java/com/vaadin/{annotations => ui/common}/InternalContainerAnnotationForHtml.java (95%) rename flow-server/src/main/java/com/vaadin/{annotations => ui/common}/InternalContainerAnnotationForJS.java (95%) rename flow-server/src/main/java/com/vaadin/{annotations => ui/common}/InternalContainerAnnotationForSS.java (95%) rename flow-server/src/main/java/com/vaadin/{annotations => ui/common}/InternalContainerAnnotationForUses.java (94%) diff --git a/flow-server/src/main/java/com/vaadin/flow/model/Convert.java b/flow-server/src/main/java/com/vaadin/flow/model/Convert.java index f35a49483d1..cda635c88fe 100644 --- a/flow-server/src/main/java/com/vaadin/flow/model/Convert.java +++ b/flow-server/src/main/java/com/vaadin/flow/model/Convert.java @@ -21,19 +21,15 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.annotations.InternalContainerAnnotationForConvert; -import com.vaadin.flow.template.angular.model.TemplateModel; -import com.vaadin.flow.model.ModelConverter; - /** * Defines a ModelConverter on a template model property found through * {@link #path()}. *

* Use this annotation on setters in your {@link TemplateModel} class to perform * type conversions on properties. - * + * * @see ModelConverter - * + * * @author Vaadin Ltd */ @Retention(RetentionPolicy.RUNTIME) @@ -44,7 +40,7 @@ /** * The ModelConverter class to use for conversion of the property found * through {{@link #path()}. - * + * * @return the ModelConverter class */ Class> value(); @@ -53,7 +49,7 @@ * The dot separated path from the TemplateModel property to the value to * apply conversion to. Empty string by default, which will apply conversion * directly to the property. - * + * * @return the dot separated path to the bean property to convert, empty * string by default */ diff --git a/flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForConvert.java b/flow-server/src/main/java/com/vaadin/flow/model/InternalContainerAnnotationForConvert.java similarity index 94% rename from flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForConvert.java rename to flow-server/src/main/java/com/vaadin/flow/model/InternalContainerAnnotationForConvert.java index 5c47e1cb555..dd71c2dcbdd 100644 --- a/flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForConvert.java +++ b/flow-server/src/main/java/com/vaadin/flow/model/InternalContainerAnnotationForConvert.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.annotations; +package com.vaadin.flow.model; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -21,14 +21,12 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.flow.model.Convert; - /** * Annotation enabling use of multiple {@link Convert} annotations. *

* NOT meant to be used, for multiple converters, {@link Convert} should * be used instead. - * + * * @author Vaadin Ltd */ @Retention(RetentionPolicy.RUNTIME) diff --git a/flow-server/src/main/java/com/vaadin/ui/common/HtmlImport.java b/flow-server/src/main/java/com/vaadin/ui/common/HtmlImport.java index d47707f047f..5c1aa019750 100644 --- a/flow-server/src/main/java/com/vaadin/ui/common/HtmlImport.java +++ b/flow-server/src/main/java/com/vaadin/ui/common/HtmlImport.java @@ -23,7 +23,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.annotations.InternalContainerAnnotationForHtml; import com.vaadin.shared.ui.LoadMode; import com.vaadin.ui.Component; import com.vaadin.ui.WebComponents; diff --git a/flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForHtml.java b/flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForHtml.java similarity index 95% rename from flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForHtml.java rename to flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForHtml.java index a983e66213b..f04d9c441a8 100644 --- a/flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForHtml.java +++ b/flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForHtml.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.annotations; +package com.vaadin.ui.common; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -21,8 +21,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.ui.common.HtmlImport; - /** * Annotation enabling using multiple {@link HtmlImport @HtmlImport} * annotations. diff --git a/flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForJS.java b/flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForJS.java similarity index 95% rename from flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForJS.java rename to flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForJS.java index f3e0dd77caa..4dc7db8b918 100644 --- a/flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForJS.java +++ b/flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForJS.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.annotations; +package com.vaadin.ui.common; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -21,8 +21,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.ui.common.JavaScript; - /** * Annotation enabling using multiple {@link JavaScript @JavaScript} * annotations. diff --git a/flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForSS.java b/flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForSS.java similarity index 95% rename from flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForSS.java rename to flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForSS.java index 42b58dea6f3..94b969e68ef 100644 --- a/flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForSS.java +++ b/flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForSS.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.annotations; +package com.vaadin.ui.common; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -21,8 +21,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.ui.common.StyleSheet; - /** * Annotation enabling using multiple {@link StyleSheet @StyleSheet} * annotations. diff --git a/flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForUses.java b/flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForUses.java similarity index 94% rename from flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForUses.java rename to flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForUses.java index 9bf66d0c397..d98967f3c62 100644 --- a/flow-server/src/main/java/com/vaadin/annotations/InternalContainerAnnotationForUses.java +++ b/flow-server/src/main/java/com/vaadin/ui/common/InternalContainerAnnotationForUses.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.annotations; +package com.vaadin.ui.common; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -21,8 +21,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.ui.common.Uses; - /** * Annotation enabling using multiple {@link Uses @Uses} annotations. *

diff --git a/flow-server/src/main/java/com/vaadin/ui/common/JavaScript.java b/flow-server/src/main/java/com/vaadin/ui/common/JavaScript.java index 7657ec8264c..19fa1689b09 100644 --- a/flow-server/src/main/java/com/vaadin/ui/common/JavaScript.java +++ b/flow-server/src/main/java/com/vaadin/ui/common/JavaScript.java @@ -23,7 +23,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.annotations.InternalContainerAnnotationForJS; import com.vaadin.shared.ui.LoadMode; import com.vaadin.ui.Component; diff --git a/flow-server/src/main/java/com/vaadin/ui/common/StyleSheet.java b/flow-server/src/main/java/com/vaadin/ui/common/StyleSheet.java index 3846e55c4e0..f0c51f17e48 100644 --- a/flow-server/src/main/java/com/vaadin/ui/common/StyleSheet.java +++ b/flow-server/src/main/java/com/vaadin/ui/common/StyleSheet.java @@ -23,7 +23,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.annotations.InternalContainerAnnotationForSS; import com.vaadin.shared.ui.LoadMode; import com.vaadin.ui.Component; diff --git a/flow-server/src/main/java/com/vaadin/ui/common/Uses.java b/flow-server/src/main/java/com/vaadin/ui/common/Uses.java index 576c9bbe49c..856ec04ca4f 100644 --- a/flow-server/src/main/java/com/vaadin/ui/common/Uses.java +++ b/flow-server/src/main/java/com/vaadin/ui/common/Uses.java @@ -23,7 +23,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import com.vaadin.annotations.InternalContainerAnnotationForUses; import com.vaadin.ui.Component; /**