Skip to content

Commit 3c4deb5

Browse files
authored
removed micronaut (#1)
tests are working, spring configuration still a work in progress
1 parent 8cb734c commit 3c4deb5

33 files changed

Lines changed: 686 additions & 347 deletions

main/api/pom.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
</properties>
3434

3535
<dependencies>
36-
<dependency>
37-
<groupId>io.micronaut</groupId>
38-
<artifactId>micronaut-aop</artifactId>
39-
</dependency>
4036
<dependency>
4137
<groupId>com.fasterxml.jackson.core</groupId>
4238
<artifactId>jackson-annotations</artifactId>
@@ -45,6 +41,10 @@
4541
<groupId>jakarta.validation</groupId>
4642
<artifactId>jakarta.validation-api</artifactId>
4743
</dependency>
44+
<dependency>
45+
<groupId>jakarta.inject</groupId>
46+
<artifactId>jakarta.inject-api</artifactId>
47+
</dependency>
4848
<dependency>
4949
<groupId>org.slf4j</groupId>
5050
<artifactId>slf4j-api</artifactId>
@@ -59,11 +59,13 @@
5959
<artifactId>testng</artifactId>
6060
<scope>test</scope>
6161
</dependency>
62+
<!--
6263
<dependency>
6364
<groupId>org.slf4j</groupId>
6465
<artifactId>slf4j-simple</artifactId>
6566
<scope>test</scope>
6667
</dependency>
68+
-->
6769
</dependencies>
6870

6971
<build>

main/common-runtime/src/main/java/org/elasticsoftware/akces/aggregate/AggregateStateType.java renamed to main/api/src/main/java/org/elasticsoftware/akces/aggregate/AggregateStateType.java

File renamed without changes.

main/common-runtime/src/main/java/org/elasticsoftware/akces/aggregate/CommandType.java renamed to main/api/src/main/java/org/elasticsoftware/akces/aggregate/CommandType.java

File renamed without changes.

main/common-runtime/src/main/java/org/elasticsoftware/akces/aggregate/DomainEventType.java renamed to main/api/src/main/java/org/elasticsoftware/akces/aggregate/DomainEventType.java

File renamed without changes.
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
package org.elasticsoftware.akces.annotations;
22

3-
import io.micronaut.context.annotation.Factory;
4-
import jakarta.inject.Qualifier;
3+
import jakarta.inject.Named;
54

65
import java.lang.annotation.ElementType;
6+
import java.lang.annotation.Retention;
7+
import java.lang.annotation.RetentionPolicy;
78
import java.lang.annotation.Target;
89

10+
@Retention(RetentionPolicy.RUNTIME)
911
@Target({ElementType.TYPE})
10-
@Factory
11-
@Qualifier
12+
@Named
1213
public @interface AggregateInfo {
1314
String value();
15+
16+
int version() default 1;
1417
}

main/api/src/main/java/org/elasticsoftware/akces/annotations/AggregateStateInfo.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package org.elasticsoftware.akces.annotations;
22

3-
import io.micronaut.core.annotation.Introspected;
4-
5-
@Introspected
63
public @interface AggregateStateInfo {
74
String type();
85

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package org.elasticsoftware.akces.annotations;
22

3-
import io.micronaut.aop.Adapter;
4-
import org.elasticsoftware.akces.commands.CommandHandlerFunction;
5-
63
import java.lang.annotation.ElementType;
74
import java.lang.annotation.Retention;
85
import java.lang.annotation.RetentionPolicy;
96
import java.lang.annotation.Target;
107

118
@Target({ElementType.METHOD})
129
@Retention(RetentionPolicy.RUNTIME)
13-
@Adapter(CommandHandlerFunction.class)
1410
public @interface CommandHandler {
1511
boolean create() default false;
1612
}

main/api/src/main/java/org/elasticsoftware/akces/annotations/CommandInfo.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.elasticsoftware.akces.annotations;
22

3-
import io.micronaut.core.annotation.Introspected;
3+
import java.lang.annotation.Retention;
4+
import java.lang.annotation.RetentionPolicy;
45

5-
@Introspected
6+
@Retention(RetentionPolicy.RUNTIME)
67
public @interface CommandInfo {
78
String type();
89

main/api/src/main/java/org/elasticsoftware/akces/annotations/DomainEventInfo.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.elasticsoftware.akces.annotations;
22

3-
import io.micronaut.core.annotation.Introspected;
3+
import java.lang.annotation.Retention;
4+
import java.lang.annotation.RetentionPolicy;
45

5-
@Introspected
6+
@Retention(RetentionPolicy.RUNTIME)
67
public @interface DomainEventInfo {
78
String type();
89

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package org.elasticsoftware.akces.annotations;
22

3-
import io.micronaut.aop.Adapter;
4-
import org.elasticsoftware.akces.events.EventHandlerFunction;
5-
63
import java.lang.annotation.ElementType;
74
import java.lang.annotation.Retention;
85
import java.lang.annotation.RetentionPolicy;
96
import java.lang.annotation.Target;
107

118
@Target({ElementType.METHOD})
129
@Retention(RetentionPolicy.RUNTIME)
13-
@Adapter(EventHandlerFunction.class)
1410
public @interface EventHandler {
1511
boolean create() default false;
1612
}

0 commit comments

Comments
 (0)