eva4j 1.0.14 → 1.0.16

package/templates/shared/handlerException/HandlerExceptions.java.ejs

@@ -1,12 +1,11 @@
 package <%= packageName %>.shared.infrastructure.handlerException;
 
-
 import <%= packageName %>.shared.domain.customExceptions.*;
-import <%= packageName %>.shared.domain.errorMessage.ErrorMessage;
-import <%= packageName %>.shared.domain.errorMessage.FullErrorMessage;
-import <%= packageName %>.shared.domain.errorMessage.ShortErrorMessage;
+import <%= packageName %>.shared.domain.errorMessage.ErrorResponse;
 import feign.RetryableException;
 import jakarta.validation.ConstraintViolationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.converter.HttpMessageNotReadableException;
@@ -25,140 +24,161 @@ import org.springframework.web.server.MethodNotAllowedException;
 import org.springframework.web.server.ServerWebInputException;
 import org.yaml.snakeyaml.constructor.DuplicateKeyException;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @RestControllerAdvice
 public class HandlerExceptions {
 
+  private static final Logger log = LoggerFactory.getLogger(HandlerExceptions.class);
+
+  // ── Validation errors ──────────────────────────────────────────
+
   @ResponseStatus(HttpStatus.BAD_REQUEST)
   @ExceptionHandler(MethodArgumentNotValidException.class)
   @ResponseBody
-  public ErrorMessage onMethodArgumentNotValidException(MethodArgumentNotValidException ex){
-    List<String> messagesErrors = new ArrayList<>();
-    ex.getBindingResult().getFieldErrors().forEach(error -> {
-      messagesErrors.add(error.getField() + " " + error.getDefaultMessage());
-    });
-    return  new FullErrorMessage(messagesErrors,"BadRequest",HttpStatus.BAD_REQUEST.value());
+  public ErrorResponse onMethodArgumentNotValidException(MethodArgumentNotValidException ex) {
+    List<String> details = ex.getBindingResult().getFieldErrors().stream()
+        .map(error -> error.getField() + " " + error.getDefaultMessage())
+        .toList();
+    return new ErrorResponse(HttpStatus.BAD_REQUEST.value(), "Bad Request", "Validation failed", details);
   }
 
-
   @ResponseStatus(HttpStatus.BAD_REQUEST)
   @ExceptionHandler(ConstraintViolationException.class)
   @ResponseBody
-  public ErrorMessage onConstraintValidationException(ConstraintViolationException ex){
-    List<String> errors = new ArrayList<>();
-    ex.getConstraintViolations().forEach( error -> {
-      errors.add(error.getMessage());
-    });
-    return  new FullErrorMessage(errors,"Bad Request",HttpStatus.BAD_REQUEST.value());
+  public ErrorResponse onConstraintValidationException(ConstraintViolationException ex) {
+    List<String> details = ex.getConstraintViolations().stream()
+        .map(v -> v.getMessage())
+        .toList();
+    return new ErrorResponse(HttpStatus.BAD_REQUEST.value(), "Bad Request", "Constraint violation", details);
   }
 
-  //Spring Exceptions
-  @ResponseStatus(HttpStatus.BAD_REQUEST)
-  @ExceptionHandler({
-          DuplicateKeyException.class,
-          MethodNotAllowedException.class,
-          ServerWebInputException.class,
-          MethodArgumentTypeMismatchException.class,
-          HttpMessageNotReadableException.class,
-          DataIntegrityViolationException.class
-  })
+  @ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY)
+  @ExceptionHandler(ValidationException.class)
   @ResponseBody
-  public ErrorMessage onSpringBadRequest(Exception ex){
-    return new FullErrorMessage( List.of(ex.getClass().getSimpleName()), "Bad Request",HttpStatus.BAD_REQUEST.value());
+  public ErrorResponse onValidationException(ValidationException ex) {
+    String message = ex.getRowNumber() != null
+        ? "Row " + ex.getRowNumber() + ": " + ex.getMessage()
+        : ex.getMessage();
+    return new ErrorResponse(HttpStatus.UNPROCESSABLE_ENTITY.value(), "Validation Error", message);
   }
 
-  @ResponseStatus(HttpStatus.FORBIDDEN)
-  @ExceptionHandler(
-          AuthorizationDeniedException.class
-  )
-  @ResponseBody
-  public ErrorMessage onAuthorizationDeniedException( AuthorizationDeniedException ex) {
-    if (ex.getMessage() == null) return new ShortErrorMessage("Forbidden", HttpStatus.FORBIDDEN.value());
-    return new FullErrorMessage(List.of(ex.getMessage()), "Forbidden", HttpStatus.FORBIDDEN.value());
-  }
+  // ── Spring framework errors ────────────────────────────────────
 
-  // custom exceptions
-  //------------------
   @ResponseStatus(HttpStatus.BAD_REQUEST)
-  @ExceptionHandler(BadRequestException.class)
+  @ExceptionHandler({
+      DuplicateKeyException.class,
+      MethodNotAllowedException.class,
+      ServerWebInputException.class,
+      MethodArgumentTypeMismatchException.class,
+      HttpMessageNotReadableException.class
+  })
   @ResponseBody
-  public ErrorMessage onBadRequestException(BadRequestException ex) {
-    if (ex.getMessage() == null) return new ShortErrorMessage("Bad Request", HttpStatus.BAD_REQUEST.value());
-    return new FullErrorMessage(List.of(ex.getMessage()),"Bad Request", HttpStatus.BAD_REQUEST.value());
+  public ErrorResponse onSpringBadRequest(Exception ex) {
+    return new ErrorResponse(HttpStatus.BAD_REQUEST.value(), "Bad Request", "Malformed request");
   }
 
-  @ResponseStatus(HttpStatus.NOT_FOUND)
-  @ExceptionHandler(NotFoundException.class)
+  @ResponseStatus(HttpStatus.CONFLICT)
+  @ExceptionHandler(DataIntegrityViolationException.class)
   @ResponseBody
-  public ErrorMessage onNotFoundException(NotFoundException ex) {
-    if (ex.getMessage() == null) return  new ShortErrorMessage("Not Found", HttpStatus.NOT_FOUND.value());
-    return new FullErrorMessage(List.of(ex.getMessage()), "Not Found", HttpStatus.NOT_FOUND.value());
+  public ErrorResponse onDataIntegrityViolation(DataIntegrityViolationException ex) {
+    return new ErrorResponse(HttpStatus.CONFLICT.value(), "Conflict", "Data integrity violation — a constraint was not satisfied");
   }
 
+  // ── Security errors ────────────────────────────────────────────
+
   @ResponseStatus(HttpStatus.UNAUTHORIZED)
   @ExceptionHandler({
-          UnauthorizedException.class,
-          BadCredentialsException.class,
-          DisabledException.class,
-          LockedException.class,
-          InternalAuthenticationServiceException.class
+      UnauthorizedException.class,
+      BadCredentialsException.class,
+      DisabledException.class,
+      LockedException.class,
+      InternalAuthenticationServiceException.class
   })
   @ResponseBody
-  public ErrorMessage onUnauthorizedException(Exception ex) {
-    if (ex.getMessage() == null) return new ShortErrorMessage("Unauthorized", HttpStatus.UNAUTHORIZED.value());
-    return new FullErrorMessage(List.of(ex.getMessage()), "Unauthorized", HttpStatus.UNAUTHORIZED.value());
+  public ErrorResponse onUnauthorizedException(Exception ex) {
+    return new ErrorResponse(HttpStatus.UNAUTHORIZED.value(), "Unauthorized",
+        ex.getMessage() != null ? ex.getMessage() : "Authentication required");
   }
 
   @ResponseStatus(HttpStatus.FORBIDDEN)
-  @ExceptionHandler(
-          ForbiddenException.class
-  )
+  @ExceptionHandler({ForbiddenException.class, AuthorizationDeniedException.class})
   @ResponseBody
-  public ErrorMessage onForbiddenException( ForbiddenException ex) {
-    if (ex.getMessage() == null) return new ShortErrorMessage("Forbidden", HttpStatus.FORBIDDEN.value());
-    return new FullErrorMessage(List.of(ex.getMessage()), "Forbidden", HttpStatus.FORBIDDEN.value());
+  public ErrorResponse onForbiddenException(Exception ex) {
+    return new ErrorResponse(HttpStatus.FORBIDDEN.value(), "Forbidden",
+        ex.getMessage() != null ? ex.getMessage() : "Access denied");
+  }
+
+  // ── Custom domain exceptions ───────────────────────────────────
+
+  @ResponseStatus(HttpStatus.BAD_REQUEST)
+  @ExceptionHandler(BadRequestException.class)
+  @ResponseBody
+  public ErrorResponse onBadRequestException(BadRequestException ex) {
+    return new ErrorResponse(HttpStatus.BAD_REQUEST.value(), "Bad Request",
+        ex.getMessage() != null ? ex.getMessage() : "Bad request");
+  }
+
+  @ResponseStatus(HttpStatus.BAD_REQUEST)
+  @ExceptionHandler(ImportFileException.class)
+  @ResponseBody
+  public ErrorResponse onImportFileException(ImportFileException ex) {
+    return new ErrorResponse(HttpStatus.BAD_REQUEST.value(), "Import Error",
+        ex.getMessage() != null ? ex.getMessage() : "File import failed");
+  }
+
+  @ResponseStatus(HttpStatus.NOT_FOUND)
+  @ExceptionHandler(NotFoundException.class)
+  @ResponseBody
+  public ErrorResponse onNotFoundException(NotFoundException ex) {
+    return new ErrorResponse(HttpStatus.NOT_FOUND.value(), "Not Found",
+        ex.getMessage() != null ? ex.getMessage() : "Resource not found");
   }
 
   @ResponseStatus(HttpStatus.CONFLICT)
   @ExceptionHandler(ConflictException.class)
   @ResponseBody
-  public ErrorMessage onConflictException(ConflictException ex) {
-    if (ex.getMessage() == null) return new ShortErrorMessage("Conflict", HttpStatus.CONFLICT.value());
-    return new FullErrorMessage(List.of(ex.getMessage()), "Conflict", HttpStatus.CONFLICT.value());
+  public ErrorResponse onConflictException(ConflictException ex) {
+    return new ErrorResponse(HttpStatus.CONFLICT.value(), "Conflict",
+        ex.getMessage() != null ? ex.getMessage() : "Resource conflict");
   }
 
   @ResponseStatus(HttpStatus.CONFLICT)
   @ExceptionHandler(InvalidStateTransitionException.class)
   @ResponseBody
-  public ErrorMessage onInvalidStateTransitionException(InvalidStateTransitionException ex) {
-    if (ex.getMessage() == null) return new ShortErrorMessage("Invalid State Transition", HttpStatus.CONFLICT.value());
-    return new FullErrorMessage(List.of(ex.getMessage()), "Invalid State Transition", HttpStatus.CONFLICT.value());
+  public ErrorResponse onInvalidStateTransitionException(InvalidStateTransitionException ex) {
+    return new ErrorResponse(HttpStatus.CONFLICT.value(), "Invalid State Transition",
+        ex.getMessage() != null ? ex.getMessage() : "State transition not allowed");
   }
 
   @ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY)
   @ExceptionHandler(BusinessException.class)
   @ResponseBody
-  public ErrorMessage onBusinessException(BusinessException ex) {
-    if (ex.getMessage() == null) return new ShortErrorMessage("Business Rule Violation", HttpStatus.UNPROCESSABLE_ENTITY.value());
-    return new FullErrorMessage(List.of(ex.getMessage()), "Business Rule Violation", HttpStatus.UNPROCESSABLE_ENTITY.value());
+  public ErrorResponse onBusinessException(BusinessException ex) {
+    return new ErrorResponse(HttpStatus.UNPROCESSABLE_ENTITY.value(), "Business Rule Violation",
+        ex.getMessage() != null ? ex.getMessage() : "A business rule was violated");
   }
 
-  //error de feign client
+  // ── External service errors ────────────────────────────────────
+
   @ResponseStatus(HttpStatus.SERVICE_UNAVAILABLE)
   @ExceptionHandler(RetryableException.class)
   @ResponseBody
-  public ErrorMessage onRetryableException(RetryableException ex) {
-   return new ShortErrorMessage(ex.request().url() + " not available", HttpStatus.SERVICE_UNAVAILABLE.value());
+  public ErrorResponse onRetryableException(RetryableException ex) {
+    log.error("External service unavailable: {}", ex.request().url(), ex);
+    return new ErrorResponse(HttpStatus.SERVICE_UNAVAILABLE.value(), "Service Unavailable",
+        "An external service is temporarily unavailable");
   }
 
-  //Internal Server Error
+  // ── Catch-all ──────────────────────────────────────────────────
+
   @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
   @ExceptionHandler(Exception.class)
   @ResponseBody
-  public ErrorMessage onServerError(Exception ex){
-    return new FullErrorMessage(List.of(ex.getClass().getSimpleName()) ,"Internal Server Error", HttpStatus.INTERNAL_SERVER_ERROR.value());
+  public ErrorResponse onServerError(Exception ex) {
+    log.error("Unhandled exception", ex);
+    return new ErrorResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Internal Server Error",
+        "An unexpected error occurred");
   }
 
 }

package/src/commands/generate-system.js

@@ -1,243 +0,0 @@
-'use strict';
-
-const chalk = require('chalk');
-const path = require('path');
-const fs = require('fs-extra');
-const yaml = require('js-yaml');
-const pluralize = require('pluralize');
-
-const ConfigManager = require('../utils/config-manager');
-const { isEva4jProject } = require('../utils/validator');
-const { toCamelCase, toPascalCase, toPackagePath } = require('../utils/naming');
-
-const addModuleCommand = require('./add-module');
-const addKafkaClientCommand = require('./add-kafka-client');
-
-// Supported brokers → add-client command mapping
-const BROKER_CLIENT_COMMANDS = {
-  kafka: addKafkaClientCommand,
-};
-
-async function generateSystemCommand() {
-  const projectDir = process.cwd();
-
-  if (!(await isEva4jProject(projectDir))) {
-    console.error(chalk.red('❌ Not in an eva4j project directory'));
-    console.error(chalk.gray('Run this command inside a project created with eva4j'));
-    process.exit(1);
-  }
-
-  // ── Read system.yaml ──────────────────────────────────────────────────────
-  const systemYamlPath = path.join(projectDir, 'system.yaml');
-  if (!(await fs.pathExists(systemYamlPath))) {
-    console.error(chalk.red('❌ system.yaml not found in project root'));
-    console.error(chalk.gray('Create a system.yaml file first'));
-    process.exit(1);
-  }
-
-  let systemConfig;
-  try {
-    const content = await fs.readFile(systemYamlPath, 'utf-8');
-    systemConfig = yaml.load(content);
-  } catch (err) {
-    console.error(chalk.red('❌ Failed to parse system.yaml:'), err.message);
-    process.exit(1);
-  }
-
-  const { messaging, modules = [] } = systemConfig;
-
-  if (!modules.length) {
-    console.log(chalk.yellow('⚠️  No modules defined in system.yaml'));
-    process.exit(0);
-  }
-
-  console.log(chalk.blue('\n🚀 eva generate system\n'));
-
-  const configManager = new ConfigManager(projectDir);
-
-  // ── Step 1: Add modules ───────────────────────────────────────────────────
-  console.log(chalk.blue('\n📦 Adding modules...\n'));
-
-  for (const mod of modules) {
-    const modulePackageName = toCamelCase(mod.name);
-    const alreadyExists = await configManager.moduleExists(modulePackageName);
-
-    if (alreadyExists) {
-      console.log(chalk.gray(`  ✓ Module '${mod.name}' already exists, skipping`));
-    } else {
-      await addModuleCommand(mod.name, {});
-    }
-  }
-
-  // ── Step 2: Messaging broker client ──────────────────────────────────────
-  if (messaging && messaging.enabled === true) {
-    const broker = messaging.broker;
-    const addClientFn = BROKER_CLIENT_COMMANDS[broker];
-
-    if (!addClientFn) {
-      console.log(chalk.yellow(`  ⚠️  Broker '${broker}' is not yet supported. Skipping client setup.`));
-    } else {
-      const alreadyInstalled = await configManager.featureExists(broker);
-      if (alreadyInstalled) {
-        console.log(chalk.gray(`  ✓ ${broker}-client already installed, skipping\n`));
-      } else {
-        console.log(chalk.blue(`\n📡 Adding ${broker}-client...\n`));
-        await addClientFn();
-      }
-    }
-  }
-
-  // ── Step 3: Generate domain.yaml per module ───────────────────────────────
-  const projectConfig = await configManager.loadProjectConfig();
-  if (!projectConfig) {
-    console.error(chalk.red('❌ Could not load project configuration'));
-    process.exit(1);
-  }
-
-  const packagePath = toPackagePath(projectConfig.packageName);
-
-  console.log(chalk.blue('\n📄 Generating domain.yaml skeletons...\n'));
-
-  for (const mod of modules) {
-    const modulePackageName = toCamelCase(mod.name);
-    const moduleDir = path.join(projectDir, 'src', 'main', 'java', packagePath, modulePackageName);
-    const domainYamlPath = path.join(moduleDir, 'domain.yaml');
-
-    const existed = await fs.pathExists(domainYamlPath);
-    const content = buildDomainYaml(mod, systemConfig);
-    await fs.writeFile(domainYamlPath, content, 'utf-8');
-
-    if (existed) {
-      console.log(chalk.yellow(`  ♻️  ${modulePackageName}/domain.yaml overwritten`));
-    } else {
-      console.log(chalk.green(`  ✨ ${modulePackageName}/domain.yaml created`));
-    }
-  }
-
-  console.log(chalk.blue('\n✅ System bootstrap complete!\n'));
-  console.log(chalk.white('Next steps:'));
-  console.log(chalk.gray("  1. Edit each module's domain.yaml — add fields, enums, and refine the aggregate"));
-  console.log(chalk.gray('  2. Run: eva g entities <module>  (for each module)'));
-  console.log(chalk.gray('\n  Tip: run eva system validate to check cross-module consistency'));
-  console.log();
-}
-
-// ── Domain YAML builder ───────────────────────────────────────────────────────
-
-function buildDomainYaml(mod, systemConfig) {
-  const integrations = systemConfig.integrations || {};
-  const asyncEvents = integrations.async || [];
-  const syncCalls = integrations.sync || [];
-
-  const moduleName = mod.name;
-  const aggregateName = toPascalCase(pluralize.singular(moduleName));
-  const entityName = aggregateName.charAt(0).toLowerCase() + aggregateName.slice(1);
-  const tableName = moduleName.replace(/-/g, '_');
-
-  // Events this module produces
-  const producedEvents = asyncEvents.filter(e => e.producer === moduleName);
-  // Sync calls this module makes as caller
-  const outboundPorts = syncCalls.filter(s => s.caller === moduleName);
-  // REST endpoints exposed by this module
-  const exposes = mod.exposes || [];
-
-  const lines = [];
-  const today = new Date().toISOString().split('T')[0];
-
-  lines.push(`# domain.yaml — ${moduleName}`);
-  lines.push(`# Generated by: eva generate system  (${today})`);
-  lines.push(`#`);
-  lines.push(`# TODO: Complete this file:`);
-  lines.push(`#   - Add entity fields under aggregates[].entities[].fields`);
-  if (producedEvents.length) lines.push(`#   - Add event fields under aggregates[].events[].fields`);
-  if (outboundPorts.length)  lines.push(`#   - Add response shapes to ports[].methods[].response`);
-  if (exposes.length)        lines.push(`#   - Verify endpoints[].operations match the use cases in aggregates[]`);
-  lines.push(``);
-
-  // ── aggregates ────────────────────────────────────────────────────────────
-  lines.push(`aggregates:`);
-  lines.push(`  - name: ${aggregateName}`);
-  lines.push(`    entities:`);
-  lines.push(`      - name: ${entityName}`);
-  lines.push(`        isRoot: true`);
-  lines.push(`        tableName: ${tableName}`);
-  lines.push(`        audit:`);
-  lines.push(`          enabled: true`);
-  lines.push(`        fields:`);
-  lines.push(`          - name: id`);
-  lines.push(`            type: String`);
-  lines.push(`          # TODO: add more fields`);
-
-  if (producedEvents.length) {
-    lines.push(`    events:`);
-    for (const ev of producedEvents) {
-      lines.push(`      - name: ${ev.event}`);
-      lines.push(`        fields: []  # TODO: add event fields`);
-      lines.push(`        kafka: true`);
-    }
-  }
-
-  lines.push(``);
-
-  // ── endpoints ─────────────────────────────────────────────────────────────
-  if (exposes.length) {
-    // Derive basePath from the first exposed endpoint (e.g. /orders/{id} → /orders)
-    const basePath = '/' + (exposes[0].path || '').replace(/^\//, '').split('/')[0];
-    lines.push(`endpoints:`);
-    lines.push(`  basePath: ${basePath}`);
-    lines.push(`  versions:`);
-    lines.push(`    - version: v1`);
-    lines.push(`      operations:`);
-    for (const ep of exposes) {
-      lines.push(`        - useCase: ${ep.useCase}`);
-      lines.push(`          method: ${ep.method}`);
-      lines.push(`          path: ${ep.path}`);
-      if (ep.description) lines.push(`          description: "${ep.description}"`);
-    }
-    lines.push(``);
-  }
-
-  // ── ports ─────────────────────────────────────────────────────────────────
-  if (outboundPorts.length) {
-    lines.push(`ports:`);
-    for (const port of outboundPorts) {
-      lines.push(`  - name: ${port.port}`);
-      lines.push(`    target: ${port.calls}  # from system.yaml integrations.sync`);
-      lines.push(`    methods:`);
-      for (const endpoint of (port.using || [])) {
-        const methodName = deriveMethodName(endpoint);
-        lines.push(`      - name: ${methodName}  # TODO: rename if needed`);
-        lines.push(`        http: ${endpoint}`);
-        lines.push(`        response: []  # TODO: add response fields`);
-      }
-    }
-    lines.push(``);
-  }
-
-  return lines.join('\n');
-}
-
-/**
- * Derive a camelCase Java method name from an HTTP entry like "GET /customers/{id}"
- */
-function deriveMethodName(httpEntry) {
-  const parts = httpEntry.trim().split(/\s+/);
-  const method = (parts[0] || 'GET').toUpperCase();
-  const urlPath = parts[1] || '/';
-
-  const segments = urlPath.split('/').filter(s => s.length > 0);
-  const hasId = segments.some(s => s.charAt(0) === '{');
-  const resourceSegments = segments.filter(s => s.charAt(0) !== '{');
-  const lastResource = resourceSegments[resourceSegments.length - 1] || 'resource';
-  const singular = pluralize.singular(lastResource);
-  const pascal = toPascalCase(singular);
-
-  if (method === 'GET' && hasId) return `find${pascal}ById`;
-  if (method === 'GET') return `findAll${toPascalCase(lastResource)}`;
-  if (method === 'POST') return `create${pascal}`;
-  if (method === 'PUT' || method === 'PATCH') return `update${pascal}`;
-  if (method === 'DELETE') return `delete${pascal}`;
-  return toCamelCase(`${method.toLowerCase()}_${lastResource}`);
-}
-
-module.exports = generateSystemCommand;