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 5ca4476847 ISIS-3275: migrate incubating viewers
5ca4476847 is described below
commit 5ca44768471b99599df757953b7aac5af7bf6932
Author: Andi Huber <[email protected]>
AuthorDate: Sun Nov 13 11:53:58 2022 +0100
ISIS-3275: migrate incubating viewers
---
.../viewer/test/source/EndToEnd_IntegTest.java | 2 +-
.../viewer/test/source/GQLSchema_IntegTest.java | 2 +-
.../viewer/test/source/gqltestdomain/E1.java | 14 +++++------
.../viewer/test/source/gqltestdomain/E2.java | 22 ++++++++--------
.../source/gqltestdomain/GQLTestDomainMenu.java | 6 ++---
.../source/gqltestdomain/TestEntityRepository.java | 2 +-
.../graphql/viewer/src/main/java/module-info.java | 6 ++---
...xecutionStrategyResolvingWithinInteraction.java | 2 +-
.../viewer/source/GraphQlServiceForCauseway.java | 2 +-
.../viewer/source/GraphQlSourceForCauseway.java | 4 +--
.../graphql/viewer/source/ObjectTypeFactory.java | 2 +-
.../graphql/viewer/source/QueryFieldFactory.java | 2 +-
incubator/viewers/javafx/pom.xml | 4 +--
.../javafx/ui/components/UiComponentFactoryFx.java | 2 +-
.../ui/components/markup/MarkupFieldFactory.java | 4 +--
.../ui/components/number/NumberFieldFactory.java | 4 +--
.../objectref/ObjectReferenceFieldFactory.java | 4 +--
.../ui/components/other/FallbackFieldFactory.java | 2 +-
.../components/temporal/TemporalFieldFactory.java | 4 +--
.../ui/components/text/TextFieldFactory.java | 4 +--
.../disabling/DisablingDecoratorForButton.java | 2 +-
.../disabling/DisablingDecoratorForFormField.java | 2 +-
.../ui/decorator/icon/IconDecoratorForLabeled.java | 2 +-
.../decorator/icon/IconDecoratorForMenuItem.java | 2 +-
.../ui/decorator/icon/IconServiceDefault.java | 4 +--
.../prototyping/PrototypingDecoratorForButton.java | 2 +-
.../PrototypingDecoratorForFormField.java | 2 +-
.../prototyping/PrototypingInfoPopupProvider.java | 4 +--
.../viewer/javafx/ui/main/MainViewFx.java | 2 +-
.../viewer/javafx/ui/main/UiActionHandlerFx.java | 2 +-
.../viewer/javafx/ui/main/UiBuilderFx.java | 2 +-
.../viewer/javafx/ui/main/UiContextFxDefault.java | 2 +-
.../vaadin/ui/auth/AuthSessionStoreUtil.java | 10 +++++---
.../viewer/vaadin/ui/auth/LogoutHandlerVaa.java | 2 +-
.../ui/auth/VaadinAuthenticationHandler.java | 2 +-
.../ui/components/UiComponentFactoryVaa.java | 2 +-
.../ui/components/blob/BlobFieldFactory.java | 2 +-
.../ui/components/clob/ClobFieldFactory.java | 2 +-
.../ui/components/markup/MarkupFieldFactory.java | 2 +-
.../ui/components/other/FallbackFieldFactory.java | 6 ++---
.../components/temporal/TemporalFieldFactory.java | 2 +-
.../ui/components/text/TextFieldFactory.java | 2 +-
.../ui/components/text/uuid/UuidFieldFactory.java | 2 +-
.../vaadin/ui/pages/login/VaadinLoginView.java | 2 +-
.../viewer/vaadin/ui/pages/main/MainViewVaa.java | 2 +-
.../vaadin/ui/pages/main/UiActionHandlerVaa.java | 2 +-
.../vaadin/ui/pages/main/UiContextVaaDefault.java | 2 +-
.../CausewayModuleIncViewerVaadinViewer.java | 14 +++--------
.../vaadin/viewer/CausewayServletForVaadin.java | 29 ++++++++++++++--------
49 files changed, 105 insertions(+), 102 deletions(-)
diff --git
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java
index 727ed22008..a49a39d432 100644
---
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java
+++
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java
@@ -30,7 +30,7 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java
index c49a74b826..0e5290572e 100644
---
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java
+++
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java
@@ -20,7 +20,7 @@ package org.apache.causeway.viewer.graphql.viewer.test.source;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
diff --git
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E1.java
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E1.java
index 2cb68b146c..0f614e4c19 100644
---
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E1.java
+++
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E1.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain;
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E2.java
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E2.java
index d2af239bc8..6ef9f9947d 100644
---
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E2.java
+++
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E2.java
@@ -22,17 +22,17 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Collection;
diff --git
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/GQLTestDomainMenu.java
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/GQLTestDomainMenu.java
index 8ff8d37593..586a1d7f5e 100644
---
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/GQLTestDomainMenu.java
+++
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/GQLTestDomainMenu.java
@@ -20,8 +20,8 @@ package
org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain;
import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.springframework.lang.Nullable;
@@ -36,7 +36,7 @@ import lombok.RequiredArgsConstructor;
@Named("gqltestdomain.GQLTestDomainMenu")
@DomainService(
nature=NatureOfService.VIEW)
[email protected](PriorityPrecedence.EARLY)
[email protected](PriorityPrecedence.EARLY)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class GQLTestDomainMenu {
diff --git
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestEntityRepository.java
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestEntityRepository.java
index 86f3bcb3e8..c0673d44bf 100644
---
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestEntityRepository.java
+++
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestEntityRepository.java
@@ -21,7 +21,7 @@ package
org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Repository;
diff --git a/incubator/viewers/graphql/viewer/src/main/java/module-info.java
b/incubator/viewers/graphql/viewer/src/main/java/module-info.java
index a6d381a48e..8d030e0343 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/module-info.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/module-info.java
@@ -5,10 +5,10 @@ module org.apache.causeway.incubator.viewer.graphql.viewer {
requires com.fasterxml.jackson.core;
requires com.fasterxml.jackson.databind;
requires com.graphqljava;
- requires java.annotation;
- requires java.inject;
+ requires jakarta.annotation;
+ requires jakarta.inject;
requires java.net.http;
- requires java.persistence;
+ requires jakarta.persistence;
requires lombok;
requires org.apache.causeway.applib;
requires org.apache.causeway.commons;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ExecutionStrategyResolvingWithinInteraction.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ExecutionStrategyResolvingWithinInteraction.java
index d88f289bb3..b0be96cfdc 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ExecutionStrategyResolvingWithinInteraction.java
+++
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ExecutionStrategyResolvingWithinInteraction.java
@@ -20,7 +20,7 @@ package org.apache.causeway.viewer.graphql.viewer.source;
import java.util.concurrent.CompletableFuture;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlServiceForCauseway.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlServiceForCauseway.java
index 281d2f709f..99205b17b5 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlServiceForCauseway.java
+++
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlServiceForCauseway.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.viewer.graphql.viewer.source;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.graphql.ExecutionGraphQlRequest;
import org.springframework.graphql.ExecutionGraphQlResponse;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForCauseway.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForCauseway.java
index 5d76c596d6..11f8254f00 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForCauseway.java
+++
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForCauseway.java
@@ -25,8 +25,8 @@ import static graphql.schema.GraphQLObjectType.newObject;
import java.util.HashSet;
import java.util.Set;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
import org.springframework.graphql.execution.GraphQlSource;
import org.springframework.stereotype.Service;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
index 82469262c8..9b42857dfd 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
+++
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Component;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java
index 6488f09124..e8998781d7 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java
+++
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Component;
diff --git a/incubator/viewers/javafx/pom.xml b/incubator/viewers/javafx/pom.xml
index 01ed161fbc..5f081011d0 100644
--- a/incubator/viewers/javafx/pom.xml
+++ b/incubator/viewers/javafx/pom.xml
@@ -30,10 +30,10 @@
</description>
<properties>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>17</maven.compiler.release>
<jar-plugin.automaticModuleName>org.apache.causeway.incubator.viewer.javafx</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/causeway/incubator/viewer/javafx</git-plugin.propertiesDir>
- <javafx.version>11.0.2</javafx.version>
+ <javafx.version>17.0.2</javafx.version>
</properties>
<packaging>pom</packaging>
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java
index c2d84b1a7b..861deb487f 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java
@@ -21,7 +21,7 @@ package
org.apache.causeway.incubator.viewer.javafx.ui.components;
import java.util.List;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java
index f7772fa038..9f47cec77a 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java
@@ -21,7 +21,7 @@ package
org.apache.causeway.incubator.viewer.javafx.ui.components.markup;
import java.util.OptionalInt;
import java.util.function.Consumer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.w3c.dom.events.EventTarget;
import org.w3c.dom.html.HTMLAnchorElement;
@@ -46,7 +46,7 @@ import lombok.extern.log4j.Log4j2;
import netscape.javascript.JSException;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class MarkupFieldFactory implements UiComponentHandlerFx {
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/number/NumberFieldFactory.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/number/NumberFieldFactory.java
index 22b86570aa..b11b8de496 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/number/NumberFieldFactory.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/number/NumberFieldFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.javafx.ui.components.number;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.util.ClassUtils;
@@ -35,7 +35,7 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
//@Log4j2
public class NumberFieldFactory implements UiComponentHandlerFx {
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java
index f343a00a01..b210d8fa2c 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.javafx.ui.components.objectref;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import
org.apache.causeway.core.metamodel.interactions.managed.ManagedParameter;
@@ -32,7 +32,7 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class ObjectReferenceFieldFactory implements UiComponentHandlerFx {
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java
index 3e42a8b409..d253785b36 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java
@@ -27,7 +27,7 @@ import javafx.scene.control.Label;
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.LAST)
[email protected](PriorityPrecedence.LAST)
public class FallbackFieldFactory implements UiComponentHandlerFx {
@Override
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/temporal/TemporalFieldFactory.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/temporal/TemporalFieldFactory.java
index 2380cd6c2c..34a95a7ef9 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/temporal/TemporalFieldFactory.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/temporal/TemporalFieldFactory.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.incubator.viewer.javafx.ui.components.temporal;
import java.time.LocalDate;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.value.semantics.TemporalValueSemantics;
@@ -40,7 +40,7 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class TemporalFieldFactory implements UiComponentHandlerFx {
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java
index b6e838d633..dc82789e87 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.javafx.ui.components.text;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.incubator.viewer.javafx.model.binding.BindingsFx;
@@ -33,7 +33,7 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class TextFieldFactory implements UiComponentHandlerFx {
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java
index d8776eead9..7327deb123 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.javafx.ui.decorator.disabling;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Component;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java
index 1b9066c786..58fa3d8c57 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.javafx.ui.decorator.disabling;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Component;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java
index c7e5dc04b1..d4602d7017 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.incubator.viewer.javafx.ui.decorator.icon;
import java.util.Optional;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Component;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java
index 93dfdb9144..1a9a9dc45e 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.incubator.viewer.javafx.ui.decorator.icon;
import java.util.Optional;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Component;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java
index e9aa110c7b..b68bc3cfc3 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java
@@ -21,8 +21,8 @@ package
org.apache.causeway.incubator.viewer.javafx.ui.decorator.icon;
import java.util.Map;
import java.util.Optional;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java
index 41131a75aa..6e6b9f817c 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.javafx.ui.decorator.prototyping;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Component;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java
index 059e25ea65..612153ee75 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.javafx.ui.decorator.prototyping;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Component;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java
index 925a89bb02..0ca1023486 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java
@@ -20,8 +20,8 @@ package
org.apache.causeway.incubator.viewer.javafx.ui.decorator.prototyping;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import org.springframework.stereotype.Component;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MainViewFx.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MainViewFx.java
index c3c0527986..9ea2c64a59 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MainViewFx.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MainViewFx.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.javafx.ui.main;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Component;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java
index ce7b333695..727a18d959 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.javafx.ui.main;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiBuilderFx.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiBuilderFx.java
index eaae1d0b7a..19b020b0cb 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiBuilderFx.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiBuilderFx.java
@@ -20,7 +20,7 @@ package org.apache.causeway.incubator.viewer.javafx.ui.main;
import java.util.Optional;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.context.ApplicationContext;
import org.springframework.context.event.EventListener;
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiContextFxDefault.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiContextFxDefault.java
index 659f85d73e..a064037bc3 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiContextFxDefault.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiContextFxDefault.java
@@ -22,7 +22,7 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
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 7c764d9282..ac979fc559 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,14 +20,13 @@ package org.apache.causeway.incubator.viewer.vaadin.ui.auth;
import java.util.Optional;
-import javax.servlet.http.HttpSession;
-
-import com.vaadin.flow.server.VaadinSession;
+//import com.vaadin.flow.server.VaadinSession; TODO[ISIS-3275] no support for
jakarta API
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;
@@ -57,18 +56,23 @@ 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/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/LogoutHandlerVaa.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/LogoutHandlerVaa.java
index 43c19ae9e8..92e6ae54b3 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/LogoutHandlerVaa.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/LogoutHandlerVaa.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.vaadin.ui.auth;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.vaadin.flow.server.VaadinRequest;
import com.vaadin.flow.server.VaadinSession;
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
index 80f94cf1f5..cd14fdccee 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
@@ -20,7 +20,7 @@ package org.apache.causeway.incubator.viewer.vaadin.ui.auth;
import java.util.concurrent.Callable;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.vaadin.flow.component.page.AppShellConfigurator;
import com.vaadin.flow.router.BeforeEnterEvent;
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java
index f3cb2afe8a..b2ccac3b16 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java
@@ -21,7 +21,7 @@ package
org.apache.causeway.incubator.viewer.vaadin.ui.components;
import java.util.List;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.vaadin.flow.component.Component;
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/blob/BlobFieldFactory.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/blob/BlobFieldFactory.java
index a1780e79c4..8a1de34f42 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/blob/BlobFieldFactory.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/blob/BlobFieldFactory.java
@@ -28,7 +28,7 @@ import
org.apache.causeway.viewer.commons.model.components.UiComponentFactory.Co
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
public class BlobFieldFactory implements UiComponentHandlerVaa {
@Override
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/clob/ClobFieldFactory.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/clob/ClobFieldFactory.java
index 48ef81c2b5..fc3e3d7371 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/clob/ClobFieldFactory.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/clob/ClobFieldFactory.java
@@ -28,7 +28,7 @@ import
org.apache.causeway.viewer.commons.model.components.UiComponentFactory.Co
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
public class ClobFieldFactory implements UiComponentHandlerVaa {
@Override
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/markup/MarkupFieldFactory.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/markup/MarkupFieldFactory.java
index 87f4c56bcd..2411f864cf 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/markup/MarkupFieldFactory.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/markup/MarkupFieldFactory.java
@@ -27,7 +27,7 @@ import
org.apache.causeway.viewer.commons.model.components.UiComponentFactory.Co
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
public class MarkupFieldFactory implements UiComponentHandlerVaa {
@Override
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java
index bd632f3c89..f65f868ca2 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java
@@ -20,8 +20,8 @@ package
org.apache.causeway.incubator.viewer.vaadin.ui.components.other;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import com.vaadin.flow.component.Component;
@@ -38,7 +38,7 @@ import org.apache.causeway.viewer.commons.model.mock.UiMockup;
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.LAST)
[email protected](PriorityPrecedence.LAST)
public class FallbackFieldFactory implements UiComponentHandlerVaa {
@Inject private Provider<UiComponentFactoryVaa> uiComponentFactory;
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java
index b1d985ba55..aeaa19a8fd 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java
@@ -38,7 +38,7 @@ import
org.apache.causeway.viewer.commons.model.components.UiComponentFactory.Co
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
public class TemporalFieldFactory implements UiComponentHandlerVaa {
@Override
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/text/TextFieldFactory.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/text/TextFieldFactory.java
index c61016cfc1..be17f6748f 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/text/TextFieldFactory.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/text/TextFieldFactory.java
@@ -29,7 +29,7 @@ import
org.apache.causeway.viewer.commons.model.components.UiComponentFactory.Co
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
public class TextFieldFactory implements UiComponentHandlerVaa {
@Override
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/text/uuid/UuidFieldFactory.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/text/uuid/UuidFieldFactory.java
index ee0a95c45f..28c831f978 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/text/uuid/UuidFieldFactory.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/text/uuid/UuidFieldFactory.java
@@ -32,7 +32,7 @@ import
org.apache.causeway.viewer.commons.model.components.UiComponentFactory.Co
import lombok.val;
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
public class UuidFieldFactory implements UiComponentHandlerVaa {
@Override
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java
index 8ae9bc05e6..d2f1761e2f 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.vaadin.ui.pages.login;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.vaadin.flow.component.ClickEvent;
import com.vaadin.flow.component.ComponentEventListener;
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java
index 4c433467e5..112f28a10d 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.vaadin.ui.pages.main;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.applayout.AppLayout;
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java
index 97f7945bf3..6598472202 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.incubator.viewer.vaadin.ui.pages.main;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java
index 7dfd335644..4052aa29b5 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java
@@ -21,7 +21,7 @@ package
org.apache.causeway.incubator.viewer.vaadin.ui.pages.main;
import java.util.Optional;
import java.util.function.Consumer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.vaadin.flow.component.Component;
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 cbe5a1ded1..894e44d465 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
@@ -18,33 +18,24 @@
*/
package org.apache.causeway.incubator.viewer.vaadin.viewer;
-import java.util.HashMap;
-
-import javax.inject.Inject;
-
-import com.vaadin.flow.server.InitParameters;
-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;
+import jakarta.inject.Inject;
/**
*
@@ -89,6 +80,7 @@ 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();
@@ -106,7 +98,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 fbb53d4de9..657ed416c9 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,22 +18,24 @@
*/
package org.apache.causeway.incubator.viewer.vaadin.viewer;
-import java.io.IOException;
+import com.vaadin.flow.spring.SpringServlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+//import java.io.IOException;
-import com.vaadin.flow.spring.SpringServlet;
+//import jakarta.servlet.ServletException;
+//import jakarta.servlet.http.HttpServletRequest;
+//import jakarta.servlet.http.HttpServletResponse;
+
+//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;
/**
@@ -42,7 +44,11 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Log4j2
-public class CausewayServletForVaadin
+public class CausewayServletForVaadin {
+
+/* TODO[ISIS-3275] no support for jakarta API
+
+
extends SpringServlet {
private static final long serialVersionUID = 1L;
@@ -86,6 +92,7 @@ extends SpringServlet {
}
+*/
}
