diff options
8 files changed, 5 insertions, 67 deletions
diff --git a/bom/pom.xml b/bom/pom.xml index 2f87ce1f27..a0f8e9a1a4 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -17,7 +17,7 @@ <url>http://vaadin.com</url> <properties> - <vaadin.spring.version>2.0.1</vaadin.spring.version> + <vaadin.spring.version>3.0.0.alpha1</vaadin.spring.version> <vaadin.testbench.version>5.1.1</vaadin.testbench.version> <vaadin.cdi.version>2.0.0</vaadin.cdi.version> <vaadin.context-menu.version>2.0.0</vaadin.context-menu.version> diff --git a/test/pom.xml b/test/pom.xml index 375581dc54..80a0a9e4ab 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -43,6 +43,10 @@ <id>vaadin-addons</id> <url>http://maven.vaadin.com/vaadin-addons</url> </repository> + <repository> + <id>vaadin-prereleases</id> + <url>http://maven.vaadin.com/vaadin-prereleases</url> + </repository> </repositories> <dependencyManagement> diff --git a/test/spring-boot-subcontext/src/main/java/com/example/CustomSpringNavigator.java b/test/spring-boot-subcontext/src/main/java/com/example/CustomSpringNavigator.java deleted file mode 100644 index fd11bb1473..0000000000 --- a/test/spring-boot-subcontext/src/main/java/com/example/CustomSpringNavigator.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.example; - -import org.springframework.stereotype.Component; - -import com.vaadin.navigator.ViewDisplay; -import com.vaadin.spring.annotation.UIScope; -import com.vaadin.spring.navigator.SpringNavigator; -import com.vaadin.ui.UI; - -@UIScope -@Component -public class CustomSpringNavigator extends SpringNavigator { - - @Override - public void init(UI ui, ViewDisplay display) { - // FIXME: Should be in Spring plug-in - init(ui, null, display); - } -} diff --git a/test/spring-boot-subcontext/src/main/java/com/example/ui/AbstractSpringUI.java b/test/spring-boot-subcontext/src/main/java/com/example/ui/AbstractSpringUI.java index 2549e7e8a8..9b1ddd82ed 100644 --- a/test/spring-boot-subcontext/src/main/java/com/example/ui/AbstractSpringUI.java +++ b/test/spring-boot-subcontext/src/main/java/com/example/ui/AbstractSpringUI.java @@ -52,11 +52,4 @@ abstract class AbstractSpringUI extends UI { event -> getUI().getNavigator().navigateTo(viewName)); return button; } - - @Override - public String getUiRootPath() { - // FIXME: Should be handled by Spring plug-in - return super.getUiRootPath() + "/" - + getClass().getAnnotation(SpringUI.class).path(); - } } diff --git a/test/spring-boot-subcontext/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java b/test/spring-boot-subcontext/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java index 41692789f7..812fa00fee 100644 --- a/test/spring-boot-subcontext/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java +++ b/test/spring-boot-subcontext/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java @@ -6,13 +6,6 @@ import org.junit.Test; public class VaadinSpringBootPushStateNavigatorIT extends VaadinSpringBootURIFragmentNavigatorIT { - @Ignore("PushState navigation is partially broken with Spring.") - @Override - @Test - public void testNotDefaultView() { - super.testNotDefaultView(); - } - @Override protected String getPath() { return "subpath"; diff --git a/test/spring-boot/src/main/java/com/example/CustomSpringNavigator.java b/test/spring-boot/src/main/java/com/example/CustomSpringNavigator.java deleted file mode 100644 index fd11bb1473..0000000000 --- a/test/spring-boot/src/main/java/com/example/CustomSpringNavigator.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.example; - -import org.springframework.stereotype.Component; - -import com.vaadin.navigator.ViewDisplay; -import com.vaadin.spring.annotation.UIScope; -import com.vaadin.spring.navigator.SpringNavigator; -import com.vaadin.ui.UI; - -@UIScope -@Component -public class CustomSpringNavigator extends SpringNavigator { - - @Override - public void init(UI ui, ViewDisplay display) { - // FIXME: Should be in Spring plug-in - init(ui, null, display); - } -} diff --git a/test/spring-boot/src/main/java/com/example/ui/AbstractSpringUI.java b/test/spring-boot/src/main/java/com/example/ui/AbstractSpringUI.java index 2549e7e8a8..9b1ddd82ed 100644 --- a/test/spring-boot/src/main/java/com/example/ui/AbstractSpringUI.java +++ b/test/spring-boot/src/main/java/com/example/ui/AbstractSpringUI.java @@ -52,11 +52,4 @@ abstract class AbstractSpringUI extends UI { event -> getUI().getNavigator().navigateTo(viewName)); return button; } - - @Override - public String getUiRootPath() { - // FIXME: Should be handled by Spring plug-in - return super.getUiRootPath() + "/" - + getClass().getAnnotation(SpringUI.class).path(); - } } diff --git a/test/spring-boot/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java b/test/spring-boot/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java index 41692789f7..812fa00fee 100644 --- a/test/spring-boot/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java +++ b/test/spring-boot/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java @@ -6,13 +6,6 @@ import org.junit.Test; public class VaadinSpringBootPushStateNavigatorIT extends VaadinSpringBootURIFragmentNavigatorIT { - @Ignore("PushState navigation is partially broken with Spring.") - @Override - @Test - public void testNotDefaultView() { - super.testNotDefaultView(); - } - @Override protected String getPath() { return "subpath"; |