Merge pull request #2 from SirMarjan/feature/cqrs2

Feature/cqrs2

Author: SirMarjan

NotificationsSystemApi/src/main/java/pl/marcinsobanski/notificationssystem/api/cqrs/common/cqrs/Command.java

@@ -1,4 +1,4 @@
 package pl.marcinsobanski.notificationssystem.api.cqrs.common.cqrs;
 
-public interface Command<RESULT> {
+public non-sealed interface Command<RESULT> extends Message<RESULT> {
 }

NotificationsSystemApi/src/main/java/pl/marcinsobanski/notificationssystem/api/cqrs/common/cqrs/CommandHandler.java

@@ -0,0 +1,4 @@
+package pl.marcinsobanski.notificationssystem.api.cqrs.common.cqrs;
+
+public sealed interface Message<Result> permits Command, Query {
+}

NotificationsSystemApi/src/main/java/pl/marcinsobanski/notificationssystem/api/cqrs/common/cqrs/Message.java

@@ -1,4 +1,4 @@
 package pl.marcinsobanski.notificationssystem.api.cqrs.common.cqrs;
 
-public interface Query<RESULT> {
+public non-sealed interface Query<RESULT> extends Message<RESULT> {
 }

NotificationsSystemApi/src/main/java/pl/marcinsobanski/notificationssystem/api/cqrs/common/cqrs/Query.java

@@ -12,12 +12,6 @@
     <groupId>pl.marcinsobanski.notificationssystem.application</groupId>
     <artifactId>NotificationsSystemApplication</artifactId>
 
-    <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>pl.marcinsobanski.notificationssystem.api</groupId>
@@ -33,6 +27,27 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

NotificationsSystemApi/src/main/java/pl/marcinsobanski/notificationssystem/api/cqrs/common/cqrs/QueryHandler.java

@@ -21,15 +21,15 @@ public Rule convertRule(pl.marcinsobanski.notificationssystem.api.cqrs.common.mo
         };
     }
 
-    public ItemTypeRule.Operator convertToItemTypeRule(RuleOperator ruleOperator) {
+    private ItemTypeRule.Operator convertToItemTypeRule(RuleOperator ruleOperator) {
         return switch (ruleOperator) {
             case ITEM_IS -> ItemTypeRule.Operator.IS;
             case ITEM_IS_NOT -> ItemTypeRule.Operator.IS_NOT;
             default -> throw new IllegalArgumentException("Illegal argument" + ruleOperator);
         };
     }
 
-    public PriceRule.Operator convertToPriceRule(RuleOperator ruleOperator) {
+    private PriceRule.Operator convertToPriceRule(RuleOperator ruleOperator) {
         return switch (ruleOperator) {
             case PRICE_GREATER -> PriceRule.Operator.GREATER;
             case PRICE_GREATER_OR_EQUALS -> PriceRule.Operator.GREATER_OR_EQUAL;

NotificationsSystemApplication/pom.xml

@@ -3,7 +3,7 @@
 import pl.marcinsobanski.notificationssystem.api.cqrs.common.cqrs.Command;
 import pl.marcinsobanski.notificationssystem.api.cqrs.common.cqrs.Query;
 
-public interface CQCommandHandler {
+public interface CQBus {
 
     <RESULT> RESULT executeCommand(Command<RESULT> command);
 

NotificationsSystemApplication/src/main/java/pl/marcinsobanski/notificationssystem/application/converters/RuleConverter.java

@@ -0,0 +1,11 @@
+package pl.marcinsobanski.notificationssystem.application.cqrs;
+
+
+import pl.marcinsobanski.notificationssystem.api.cqrs.common.cqrs.Command;
+
+public interface CommandHandler<RESULT, COMMAND extends Command<RESULT>> extends MessageHandler<RESULT, COMMAND> {
+
+    @Override
+    RESULT handle(COMMAND command);
+
+}

…m/application/cqrs/CQCommandHandler.java …ationssystem/application/cqrs/CQBus.javaNotificationsSystemApplication/src/main/java/pl/marcinsobanski/notificationssystem/application/cqrs/CQCommandHandler.java renamed to NotificationsSystemApplication/src/main/java/pl/marcinsobanski/notificationssystem/application/cqrs/CQBus.java NotificationsSystemApplication/src/main/java/pl/marcinsobanski/notificationssystem/application/cqrs/CQCommandHandler.java renamed to NotificationsSystemApplication/src/main/java/pl/marcinsobanski/notificationssystem/application/cqrs/CQBus.java

@@ -0,0 +1,9 @@
+package pl.marcinsobanski.notificationssystem.application.cqrs;
+
+import pl.marcinsobanski.notificationssystem.api.cqrs.common.cqrs.Message;
+
+public interface MessageHandler<RESULT, MESSAGE extends Message<RESULT>> {
+
+    RESULT handle(MESSAGE message);
+
+}