Started conversion to jakarta namespace

2021-08-21 15:11:04 +02:00
parent e88922b3cd
commit c090178bbf
68 changed files with 193 additions and 194 deletions
--- a/java-se-cdi/pom.xml
+++ b/java-se-cdi/pom.xml
@@ -120,13 +120,13 @@
        <dependency>
            <groupId>jakarta.enterprise</groupId>
            <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>2.0.2</version>
+            <version>3.0.0</version>
        </dependency>

        <dependency>
            <groupId>org.jboss.weld.se</groupId>
            <artifactId>weld-se-core</artifactId>
-            <version>3.1.5.SP1</version>
+            <version>4.0.2.Final</version>
        </dependency>

        <dependency>
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/app/CmdExampleApp.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/app/CmdExampleApp.java
@@ -14,11 +14,11 @@ package org.fuin.cqrs4j.example.javasecdi.cmd.app;

 import java.util.UUID;

-import javax.enterprise.context.control.ActivateRequestContext;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
-import javax.inject.Inject;
+import jakarta.enterprise.context.control.ActivateRequestContext;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
+import jakarta.inject.Inject;

 import org.fuin.cqrs4j.example.javasecdi.cmd.domain.Person;
 import org.fuin.cqrs4j.example.javasecdi.cmd.domain.PersonRepository;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/DuplicatePersonNameException.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/DuplicatePersonNameException.java
@@ -1,6 +1,6 @@
 package org.fuin.cqrs4j.example.javasecdi.cmd.domain;

-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;

 import org.fuin.cqrs4j.example.shared.PersonId;
 import org.fuin.cqrs4j.example.shared.PersonName;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/Person.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/Person.java
@@ -2,7 +2,7 @@ package org.fuin.cqrs4j.example.javasecdi.cmd.domain;

 import java.io.Serializable;

-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;

 import org.fuin.cqrs4j.example.shared.PersonCreatedEvent;
 import org.fuin.cqrs4j.example.shared.PersonId;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/PersonRepository.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/PersonRepository.java
@@ -1,7 +1,7 @@
 package org.fuin.cqrs4j.example.javasecdi.cmd.domain;

 import org.fuin.objects4j.common.NotThreadSafe;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;

 import org.fuin.cqrs4j.example.shared.PersonId;
 import org.fuin.ddd4j.ddd.EntityType;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/PersonRepositoryFactory.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/PersonRepositoryFactory.java
@@ -1,8 +1,8 @@
 package org.fuin.cqrs4j.example.javasecdi.cmd.domain;

-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;

 import org.fuin.esc.api.EventStore;

--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryEntityManagerProducer.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryEntityManagerProducer.java
@@ -1,11 +1,11 @@
 package org.fuin.cqrs4j.example.javasecdi.qry.app;

-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;

 import org.apache.deltaspike.jpa.api.transaction.TransactionScoped;

--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryExampleApp.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryExampleApp.java
@@ -17,8 +17,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;

-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
 import javax.inject.Inject;

 import org.fuin.ext4logback.LogbackStandalone;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryProjectionAdminEventStoreFactory.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryProjectionAdminEventStoreFactory.java
@@ -4,10 +4,10 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.concurrent.ThreadFactory;

-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;

 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryScheduledExecutorService.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryScheduledExecutorService.java
@@ -4,8 +4,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadFactory;

-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;

 /**
 * CDI producer that creates an {@link ScheduledExecutorService}.
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryThreadFactoryFactory.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryThreadFactoryFactory.java
@@ -3,8 +3,8 @@ package org.fuin.cqrs4j.example.javasecdi.qry.app;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;

-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;

 /**
 * Creates an thread factory.
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryTimer.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryTimer.java
@@ -1,7 +1,7 @@
 package org.fuin.cqrs4j.example.javasecdi.qry.app;

-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
 import javax.inject.Inject;

@ApplicationScoped
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/domain/QryPerson.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/domain/QryPerson.java
@@ -1,10 +1,10 @@
 package org.fuin.cqrs4j.example.javasecdi.qry.domain;

-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/PersonCreatedEventHandler.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/PersonCreatedEventHandler.java
@@ -1,6 +1,6 @@
 package org.fuin.cqrs4j.example.javasecdi.qry.handler;

-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;

 import org.apache.deltaspike.jpa.api.transaction.Transactional;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryEventChunkHandler.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryEventChunkHandler.java
@@ -1,6 +1,6 @@
 package org.fuin.cqrs4j.example.javasecdi.qry.handler;

-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;

 import org.apache.deltaspike.jpa.api.transaction.Transactional;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryEventDispatcherFactory.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryEventDispatcherFactory.java
@@ -1,7 +1,7 @@
 package org.fuin.cqrs4j.example.javasecdi.qry.handler;

-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;

 import org.fuin.cqrs4j.EventDispatcher;
 import org.fuin.cqrs4j.SimpleEventDispatcher;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryPersonProjectionPosition.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryPersonProjectionPosition.java
@@ -1,10 +1,10 @@
 package org.fuin.cqrs4j.example.javasecdi.qry.handler;

-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;

 import org.fuin.esc.api.SimpleStreamId;
 import org.fuin.esc.api.StreamId;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryPersonProjectionPositionRepository.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryPersonProjectionPositionRepository.java
@@ -1,6 +1,6 @@
 package org.fuin.cqrs4j.example.javasecdi.qry.handler;

-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;

 import org.apache.deltaspike.data.api.AbstractEntityRepository;
 import org.apache.deltaspike.data.api.Repository;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryProjector.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryProjector.java
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Semaphore;

-import javax.enterprise.event.ObservesAsync;
+import jakarta.enterprise.event.ObservesAsync;
 import javax.inject.Inject;

 import org.fuin.cqrs4j.EventDispatcher;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedConfig.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedConfig.java
@@ -12,7 +12,7 @@
 */
 package org.fuin.cqrs4j.example.javasecdi.shared.app;

-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;

 import org.eclipse.microprofile.config.inject.ConfigProperty;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedEsjcEventStoreFactory.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedEsjcEventStoreFactory.java
@@ -14,8 +14,8 @@ package org.fuin.cqrs4j.example.javasecdi.shared.app;

 import java.util.concurrent.Executors;

-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;

 import com.github.msemys.esjc.EventStore;
 import com.github.msemys.esjc.EventStoreBuilder;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedEventStoreFactory.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedEventStoreFactory.java
@@ -2,10 +2,10 @@ package org.fuin.cqrs4j.example.javasecdi.shared.app;

 import java.nio.charset.Charset;

-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;

 import org.fuin.esc.api.EventStore;
 import org.fuin.esc.esjc.ESJCEventStore;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedExecutorServiceFactory.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedExecutorServiceFactory.java
@@ -15,8 +15,8 @@ package org.fuin.cqrs4j.example.javasecdi.shared.app;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;

 /**
 * Creates an executor service.
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedSerDeserializerRegistryFactory.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedSerDeserializerRegistryFactory.java
@@ -1,7 +1,7 @@
 package org.fuin.cqrs4j.example.javasecdi.shared.app;

-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;

 import org.fuin.esc.spi.JsonbDeSerializer;
 import org.fuin.esc.spi.SerDeserializerRegistry;
--- a/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedUtils.java
+++ b/java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedUtils.java
@@ -19,8 +19,6 @@ package org.fuin.cqrs4j.example.javasecdi.shared.app;

 import java.nio.charset.Charset;

-import javax.json.bind.adapter.JsonbAdapter;
-
 import org.eclipse.yasson.FieldAccessStrategy;
 import org.fuin.cqrs4j.example.shared.PersonCreatedEvent;
 import org.fuin.cqrs4j.example.shared.PersonId;
@@ -39,6 +37,8 @@ import org.fuin.esc.spi.SerializedDataTypeRegistry;
 import org.fuin.esc.spi.SimpleSerializedDataTypeRegistry;
 import org.fuin.esc.spi.SimpleSerializerDeserializerRegistry;

+import jakarta.json.bind.adapter.JsonbAdapter;
+

 /**
 * Utility code shared between command (write) and query (read) module.