eva4j 1.0.14 → 1.0.16

package/templates/crud/EndpointsController.java.ejs

@@ -36,7 +36,7 @@ import <%= packageName %>.<%= moduleName %>.application.commands.Delete<%= aggre
 import <%= packageName %>.<%= moduleName %>.application.queries.Get<%= aggregateName %>Query;
 <% } -%>
 <% if (hasFindAll) { -%>
-import <%= packageName %>.<%= moduleName %>.application.queries.FindAll<%= aggregateName %>sQuery;
+import <%= packageName %>.<%= moduleName %>.application.queries.FindAll<%= aggregateNamePlural %>Query;
 <% } -%>
 <% customCmdUCs.forEach(function(op) { -%>
 import <%= packageName %>.<%= moduleName %>.application.commands.<%= op.useCase %>Command;
@@ -56,7 +56,7 @@ import <%= packageName %>.<%= moduleName %>.application.commands.<%= op.useCase
 <% findByOps.forEach(function(op) { -%>
 import <%= packageName %>.<%= moduleName %>.application.queries.<%= op.useCase %>Query;
 <% }); -%>
-<% if (hasGetById || hasFindAll || hasFindBy) { -%>
+<% if (hasGetById || hasFindAll || hasFindBy || customQueryUCs.length > 0) { -%>
 import <%= packageName %>.<%= moduleName %>.application.dtos.<%= aggregateName %>ResponseDto;
 <% } -%>
 <% if (hasFindAll || hasFindBy) { -%>
@@ -105,9 +105,9 @@ public class <%= controllerName %> {
             @RequestParam(defaultValue = "20") int size,
             @RequestParam(defaultValue = "id") String sortBy,
             @RequestParam(defaultValue = "ASC") String sortDirection) {
-        log.info("Finding all <%= aggregateName %>s — page={}, size={}, sortBy={}, sortDirection={}",
+        log.info("Finding all <%= aggregateNamePlural %> — page={}, size={}, sortBy={}, sortDirection={}",
                 page, size, sortBy, sortDirection);
-        return useCaseMediator.dispatch(new FindAll<%= aggregateName %>sQuery(page, size, sortBy, sortDirection));
+        return useCaseMediator.dispatch(new FindAll<%= aggregateNamePlural %>Query(page, size, sortBy, sortDirection));
     }
 <%  } else if (op.isStandard && op.standardType === 'delete') { %>
     public void <%= op.methodName %>(@PathVariable <%- idType %> id) {
@@ -168,8 +168,8 @@ public class <%= controllerName %> {
         useCaseMediator.dispatch(command);
     }
 <%  } else { %>
-    // TODO: Review the parameters in <%= op.useCase %>Query and replace Object with the actual return type
-    public Object <%= op.methodName %>(<% if (op.hasPathVar) { %>@PathVariable <%- op.idType %> <%= op.pathVarName %><% } %>) {
+    // TODO: Review the parameters in <%= op.useCase %>Query and adapt the return type if needed
+    public <%- op.returnType %> <%= op.methodName %>(<% if (op.hasPathVar) { %>@PathVariable <%- op.idType %> <%= op.pathVarName %><% } %>) {
         log.info("Handling <%= op.useCase %>");
         return useCaseMediator.dispatch(new <%= op.useCase %>Query(<% if (op.hasPathVar) { %><%= op.pathVarName %><% } %>));
     }

package/templates/crud/FindByQuery.java.ejs

@@ -6,7 +6,7 @@ import <%= packageName %>.<%= moduleName %>.application.dtos.<%= aggregateName %
 
 /**
  * <%= useCaseName %>Query
- * Returns a paginated list of <%= aggregateName %>s filtered by <%= fieldName %>.
+ * Returns a paginated list of <%= aggregateNamePlural %> filtered by <%= fieldName %>.
  */
 public record <%= useCaseName %>Query(
         <%- fieldJavaType %> <%= fieldName %>,

package/templates/crud/FindByQueryHandler.java.ejs

@@ -7,8 +7,8 @@ import <%= packageName %>.<%= moduleName %>.domain.models.entities.<%= aggregate
 import <%= packageName %>.<%= moduleName %>.domain.repositories.<%= aggregateName %>Repository;
 import <%= packageName %>.shared.application.dtos.PagedResponse;
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
+import <%= packageName %>.shared.domain.annotations.LogExceptions;
 import <%= packageName %>.shared.domain.interfaces.QueryHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -19,10 +19,9 @@ import java.util.List;
 
 /**
  * <%= useCaseName %>QueryHandler
- * Returns paginated <%= aggregateName %>s filtered by <%= fieldName %>.
+ * Returns paginated <%= aggregateNamePlural %> filtered by <%= fieldName %>.
  * Calls repository.<%= jpaMethodName %>(<%= fieldName %>, pageable).
  */
-@Slf4j
 @ApplicationComponent
 public class <%= useCaseName %>QueryHandler implements QueryHandler<<%= useCaseName %>Query, PagedResponse<<%= aggregateName %>ResponseDto>> {
 
@@ -37,10 +36,8 @@ public class <%= useCaseName %>QueryHandler implements QueryHandler<<%= useCaseN
 
     @Override
     @Transactional(readOnly = true)
+    @LogExceptions
     public PagedResponse<<%= aggregateName %>ResponseDto> handle(<%= useCaseName %>Query query) {
-        log.info("Handling <%= useCaseName %>Query — <%= fieldName %>={}, page={}, size={}",
-                query.<%= fieldName %>(), query.page(), query.size());
-
         Sort sort = Sort.by(Sort.Direction.fromString(query.sortDirection()), query.sortBy());
         Pageable pageable = PageRequest.of(query.page(), query.size(), sort);
 
@@ -49,9 +46,6 @@ public class <%= useCaseName %>QueryHandler implements QueryHandler<<%= useCaseN
                 .map(mapper::toDto)
                 .toList();
 
-        log.info("<%= useCaseName %> retrieved — page={}/{}, totalElements={}",
-                page.getNumber() + 1, page.getTotalPages(), page.getTotalElements());
-
         return PagedResponse.of(content, page.getNumber(), page.getSize(), page.getTotalElements());
     }
 }

package/templates/crud/GetQueryHandler.java.ejs

@@ -6,16 +6,15 @@ import <%= packageName %>.<%= moduleName %>.application.mappers.<%= aggregateNam
 import <%= packageName %>.<%= moduleName %>.domain.models.entities.<%= aggregateName %>;
 import <%= packageName %>.<%= moduleName %>.domain.repositories.<%= aggregateName %>Repository;
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
+import <%= packageName %>.shared.domain.annotations.LogExceptions;
 import <%= packageName %>.shared.domain.customExceptions.NotFoundException;
 import <%= packageName %>.shared.domain.interfaces.QueryHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Get<%= aggregateName %>QueryHandler
  * Handles retrieval of a single <%= aggregateName %> by ID
  */
-@Slf4j
 @ApplicationComponent
 public class Get<%= aggregateName %>QueryHandler implements QueryHandler<Get<%= aggregateName %>Query, <%= aggregateName %>ResponseDto> {
 
@@ -30,13 +29,11 @@ public class Get<%= aggregateName %>QueryHandler implements QueryHandler<Get<%=
 
     @Override
     @Transactional(readOnly = true)
+    @LogExceptions
     public <%= aggregateName %>ResponseDto handle(Get<%= aggregateName %>Query query) {
-        log.info("Handling Get<%= aggregateName %>Query for id: {}", query.id());
-        
         <%= aggregateName %> entity = repository.findById(query.id())
             .orElseThrow(() -> new NotFoundException("<%= aggregateName %> not found with id: " + query.id()));
         
-        log.info("<%= aggregateName %> retrieved successfully with id: {}", query.id());
         return mapper.toDto(entity);
     }
 }

package/templates/crud/ListQuery.java.ejs

@@ -4,7 +4,7 @@ import <%= packageName %>.<%= moduleName %>.application.dtos.<%= aggregateName %
 import <%= packageName %>.shared.application.dtos.PagedResponse;
 import <%= packageName %>.shared.domain.interfaces.Query;
 
-public record FindAll<%= aggregateName %>sQuery(
+public record FindAll<%= aggregateNamePlural %>Query(
     int page,
     int size,
     String sortBy,

package/templates/crud/ListQueryHandler.java.ejs

@@ -1,14 +1,14 @@
 package <%= packageName %>.<%= moduleName %>.application.usecases;
 
-import <%= packageName %>.<%= moduleName %>.application.queries.FindAll<%= aggregateName %>sQuery;
+import <%= packageName %>.<%= moduleName %>.application.queries.FindAll<%= aggregateNamePlural %>Query;
 import <%= packageName %>.<%= moduleName %>.application.dtos.<%= aggregateName %>ResponseDto;
 import <%= packageName %>.<%= moduleName %>.application.mappers.<%= aggregateName %>ApplicationMapper;
 import <%= packageName %>.<%= moduleName %>.domain.models.entities.<%= aggregateName %>;
 import <%= packageName %>.<%= moduleName %>.domain.repositories.<%= aggregateName %>Repository;
 import <%= packageName %>.shared.application.dtos.PagedResponse;
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
+import <%= packageName %>.shared.domain.annotations.LogExceptions;
 import <%= packageName %>.shared.domain.interfaces.QueryHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -18,17 +18,16 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 /**
- * FindAll<%= aggregateName %>sQueryHandler
- * Handles retrieval of all <%= aggregateName %>s (paginated)
+ * FindAll<%= aggregateNamePlural %>QueryHandler
+ * Handles retrieval of all <%= aggregateNamePlural %> (paginated)
  */
-@Slf4j
 @ApplicationComponent
-public class FindAll<%= aggregateName %>sQueryHandler implements QueryHandler<FindAll<%= aggregateName %>sQuery, PagedResponse<<%= aggregateName %>ResponseDto>> {
+public class FindAll<%= aggregateNamePlural %>QueryHandler implements QueryHandler<FindAll<%= aggregateNamePlural %>Query, PagedResponse<<%= aggregateName %>ResponseDto>> {
 
     private final <%= aggregateName %>Repository repository;
     private final <%= aggregateName %>ApplicationMapper mapper;
 
-    public FindAll<%= aggregateName %>sQueryHandler(<%= aggregateName %>Repository repository,
+    public FindAll<%= aggregateNamePlural %>QueryHandler(<%= aggregateName %>Repository repository,
                                                      <%= aggregateName %>ApplicationMapper mapper) {
         this.repository = repository;
         this.mapper = mapper;
@@ -36,10 +35,8 @@ public class FindAll<%= aggregateName %>sQueryHandler implements QueryHandler<Fi
 
     @Override
     @Transactional(readOnly = true)
-    public PagedResponse<<%= aggregateName %>ResponseDto> handle(FindAll<%= aggregateName %>sQuery query) {
-        log.info("Handling FindAll<%= aggregateName %>sQuery — page={}, size={}, sortBy={}, sortDirection={}",
-                query.page(), query.size(), query.sortBy(), query.sortDirection());
-
+    @LogExceptions
+    public PagedResponse<<%= aggregateName %>ResponseDto> handle(FindAll<%= aggregateNamePlural %>Query query) {
         Sort sort = Sort.by(Sort.Direction.fromString(query.sortDirection()), query.sortBy());
         Pageable pageable = PageRequest.of(query.page(), query.size(), sort);
 
@@ -48,9 +45,6 @@ public class FindAll<%= aggregateName %>sQueryHandler implements QueryHandler<Fi
                 .map(mapper::toDto)
                 .toList();
 
-        log.info("FindAll<%= aggregateName %>s retrieved — page={}/{}, totalElements={}",
-                page.getNumber() + 1, page.getTotalPages(), page.getTotalElements());
-
         return PagedResponse.of(content, page.getNumber(), page.getSize(), page.getTotalElements());
     }
 }

package/templates/crud/ScaffoldCommandHandler.java.ejs

@@ -3,8 +3,8 @@ package <%= packageName %>.<%= moduleName %>.application.usecases;
 import <%= packageName %>.<%= moduleName %>.application.commands.<%= useCaseName %>Command;
 import <%= packageName %>.<%= moduleName %>.domain.repositories.<%= aggregateName %>Repository;
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
+import <%= packageName %>.shared.domain.annotations.LogExceptions;
 import <%= packageName %>.shared.domain.interfaces.CommandHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional;
  *   2. Call the appropriate domain method (e.g. entity.someBusinessMethod())
  *   3. Persist the result via repository.save(entity)
  */
-@Slf4j
 @ApplicationComponent
 public class <%= useCaseName %>CommandHandler implements CommandHandler<<%= useCaseName %>Command> {
 
@@ -28,9 +27,8 @@ public class <%= useCaseName %>CommandHandler implements CommandHandler<<%= useC
 
     @Override
     @Transactional
+    @LogExceptions
     public void handle(<%= useCaseName %>Command command) {
-        log.info("Handling <%= useCaseName %>Command: {}", command);
-
         // TODO: Implement business logic
         // Example:
         // <%= aggregateName %> entity = repository.findById(command.id())

package/templates/crud/ScaffoldQuery.java.ejs

@@ -1,12 +1,13 @@
 package <%= packageName %>.<%= moduleName %>.application.queries;
 
+import <%= packageName %>.<%= moduleName %>.application.dtos.<%= aggregateName %>ResponseDto;
 import <%= packageName %>.shared.domain.interfaces.Query;
 
 /**
  * <%= useCaseName %>Query
- * TODO: Add the parameters required by this query and replace the return type placeholder.
+ * TODO: Add the parameters required by this query and adapt the return type if needed.
  */
 public record <%= useCaseName %>Query(
         // TODO: Replace with actual query parameters
         String id
-) implements Query<Object> {}
+) implements Query<<%= aggregateName %>ResponseDto> {}

package/templates/crud/ScaffoldQueryHandler.java.ejs

@@ -1,10 +1,11 @@
 package <%= packageName %>.<%= moduleName %>.application.usecases;
 
+import <%= packageName %>.<%= moduleName %>.application.dtos.<%= aggregateName %>ResponseDto;
 import <%= packageName %>.<%= moduleName %>.application.queries.<%= useCaseName %>Query;
 import <%= packageName %>.<%= moduleName %>.domain.repositories.<%= aggregateName %>Repository;
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
+import <%= packageName %>.shared.domain.annotations.LogExceptions;
 import <%= packageName %>.shared.domain.interfaces.QueryHandler;
-import lombok.extern.slf4j.Slf4j;
 
 /**
  * <%= useCaseName %>QueryHandler
@@ -15,9 +16,8 @@ import lombok.extern.slf4j.Slf4j;
  *   2. Retrieve data from the repository
  *   3. Map the result to a DTO and return it
  */
-@Slf4j
 @ApplicationComponent
-public class <%= useCaseName %>QueryHandler implements QueryHandler<<%= useCaseName %>Query, Object> {
+public class <%= useCaseName %>QueryHandler implements QueryHandler<<%= useCaseName %>Query, <%= aggregateName %>ResponseDto> {
 
     private final <%= aggregateName %>Repository repository;
 
@@ -26,9 +26,8 @@ public class <%= useCaseName %>QueryHandler implements QueryHandler<<%= useCaseN
     }
 
     @Override
-    public Object handle(<%= useCaseName %>Query query) {
-        log.info("Handling <%= useCaseName %>Query: {}", query);
-
+    @LogExceptions
+    public <%= aggregateName %>ResponseDto handle(<%= useCaseName %>Query query) {
         // TODO: Implement query logic
         // Example:
         // return repository.findById(query.id())

package/templates/crud/SubEntityAddCommand.java.ejs

@@ -4,6 +4,7 @@ package <%= packageName %>.<%= moduleName %>.application.commands;
 <%- imp %>
 <% }); %>
 import <%= packageName %>.shared.domain.interfaces.Command;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * <%= useCaseName %>Command
@@ -12,6 +13,9 @@ import <%= packageName %>.shared.domain.interfaces.Command;
 public record <%= useCaseName %>Command(
         <%- idType %> id<% if (entityFields && entityFields.length > 0) { %>,<% } %>
 <% (entityFields || []).forEach(function(field, idx) { %>
+<% if (field.schemaExample) { %>
+        @Schema(example = "<%= field.schemaExample %>")
+<% } %>
         <%- field.javaType %> <%= field.name %><% if (idx < entityFields.length - 1) { %>,<% } %>
 <% }); %>
 ) implements Command {}

package/templates/crud/SubEntityAddCommandHandler.java.ejs

@@ -5,9 +5,9 @@ import <%= packageName %>.<%= moduleName %>.domain.models.entities.<%= aggregate
 import <%= packageName %>.<%= moduleName %>.domain.models.entities.<%= entityName %>;
 import <%= packageName %>.<%= moduleName %>.domain.repositories.<%= aggregateName %>Repository;
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
+import <%= packageName %>.shared.domain.annotations.LogExceptions;
 import <%= packageName %>.shared.domain.customExceptions.NotFoundException;
 import <%= packageName %>.shared.domain.interfaces.CommandHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional;
  *
  * The aggregate root must expose: <%= addMethodName %>(<%= entityName %> item)
  */
-@Slf4j
 @ApplicationComponent
 public class <%= useCaseName %>CommandHandler implements CommandHandler<<%= useCaseName %>Command> {
 
@@ -28,16 +27,13 @@ public class <%= useCaseName %>CommandHandler implements CommandHandler<<%= useC
 
     @Override
     @Transactional
+    @LogExceptions
     public void handle(<%= useCaseName %>Command command) {
-        log.info("Handling <%= useCaseName %>Command for <%= aggregateName %> id: {}", command.id());
-
         <%= aggregateName %> entity = repository.findById(command.id())
                 .orElseThrow(() -> new NotFoundException("<%= aggregateName %> not found with id: " + command.id()));
 
         <%= entityName %> item = new <%= entityName %>(<% (entityFields || []).forEach(function(field, idx) { %>command.<%= field.name %>()<% if (idx < entityFields.length - 1) { %>, <% } %><% }); %>);
         entity.<%= addMethodName %>(item);
         repository.save(entity);
-
-        log.info("<%= entityName %> added to <%= aggregateName %> id: {}", command.id());
     }
 }

package/templates/crud/SubEntityRemoveCommandHandler.java.ejs

@@ -4,9 +4,9 @@ import <%= packageName %>.<%= moduleName %>.application.commands.<%= useCaseName
 import <%= packageName %>.<%= moduleName %>.domain.models.entities.<%= aggregateName %>;
 import <%= packageName %>.<%= moduleName %>.domain.repositories.<%= aggregateName %>Repository;
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
+import <%= packageName %>.shared.domain.annotations.LogExceptions;
 import <%= packageName %>.shared.domain.customExceptions.NotFoundException;
 import <%= packageName %>.shared.domain.interfaces.CommandHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -15,7 +15,6 @@ import org.springframework.transaction.annotation.Transactional;
  *
  * The aggregate root must expose: <%= removeMethodName %>(String itemId)
  */
-@Slf4j
 @ApplicationComponent
 public class <%= useCaseName %>CommandHandler implements CommandHandler<<%= useCaseName %>Command> {
 
@@ -27,16 +26,12 @@ public class <%= useCaseName %>CommandHandler implements CommandHandler<<%= useC
 
     @Override
     @Transactional
+    @LogExceptions
     public void handle(<%= useCaseName %>Command command) {
-        log.info("Handling <%= useCaseName %>Command for <%= aggregateName %> id: {}, itemId: {}",
-                command.id(), command.itemId());
-
         <%= aggregateName %> entity = repository.findById(command.id())
                 .orElseThrow(() -> new NotFoundException("<%= aggregateName %> not found with id: " + command.id()));
 
         entity.<%= removeMethodName %>(command.itemId());
         repository.save(entity);
-
-        log.info("<%= entityName %> id: {} removed from <%= aggregateName %> id: {}", command.itemId(), command.id());
     }
 }

package/templates/crud/TransitionCommandHandler.java.ejs

@@ -4,16 +4,15 @@ import <%= packageName %>.<%= moduleName %>.application.commands.<%= useCaseName
 import <%= packageName %>.<%= moduleName %>.domain.models.entities.<%= aggregateName %>;
 import <%= packageName %>.<%= moduleName %>.domain.repositories.<%= aggregateName %>Repository;
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
+import <%= packageName %>.shared.domain.annotations.LogExceptions;
 import <%= packageName %>.shared.domain.customExceptions.NotFoundException;
 import <%= packageName %>.shared.domain.interfaces.CommandHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <%= useCaseName %>CommandHandler
  * Loads the <%= aggregateName %> aggregate and calls entity.<%= domainMethod %>() to execute the transition.
  */
-@Slf4j
 @ApplicationComponent
 public class <%= useCaseName %>CommandHandler implements CommandHandler<<%= useCaseName %>Command> {
 
@@ -25,15 +24,12 @@ public class <%= useCaseName %>CommandHandler implements CommandHandler<<%= useC
 
     @Override
     @Transactional
+    @LogExceptions
     public void handle(<%= useCaseName %>Command command) {
-        log.info("Handling <%= useCaseName %>Command for id: {}", command.id());
-
         <%= aggregateName %> entity = repository.findById(command.id())
                 .orElseThrow(() -> new NotFoundException("<%= aggregateName %> not found with id: " + command.id()));
 
         entity.<%= domainMethod %>();
         repository.save(entity);
-
-        log.info("<%= aggregateName %> id: {} transitioned via <%= domainMethod %>()", command.id());
     }
 }

package/templates/crud/UpdateCommand.java.ejs

@@ -1,6 +1,7 @@
 package <%= packageName %>.<%= moduleName %>.application.commands;
 
 import <%= packageName %>.shared.domain.interfaces.Command;
+import io.swagger.v3.oas.annotations.media.Schema;
 <% if (hasValueObjects) { %>
 import <%= packageName %>.<%= moduleName %>.domain.models.valueObjects.*;
 <% } %>
@@ -34,6 +35,9 @@ import <%= packageName %>.<%= moduleName %>.application.dtos.Create<%= rel.targe
 public record Update<%= aggregateName %>Command(
     <%- idType %> id<% if (commandFields && commandFields.length > 0) { %>,<% } %>
 <% commandFields.forEach((field, idx) => { %>
+<% if (field.schemaExample) { %>
+    @Schema(example = "<%= field.schemaExample %>")
+<% } %>
     <%- field.javaType %> <%= field.name %><% if (idx < commandFields.length - 1 || (oneToManyRelationships && oneToManyRelationships.length > 0) || (oneToOneRelationships && oneToOneRelationships.length > 0)) { %>,<% } %>
 <% }); %>
 <% if (oneToManyRelationships && oneToManyRelationships.length > 0) { %>

package/templates/crud/UpdateCommandHandler.java.ejs

@@ -7,9 +7,9 @@ import <%= packageName %>.<%= moduleName %>.domain.repositories.<%= aggregateNam
 import <%= packageName %>.<%= moduleName %>.application.mappers.<%= aggregateName %>ApplicationMapper;
 <% } %>
 import <%= packageName %>.shared.domain.annotations.ApplicationComponent;
+import <%= packageName %>.shared.domain.annotations.LogExceptions;
 import <%= packageName %>.shared.domain.customExceptions.NotFoundException;
 import <%= packageName %>.shared.domain.interfaces.CommandHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -20,7 +20,6 @@ import org.springframework.transaction.annotation.Transactional;
  * Non-null command fields override the current value; null fields are preserved
  * from the loaded entity. No setters are required on the domain entity.
  */
-@Slf4j
 @ApplicationComponent
 public class Update<%= aggregateName %>CommandHandler implements CommandHandler<Update<%= aggregateName %>Command> {
 
@@ -42,9 +41,8 @@ public class Update<%= aggregateName %>CommandHandler implements CommandHandler<
 
     @Override
     @Transactional
+    @LogExceptions
     public void handle(Update<%= aggregateName %>Command command) {
-        log.info("Handling Update<%= aggregateName %>Command for id: {}", command.id());
-
         <%= aggregateName %> existing = repository
                 .findById(command.id())
                 .orElseThrow(() -> new NotFoundException("<%= aggregateName %> not found with id: " + command.id()));
@@ -100,6 +98,5 @@ public class Update<%= aggregateName %>CommandHandler implements CommandHandler<
 <% } %>
 
         repository.save(updated);
-        log.info("<%= aggregateName %> updated successfully with id: {}", command.id());
     }
 }