mindol1004/ddd-cqrs-4-java-example
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: mindol1004:master
Branches Tags
mindol1004:master mindol1004:dependabot/maven/ch.qos.logback-logback-classic-1.2.13 mindol1004:jakarta
mindol1004:0.1.0
...
pull from: mindol1004:jakarta
Branches Tags
mindol1004:dependabot/maven/ch.qos.logback-logback-classic-1.2.13 mindol1004:master mindol1004:jakarta
mindol1004:0.1.0

1 Commits
master ... jakarta

Author SHA1 Message Date
Michael Schnell
c090178bbf Started conversion to jakarta namespace 2021-08-21 15:11:04 +02:00
68 changed files with 193 additions and 194 deletions
Expand all files Collapse all files

2
aggregates/src/main/java/org/fuin/cqrs4j/example/aggregates/DuplicatePersonNameException.java
View File

@@ -12,7 +12,7 @@
*/
package org.fuin.cqrs4j.example.aggregates;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import org.fuin.cqrs4j.example.shared.PersonId;
import org.fuin.cqrs4j.example.shared.PersonName;

2
aggregates/src/main/java/org/fuin/cqrs4j/example/aggregates/Person.java
View File

@@ -15,7 +15,7 @@ package org.fuin.cqrs4j.example.aggregates;
import java.io.Serializable;
import java.util.Optional;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import org.fuin.cqrs4j.example.shared.PersonCreatedEvent;
import org.fuin.cqrs4j.example.shared.PersonId;

2
aggregates/src/main/java/org/fuin/cqrs4j/example/aggregates/PersonRepository.java
View File

@@ -13,7 +13,7 @@
package org.fuin.cqrs4j.example.aggregates;
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;

4
java-se-cdi/pom.xml
View File

@@ -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>

10
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/app/CmdExampleApp.java
View File

@@ -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;

2
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/DuplicatePersonNameException.java
View File

@@ -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;

2
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/Person.java
View File

@@ -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;

2
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/PersonRepository.java
View File

@@ -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;

6
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/cmd/domain/PersonRepositoryFactory.java
View File

@@ -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;

12
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryEntityManagerProducer.java
View File

@@ -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;

4
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryExampleApp.java
View File

@@ -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;

8
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryProjectionAdminEventStoreFactory.java
View File

@@ -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;

4
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryScheduledExecutorService.java
View File

@@ -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}.

4
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryThreadFactoryFactory.java
View File

@@ -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.

4
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/app/QryTimer.java
View File

@@ -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

10
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/domain/QryPerson.java
View File

@@ -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;

2
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/PersonCreatedEventHandler.java
View File

@@ -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;

2
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryEventChunkHandler.java
View File

@@ -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;

4
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryEventDispatcherFactory.java
View File

@@ -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;

10
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryPersonProjectionPosition.java
View File

@@ -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;

2
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryPersonProjectionPositionRepository.java
View File

@@ -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;

2
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/handler/QryProjector.java
View File

@@ -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;

2
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedConfig.java
View File

@@ -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;

4
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedEsjcEventStoreFactory.java
View File

@@ -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;

8
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedEventStoreFactory.java
View File

@@ -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;

4
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedExecutorServiceFactory.java
View File

@@ -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.

4
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedSerDeserializerRegistryFactory.java
View File

@@ -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;

4
java-se-cdi/src/main/java/org/fuin/cqrs4j/example/javasecdi/shared/app/SharedUtils.java
View File

@@ -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.

41
pom.xml
View File

@@ -3,7 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.fuin.cqrs4j.example</groupId>
<artifactId>cqrs4j-example-root</artifactId>
<version>0.2.0-SNAPSHOT</version>
@@ -15,7 +14,7 @@
<maven.compiler.parameters>true</maven.compiler.parameters>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<esc.version>0.4.0</esc.version>
<esc.version>0.5.0-SNAPSHOT</esc.version>
</properties>
<modules>
@@ -33,19 +32,19 @@
<dependency>
<groupId>org.fuin</groupId>
<artifactId>ddd-4-java</artifactId>
<version>0.3.0</version>
<version>0.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.fuin</groupId>
<artifactId>cqrs-4-java</artifactId>
<version>0.3.0</version>
<version>0.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.fuin</groupId>
<artifactId>objects4j</artifactId>
<version>0.7.0</version>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -105,7 +104,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.11</version>
<version>3.12.0</version>
</dependency>
<dependency>
@@ -117,37 +116,37 @@
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>2.0.2</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-api</artifactId>
<version>1.0.2</version>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>2.2.3</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
<version>1.3</version>
<version>2.0</version>
</dependency>
<dependency>
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config</artifactId>
<version>1.10.0</version>
<version>2.4.4</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>1.1.6</version>
<version>2.0.1</version>
</dependency>
<dependency>
@@ -159,43 +158,43 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.5.1</version>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.18.1</version>
<version>3.20.2</version>
</dependency>
<dependency>
<groupId>org.fuin</groupId>
<artifactId>units4j</artifactId>
<version>0.9.0</version>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>3.5</version>
<version>3.7.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>6.1.7.Final</version>
<version>7.0.1.Final</version>
</dependency>
<dependency>
@@ -207,13 +206,13 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>yasson</artifactId>
<version>1.0.8</version>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>1.6.4</version>
<version>2.0.1</version>
</dependency>
<dependency>

4
quarkus/command/src/main/java/org/fuin/cqrs4j/example/quarkus/command/api/ConstraintViolationExceptionMapper.java
View File

@@ -17,8 +17,8 @@ import java.util.List;
import java.util.Set;
import org.fuin.objects4j.common.Nullable;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;

6
quarkus/command/src/main/java/org/fuin/cqrs4j/example/quarkus/command/api/PersonResource.java
View File

@@ -16,9 +16,9 @@ import java.util.Optional;
import java.util.Set;
import javax.inject.Inject;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import javax.validation.Validator;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Validator;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;

6
quarkus/command/src/main/java/org/fuin/cqrs4j/example/quarkus/command/domain/PersonRepositoryFactory.java
View File

@@ -12,9 +12,9 @@
*/
package org.fuin.cqrs4j.example.quarkus.command.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.cqrs4j.example.aggregates.PersonRepository;
import org.fuin.esc.esjc.IESJCEventStore;

2
quarkus/command/src/test/java/org/fuin/cqrs4j/example/quarkus/command/api/PersonResourceIT.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
import java.util.UUID;
import javax.inject.Inject;
import javax.json.bind.Jsonb;
import jakarta.json.bind.Jsonb;
import org.fuin.cqrs4j.ResultType;
import org.fuin.cqrs4j.SimpleResult;

4
quarkus/pom.xml
View File

@@ -16,7 +16,7 @@
<packaging>pom</packaging>
<properties>
<quarkus.version>1.10.5.Final</quarkus.version>
<quarkus.version>2.1.3.Final</quarkus.version>
<eventstore.version>5.0.9</eventstore.version>
</properties>
@@ -35,7 +35,7 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>2.0.2</version>
<version>3.0.0</version>
</dependency>
<dependency>

2
quarkus/query/src/main/java/org/fuin/cqrs4j/example/quarkus/query/api/QryPersonResource.java
View File

@@ -15,7 +15,7 @@ package org.fuin.cqrs4j.example.quarkus.query.api;
import java.util.List;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;

4
quarkus/query/src/main/java/org/fuin/cqrs4j/example/quarkus/query/app/QryScheduler.java
View File

@@ -12,8 +12,8 @@
*/
package org.fuin.cqrs4j.example.quarkus.query.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;
import io.quarkus.scheduler.Scheduled;

10
quarkus/query/src/main/java/org/fuin/cqrs4j/example/quarkus/query/views/common/QryProjectionPosition.java
View File

@@ -12,11 +12,11 @@
*/
package org.fuin.cqrs4j.example.quarkus.query.views.common;
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;

6
quarkus/query/src/main/java/org/fuin/cqrs4j/example/quarkus/query/views/common/QryProjectionPositionRepository.java
View File

@@ -12,10 +12,10 @@
*/
package org.fuin.cqrs4j.example.quarkus.query.views.common;
import javax.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.validation.constraints.NotNull;
import jakarta.persistence.EntityManager;
import jakarta.validation.constraints.NotNull;
import org.fuin.cqrs4j.ProjectionService;
import org.fuin.esc.api.StreamId;

4
quarkus/query/src/main/java/org/fuin/cqrs4j/example/quarkus/query/views/personlist/PersonCreatedEventHandler.java
View File

@@ -12,9 +12,9 @@
*/
package org.fuin.cqrs4j.example.quarkus.query.views.personlist;
import javax.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.fuin.cqrs4j.EventHandler;
import org.fuin.cqrs4j.example.shared.PersonCreatedEvent;

12
quarkus/query/src/main/java/org/fuin/cqrs4j/example/quarkus/query/views/personlist/PersonListEntry.java
View File

@@ -12,12 +12,12 @@
*/
package org.fuin.cqrs4j.example.quarkus.query.views.personlist;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.NamedQuery;
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;

2
quarkus/query/src/main/java/org/fuin/cqrs4j/example/quarkus/query/views/personlist/PersonListEventChunkHandler.java
View File

@@ -14,7 +14,7 @@ package org.fuin.cqrs4j.example.quarkus.query.views.personlist;
import java.util.Set;
import javax.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.transaction.Transactional;

4
quarkus/query/src/main/java/org/fuin/cqrs4j/example/quarkus/query/views/personlist/PersonListEventDispatcher.java
View File

@@ -15,8 +15,8 @@ package org.fuin.cqrs4j.example.quarkus.query.views.personlist;
import java.util.List;
import java.util.Set;
import javax.enterprise.context.ApplicationScoped;
import javax.validation.constraints.NotNull;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.validation.constraints.NotNull;
import org.fuin.cqrs4j.EventDispatcher;
import org.fuin.cqrs4j.SimpleEventDispatcher;

4
quarkus/query/src/main/java/org/fuin/cqrs4j/example/quarkus/query/views/personlist/PersonListProjector.java
View File

@@ -19,8 +19,8 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.Semaphore;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.ObservesAsync;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.ObservesAsync;
import javax.inject.Inject;
import org.fuin.cqrs4j.example.quarkus.query.app.QryCheckForViewUpdatesEvent;

4
quarkus/query/src/test/java/org/fuin/cqrs4j/example/quarkus/query/api/QryPersonResourceIT.java
View File

@@ -12,9 +12,9 @@ import static org.hamcrest.Matchers.not;
import java.util.Arrays;
import java.util.UUID;
import javax.enterprise.context.control.ActivateRequestContext;
import jakarta.enterprise.context.control.ActivateRequestContext;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.fuin.cqrs4j.example.quarkus.query.views.personlist.PersonListEntry;
import org.fuin.cqrs4j.example.shared.PersonCreatedEvent;

2
quarkus/shared/src/main/java/org/fuin/cqrs4j/example/quarkus/shared/Config.java
View File

@@ -15,7 +15,7 @@ package org.fuin.cqrs4j.example.quarkus.shared;
import java.net.MalformedURLException;
import java.net.URL;
import javax.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;

4
quarkus/shared/src/main/java/org/fuin/cqrs4j/example/quarkus/shared/EsjcEventStoreFactory.java
View File

@@ -12,8 +12,8 @@
*/
package org.fuin.cqrs4j.example.quarkus.shared;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Produces;
import org.eclipse.microprofile.context.ManagedExecutor;

10
quarkus/shared/src/main/java/org/fuin/cqrs4j/example/quarkus/shared/EventStoreFactory.java
View File

@@ -16,11 +16,11 @@ import java.nio.charset.Charset;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.Dependent;
import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.inject.Disposes;
import jakarta.enterprise.inject.Produces;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;

10
quarkus/shared/src/main/java/org/fuin/cqrs4j/example/quarkus/shared/JsonbFactory.java
View File

@@ -12,11 +12,11 @@
*/
package org.fuin.cqrs4j.example.quarkus.shared;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
import javax.json.bind.JsonbConfig;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Produces;
import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbConfig;
import org.eclipse.yasson.FieldAccessStrategy;
import org.fuin.cqrs4j.example.shared.SharedUtils;

4
quarkus/shared/src/main/java/org/fuin/cqrs4j/example/quarkus/shared/SerDeserializerRegistryFactory.java
View File

@@ -12,8 +12,8 @@
*/
package org.fuin.cqrs4j.example.quarkus.shared;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Produces;
import org.fuin.cqrs4j.example.shared.SharedUtils;
import org.fuin.esc.spi.JsonbDeSerializer;

4
shared/src/main/java/org/fuin/cqrs4j/example/shared/CreatePersonCommand.java
View File

@@ -17,8 +17,8 @@
*/
package org.fuin.cqrs4j.example.shared;
import javax.json.bind.annotation.JsonbProperty;
import javax.validation.constraints.NotNull;
import jakarta.json.bind.annotation.JsonbProperty;
import jakarta.validation.constraints.NotNull;
import org.fuin.cqrs4j.AbstractAggregateCommand;
import org.fuin.ddd4j.ddd.DomainEventExpectedEntityIdPath;

4
shared/src/main/java/org/fuin/cqrs4j/example/shared/PersonCreatedEvent.java
View File

@@ -18,8 +18,8 @@
package org.fuin.cqrs4j.example.shared;
import org.fuin.objects4j.common.Immutable;
import javax.json.bind.annotation.JsonbProperty;
import javax.validation.constraints.NotNull;
import jakarta.json.bind.annotation.JsonbProperty;
import jakarta.validation.constraints.NotNull;
import org.fuin.ddd4j.ddd.AbstractDomainEvent;
import org.fuin.ddd4j.ddd.EntityIdPath;

4
shared/src/main/java/org/fuin/cqrs4j/example/shared/PersonId.java
View File

@@ -20,8 +20,8 @@ package org.fuin.cqrs4j.example.shared;
import java.util.UUID;
import org.fuin.objects4j.common.Immutable;
import javax.json.bind.adapter.JsonbAdapter;
import javax.validation.constraints.NotNull;
import jakarta.json.bind.adapter.JsonbAdapter;
import jakarta.validation.constraints.NotNull;
import org.fuin.ddd4j.ddd.AggregateRootUuid;
import org.fuin.ddd4j.ddd.EntityType;

12
shared/src/main/java/org/fuin/cqrs4j/example/shared/PersonName.java
View File

@@ -24,12 +24,12 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.fuin.objects4j.common.Immutable;
import javax.json.bind.adapter.JsonbAdapter;
import javax.validation.Constraint;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import javax.validation.Payload;
import javax.validation.constraints.NotNull;
import jakarta.json.bind.adapter.JsonbAdapter;
import jakarta.validation.Constraint;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
import jakarta.validation.Payload;
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.ConstraintViolationException;
import org.fuin.objects4j.ui.Label;

6
shared/src/main/java/org/fuin/cqrs4j/example/shared/SharedUtils.java
View File

@@ -23,9 +23,6 @@ import java.nio.charset.Charset;
import java.util.Collection;
import java.util.zip.Adler32;
import javax.json.bind.adapter.JsonbAdapter;
import javax.json.bind.config.PropertyVisibilityStrategy;
import org.fuin.ddd4j.ddd.AggregateVersionConverter;
import org.fuin.ddd4j.ddd.EntityIdConverter;
import org.fuin.ddd4j.ddd.EntityIdPathConverter;
@@ -43,6 +40,9 @@ import org.fuin.esc.spi.SerializedDataTypeRegistry;
import org.fuin.esc.spi.SimpleSerializedDataTypeRegistry;
import org.fuin.esc.spi.SimpleSerializerDeserializerRegistry;
import jakarta.json.bind.adapter.JsonbAdapter;
import jakarta.json.bind.config.PropertyVisibilityStrategy;
/**
* Utility code shared between command (write) and query (read) module.
*/

6
shared/src/test/java/org/fuin/cqrs4j/example/shared/CreatePersonCommandTest.java
View File

@@ -24,9 +24,9 @@ import java.nio.charset.Charset;
import java.time.ZonedDateTime;
import java.util.UUID;
import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
import javax.json.bind.JsonbConfig;
import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbConfig;
import org.apache.commons.io.IOUtils;
import org.eclipse.yasson.FieldAccessStrategy;

6
shared/src/test/java/org/fuin/cqrs4j/example/shared/PersonCreatedEventTest.java
View File

@@ -25,9 +25,9 @@ import java.io.IOException;
import java.nio.charset.Charset;
import java.util.UUID;
import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
import javax.json.bind.JsonbConfig;
import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbConfig;
import org.apache.commons.io.IOUtils;
import org.eclipse.yasson.FieldAccessStrategy;

6
spring-boot/command/src/main/java/org/fuin/cqrs4j/example/spring/command/controller/PersonController.java
View File

@@ -15,9 +15,9 @@ package org.fuin.cqrs4j.example.spring.command.controller;
import java.util.Optional;
import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import javax.validation.Validator;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Validator;
import org.fuin.cqrs4j.CommandExecutionFailedException;
import org.fuin.cqrs4j.SimpleResult;

2
spring-boot/command/src/test/java/org/fuin/cqrs4j/example/spring/command/api/PersonControllerIT.java
View File

@@ -11,7 +11,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import javax.json.bind.Jsonb;
import jakarta.json.bind.Jsonb;
import org.fuin.cqrs4j.ResultType;
import org.fuin.cqrs4j.SimpleResult;

20
spring-boot/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.12.RELEASE</version>
<version>2.5.4</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,19 +32,19 @@
<dependency>
<groupId>org.fuin</groupId>
<artifactId>ddd-4-java</artifactId>
<version>0.3.0</version>
<version>0.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.fuin</groupId>
<artifactId>cqrs-4-java</artifactId>
<version>0.3.0</version>
<version>0.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.fuin</groupId>
<artifactId>objects4j</artifactId>
<version>0.7.0</version>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -86,37 +86,37 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>yasson</artifactId>
<version>1.0.8</version>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.18.1</version>
<version>3.20.2</version>
</dependency>
<dependency>
<groupId>org.fuin</groupId>
<artifactId>units4j</artifactId>
<version>0.9.0</version>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>3.5</version>
<version>3.7.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
<version>2.11.0</version>
</dependency>
</dependencies>

2
spring-boot/query/src/main/java/org/fuin/cqrs4j/example/spring/query/controller/PersonController.java
View File

@@ -15,7 +15,7 @@ package org.fuin.cqrs4j.example.spring.query.controller;
import java.util.List;
import java.util.UUID;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.fuin.cqrs4j.example.shared.PersonId;
import org.fuin.cqrs4j.example.spring.query.views.personlist.PersonListEntry;

10
spring-boot/query/src/main/java/org/fuin/cqrs4j/example/spring/query/views/common/QryProjectionPosition.java
View File

@@ -1,10 +1,10 @@
package org.fuin.cqrs4j.example.spring.query.views.common;
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;

6
spring-boot/query/src/main/java/org/fuin/cqrs4j/example/spring/query/views/common/QryProjectionService.java
View File

@@ -1,8 +1,8 @@
package org.fuin.cqrs4j.example.spring.query.views.common;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.validation.constraints.NotNull;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
import jakarta.validation.constraints.NotNull;
import org.fuin.cqrs4j.ProjectionService;
import org.fuin.esc.api.StreamId;

2
spring-boot/query/src/main/java/org/fuin/cqrs4j/example/spring/query/views/personlist/PersonCreatedEventHandler.java
View File

@@ -1,6 +1,6 @@
package org.fuin.cqrs4j.example.spring.query.views.personlist;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.fuin.cqrs4j.EventHandler;
import org.fuin.cqrs4j.example.shared.PersonCreatedEvent;

12
spring-boot/query/src/main/java/org/fuin/cqrs4j/example/spring/query/views/personlist/PersonListEntry.java
View File

@@ -12,12 +12,12 @@
*/
package org.fuin.cqrs4j.example.spring.query.views.personlist;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
import jakarta.validation.constraints.NotNull;
import org.fuin.cqrs4j.example.shared.PersonId;
import org.fuin.cqrs4j.example.shared.PersonName;

2
spring-boot/query/src/main/java/org/fuin/cqrs4j/example/spring/query/views/personlist/PersonListEventDispatcher.java
View File

@@ -4,7 +4,7 @@ import java.util.List;
import java.util.Set;
import org.fuin.objects4j.common.NotThreadSafe;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import org.fuin.cqrs4j.EventDispatcher;
import org.fuin.cqrs4j.SimpleEventDispatcher;

2
spring-boot/query/src/test/java/org/fuin/cqrs4j/example/spring/query/api/PersonControllerIT.java
View File

@@ -12,7 +12,7 @@ import static org.hamcrest.Matchers.not;
import java.util.Arrays;
import java.util.UUID;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.fuin.cqrs4j.example.shared.PersonCreatedEvent;
import org.fuin.cqrs4j.example.shared.PersonId;

6
spring-boot/shared/src/main/java/org/fuin/cqrs4j/example/spring/shared/BeanFactory.java
View File

@@ -5,9 +5,9 @@ import java.net.URL;
import java.nio.charset.Charset;
import java.util.concurrent.Executors;
import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
import javax.json.bind.JsonbConfig;
import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbConfig;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;

4
spring-boot/shared/src/main/java/org/fuin/cqrs4j/example/spring/shared/GlobalExceptionHandler.java
View File

@@ -17,8 +17,8 @@ import java.util.List;
import java.util.Set;
import org.fuin.objects4j.common.Nullable;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import org.fuin.cqrs4j.CommandExecutionFailedException;
import org.fuin.cqrs4j.SimpleResult;