You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/12/16 14:24:47 UTC
[isis] branch spring6 updated: ISIS-3275: use vaadin preview with jakarta namespaces (build fix)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/spring6 by this push:
new eb0b6d966c ISIS-3275: use vaadin preview with jakarta namespaces (build fix)
eb0b6d966c is described below
commit eb0b6d966c9dc4b585153a9a65afba5172315983
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 16 15:24:39 2022 +0100
ISIS-3275: use vaadin preview with jakarta namespaces (build fix)
---
bom/pom.xml | 12 +++++++-
incubator/viewers/vaadin/ui/pom.xml | 1 -
.../vaadin/ui/auth/AuthSessionStoreUtil.java | 12 +++-----
.../CausewayModuleIncViewerVaadinViewer.java | 11 +++++--
.../vaadin/viewer/CausewayServletForVaadin.java | 36 ++++++++--------------
5 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 770bf8c520..daf19df0f7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -189,7 +189,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<togglz.version>3.3.2</togglz.version>
- <vaadin.version>23.3.0</vaadin.version>
+ <vaadin.version>24.0.0.alpha5</vaadin.version>
<wicket.version>936167650a</wicket.version> <!-- 9.4.0 is last known good, before wicket put jupiter-api on the module graph -->
@@ -591,6 +591,11 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-maven-plugin</artifactId>
+ <version>${vaadin.version}</version>
+ </dependency>
<dependency>
<!-- <groupId>org.apache.wicket</groupId> -->
@@ -976,6 +981,11 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <!-- temporary till release of vaadin 24.x with jakarta namespaces -->
+ <id>vaadin.prereleases</id>
+ <url>https://maven.vaadin.com/vaadin-prereleases/</url>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
diff --git a/incubator/viewers/vaadin/ui/pom.xml b/incubator/viewers/vaadin/ui/pom.xml
index 7911b5b703..f3026e1f65 100644
--- a/incubator/viewers/vaadin/ui/pom.xml
+++ b/incubator/viewers/vaadin/ui/pom.xml
@@ -65,7 +65,6 @@
<plugin>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-maven-plugin</artifactId>
- <version>${vaadin.version}</version>
<executions>
<execution>
<id>frontend</id>
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/AuthSessionStoreUtil.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/AuthSessionStoreUtil.java
index ac979fc559..0440953499 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/AuthSessionStoreUtil.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/AuthSessionStoreUtil.java
@@ -20,13 +20,14 @@ package org.apache.causeway.incubator.viewer.vaadin.ui.auth;
import java.util.Optional;
-//import com.vaadin.flow.server.VaadinSession; TODO[ISIS-3275] no support for jakarta API
+import jakarta.servlet.http.HttpSession;
+
+import com.vaadin.flow.server.VaadinSession;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import jakarta.servlet.http.HttpSession;
import lombok.NonNull;
import lombok.experimental.UtilityClass;
@@ -56,23 +57,20 @@ public class AuthSessionStoreUtil {
/** when within a VaadinSession */
public static void put(
final @Nullable InteractionContext auth) {
- /* TODO[ISIS-3275] no support for jakarta API
+
Optional.ofNullable(VaadinSession.getCurrent())
.map(VaadinSession::getSession)
.ifPresent(sessionVaa->{
sessionVaa.setAttribute(InteractionContext.class.getName(), auth);
});
- */
+
}
/** when within a VaadinSession */
public static Optional<InteractionContext> get() {
- /* TODO[ISIS-3275] no support for jakarta API
return Optional.ofNullable(
(InteractionContext)VaadinSession.getCurrent().getSession()
.getAttribute(InteractionContext.class.getName()));
- */
- return Optional.empty();
}
/** when within a VaadinSession */
diff --git a/incubator/viewers/vaadin/viewer/src/main/java/org/apache/causeway/incubator/viewer/vaadin/viewer/CausewayModuleIncViewerVaadinViewer.java b/incubator/viewers/vaadin/viewer/src/main/java/org/apache/causeway/incubator/viewer/vaadin/viewer/CausewayModuleIncViewerVaadinViewer.java
index 2b24c44993..a6de47f4af 100644
--- a/incubator/viewers/vaadin/viewer/src/main/java/org/apache/causeway/incubator/viewer/vaadin/viewer/CausewayModuleIncViewerVaadinViewer.java
+++ b/incubator/viewers/vaadin/viewer/src/main/java/org/apache/causeway/incubator/viewer/vaadin/viewer/CausewayModuleIncViewerVaadinViewer.java
@@ -19,25 +19,33 @@
package org.apache.causeway.incubator.viewer.vaadin.viewer;
+import java.util.HashMap;
+
import jakarta.inject.Inject;
+import com.vaadin.flow.spring.RootMappedCondition;
import com.vaadin.flow.spring.SpringBootAutoConfiguration;
+import com.vaadin.flow.spring.SpringServlet;
import com.vaadin.flow.spring.VaadinConfigurationProperties;
import com.vaadin.flow.spring.VaadinServletContextInitializer;
import com.vaadin.flow.spring.VaadinWebsocketEndpointExporter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.web.servlet.ServletContextInitializer;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
+import org.springframework.util.ClassUtils;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.incubator.viewer.vaadin.ui.CausewayModuleIncViewerVaadinUi;
+import lombok.val;
+
/**
*
* @since 2.0
@@ -81,7 +89,6 @@ public class CausewayModuleIncViewerVaadinViewer {
*
* @return a custom ServletRegistrationBean instance
*/
- /* TODO[ISIS-3275] no support for jakarta API
@Bean
public ServletRegistrationBean<SpringServlet> servletRegistrationBean() {
String urlMapping = configurationProperties.getUrlMapping();
@@ -100,7 +107,7 @@ public class CausewayModuleIncViewerVaadinViewer {
registration.setAsyncSupported(configurationProperties.isAsyncSupported());
registration.setName(ClassUtils.getShortNameAsProperty(SpringServlet.class));
return registration;
- }*/
+ }
/**
* Deploys JSR-356 websocket endpoints when Atmosphere is available.
diff --git a/incubator/viewers/vaadin/viewer/src/main/java/org/apache/causeway/incubator/viewer/vaadin/viewer/CausewayServletForVaadin.java b/incubator/viewers/vaadin/viewer/src/main/java/org/apache/causeway/incubator/viewer/vaadin/viewer/CausewayServletForVaadin.java
index 657ed416c9..9bb53d2d0e 100644
--- a/incubator/viewers/vaadin/viewer/src/main/java/org/apache/causeway/incubator/viewer/vaadin/viewer/CausewayServletForVaadin.java
+++ b/incubator/viewers/vaadin/viewer/src/main/java/org/apache/causeway/incubator/viewer/vaadin/viewer/CausewayServletForVaadin.java
@@ -18,24 +18,22 @@
*/
package org.apache.causeway.incubator.viewer.vaadin.viewer;
-import com.vaadin.flow.spring.SpringServlet;
-
-//import java.io.IOException;
+import java.io.IOException;
-//import jakarta.servlet.ServletException;
-//import jakarta.servlet.http.HttpServletRequest;
-//import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-//import com.vaadin.flow.spring.SpringServlet;
+import com.vaadin.flow.spring.SpringServlet;
-//import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContext;
import org.apache.causeway.applib.services.iactn.Interaction;
-//import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-//import org.apache.causeway.incubator.viewer.vaadin.ui.auth.AuthSessionStoreUtil;
+import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.incubator.viewer.vaadin.ui.auth.AuthSessionStoreUtil;
-//import lombok.NonNull;
-//import lombok.val;
+import lombok.NonNull;
+import lombok.val;
import lombok.extern.log4j.Log4j2;
/**
@@ -44,12 +42,7 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Log4j2
-public class CausewayServletForVaadin {
-
-/* TODO[ISIS-3275] no support for jakarta API
-
-
-extends SpringServlet {
+public class CausewayServletForVaadin extends SpringServlet {
private static final long serialVersionUID = 1L;
@@ -65,8 +58,8 @@ extends SpringServlet {
@Override
- protected void service(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
+ protected void service(final HttpServletRequest request,
+ final HttpServletResponse response) throws ServletException, IOException {
val authentication = AuthSessionStoreUtil.get(request.getSession(true))
.orElse(null);
@@ -92,7 +85,4 @@ extends SpringServlet {
}
-*/
-
-
}