From 361ad8b024652314454963e526fe9db7ce2db643 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 04:06:20 +0000 Subject: [PATCH 01/13] Initial plan for Spring Boot alignment task Agent-Logs-Url: https://github.com/Preponderous-Software/viron/sessions/470d9365-95a3-40b1-94d1-c94066faa997 Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- mvnw | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 mvnw diff --git a/mvnw b/mvnw old mode 100644 new mode 100755 From 6877ac829d5975f13c96c18ce3b1a773779ce924 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 04:09:45 +0000 Subject: [PATCH 02/13] Add DTOs, MapStruct mappers, GlobalExceptionHandler, @Validated controllers Agent-Logs-Url: https://github.com/Preponderous-Software/viron/sessions/470d9365-95a3-40b1-94d1-c94066faa997 Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- pom.xml | 20 ++ .../viron/controllers/DebugController.java | 31 ++- .../viron/controllers/EntityController.java | 114 ++++----- .../controllers/EnvironmentController.java | 224 +++++++----------- .../viron/controllers/GridController.java | 55 ++--- .../viron/controllers/LocationController.java | 102 +++----- .../preponderous/viron/dto/EntityDto.java | 21 ++ .../viron/dto/EnvironmentDto.java | 21 ++ .../preponderous/viron/dto/ErrorResponse.java | 18 ++ .../java/preponderous/viron/dto/GridDto.java | 21 ++ .../preponderous/viron/dto/LocationDto.java | 21 ++ .../exceptions/GlobalExceptionHandler.java | 82 +++++++ .../exceptions/InvalidRequestException.java | 7 + .../viron/mappers/EntityMapper.java | 14 ++ .../viron/mappers/EnvironmentMapper.java | 14 ++ .../viron/mappers/GridMapper.java | 14 ++ .../viron/mappers/LocationMapper.java | 14 ++ 17 files changed, 482 insertions(+), 311 deletions(-) create mode 100644 src/main/java/preponderous/viron/dto/EntityDto.java create mode 100644 src/main/java/preponderous/viron/dto/EnvironmentDto.java create mode 100644 src/main/java/preponderous/viron/dto/ErrorResponse.java create mode 100644 src/main/java/preponderous/viron/dto/GridDto.java create mode 100644 src/main/java/preponderous/viron/dto/LocationDto.java create mode 100644 src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java create mode 100644 src/main/java/preponderous/viron/exceptions/InvalidRequestException.java create mode 100644 src/main/java/preponderous/viron/mappers/EntityMapper.java create mode 100644 src/main/java/preponderous/viron/mappers/EnvironmentMapper.java create mode 100644 src/main/java/preponderous/viron/mappers/GridMapper.java create mode 100644 src/main/java/preponderous/viron/mappers/LocationMapper.java diff --git a/pom.xml b/pom.xml index 8d104b3..4dcc2fd 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ Environment manager 21 + 1.5.5.Final @@ -49,6 +50,15 @@ springdoc-openapi-starter-webmvc-ui 2.3.0 + + org.mapstruct + mapstruct + ${mapstruct.version} + + + org.springframework.boot + spring-boot-starter-validation + org.springframework.boot spring-boot-starter-actuator @@ -92,6 +102,16 @@ lombok 1.18.30 + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + diff --git a/src/main/java/preponderous/viron/controllers/DebugController.java b/src/main/java/preponderous/viron/controllers/DebugController.java index def2681..edf1bba 100644 --- a/src/main/java/preponderous/viron/controllers/DebugController.java +++ b/src/main/java/preponderous/viron/controllers/DebugController.java @@ -4,14 +4,21 @@ import java.util.Arrays; import java.util.List; +import jakarta.validation.constraints.NotBlank; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import preponderous.viron.dto.EntityDto; +import preponderous.viron.dto.EnvironmentDto; +import preponderous.viron.exceptions.InvalidRequestException; +import preponderous.viron.mappers.EntityMapper; +import preponderous.viron.mappers.EnvironmentMapper; import preponderous.viron.models.Entity; import preponderous.viron.models.Environment; import preponderous.viron.models.Grid; @@ -24,19 +31,26 @@ @RestController @RequestMapping("/api/v1/debug") @Slf4j +@Validated public class DebugController { private final EntityService entityService; private final EnvironmentService environmentService; private final GridService gridService; private final LocationService locationService; + private final EntityMapper entityMapper; + private final EnvironmentMapper environmentMapper; List entityNamePool = new ArrayList<>(Arrays.asList("Tom", "Jerry", "Spike", "Tyke", "Nibbles", "Butch", "Tuffy", "Lightning", "Mammy", "Quacker", "Toodles", "Droopy", "Screwy", "Meathead", "George", "Dripple", "McWolf")); - public DebugController(EntityService entityService, EnvironmentService environmentService, GridService gridService, LocationService locationService) { + public DebugController(EntityService entityService, EnvironmentService environmentService, + GridService gridService, LocationService locationService, + EntityMapper entityMapper, EnvironmentMapper environmentMapper) { this.entityService = entityService; this.environmentService = environmentService; this.gridService = gridService; this.locationService = locationService; + this.entityMapper = entityMapper; + this.environmentMapper = environmentMapper; } /** @@ -44,7 +58,7 @@ public DebugController(EntityService entityService, EnvironmentService environme * It ensures the entities are properly created and assigned to valid locations in the grid. */ @PostMapping("/create-sample-data") - public ResponseEntity createSampleData() { + public ResponseEntity createSampleData() { // create an environment with one 10x10 grid Environment environment = environmentService.createEnvironment("Sample Environment", 1, 10); List grids = gridService.getGridsInEnvironment(environment.getEnvironmentId()); @@ -66,12 +80,12 @@ public ResponseEntity createSampleData() { } } if (location == null) { - return ResponseEntity.badRequest().body(null); // exit if no valid location found + throw new InvalidRequestException("No valid location found at coordinates (" + x + ", " + y + ")"); } locationService.addEntityToLocation(entity.getEntityId(), location.getLocationId()); } - return ResponseEntity.ok(environment); + return ResponseEntity.status(HttpStatus.CREATED).body(environmentMapper.toDto(environment)); } /** @@ -81,7 +95,7 @@ public ResponseEntity createSampleData() { * @param environmentName the name of the environment to be created */ @PostMapping("/create-world-and-place-entity/{environmentName}") - public ResponseEntity createWorldAndPlaceEntity(@PathVariable String environmentName) { + public ResponseEntity createWorldAndPlaceEntity(@PathVariable @NotBlank String environmentName) { // create an environment int numGrids = 1; int gridSize = 5; @@ -110,11 +124,10 @@ public ResponseEntity createWorldAndPlaceEntity(@PathVariable String env } } if (location == null) { - log.error("No valid location found for entity at row {} and column {}", entityRow, entityColumn); - return ResponseEntity.badRequest().body(null); + throw new InvalidRequestException("No valid location found for entity at row " + entityRow + " and column " + entityColumn); } locationService.addEntityToLocation(entity.getEntityId(), location.getLocationId()); log.info("Entity {} placed at location ({}, {})", entity.getName(), entityRow, entityColumn); - return ResponseEntity.ok(entity); + return ResponseEntity.status(HttpStatus.CREATED).body(entityMapper.toDto(entity)); } } \ No newline at end of file diff --git a/src/main/java/preponderous/viron/controllers/EntityController.java b/src/main/java/preponderous/viron/controllers/EntityController.java index 14a3e1c..a7dae68 100644 --- a/src/main/java/preponderous/viron/controllers/EntityController.java +++ b/src/main/java/preponderous/viron/controllers/EntityController.java @@ -2,120 +2,88 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import preponderous.viron.exceptions.EntityCreationException; +import preponderous.viron.dto.EntityDto; +import preponderous.viron.exceptions.NotFoundException; import preponderous.viron.factories.EntityFactory; +import preponderous.viron.mappers.EntityMapper; import preponderous.viron.models.Entity; import preponderous.viron.repositories.EntityRepository; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; import java.util.List; @RestController @RequestMapping("/api/v1/entities") @Slf4j @RequiredArgsConstructor +@Validated public class EntityController { private final EntityRepository entityRepository; private final EntityFactory entityFactory; + private final EntityMapper entityMapper; @GetMapping - public ResponseEntity> getAllEntities() { - try { - return ResponseEntity.ok(entityRepository.findAll()); - } catch (Exception e) { - log.error("Error fetching all entities: {}", e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity> getAllEntities() { + List entities = entityRepository.findAll(); + return ResponseEntity.ok(entityMapper.toDtoList(entities)); } @GetMapping("/{id}") - public ResponseEntity getEntityById(@PathVariable int id) { - try { - return entityRepository.findById(id) - .map(ResponseEntity::ok) - .orElse(ResponseEntity.notFound().build()); - } catch (Exception e) { - log.error("Error fetching entity by id {}: {}", id, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity getEntityById(@PathVariable @Min(1) int id) { + Entity entity = entityRepository.findById(id) + .orElseThrow(() -> new NotFoundException("Entity not found with id: " + id)); + return ResponseEntity.ok(entityMapper.toDto(entity)); } @GetMapping("/environment/{environmentId}") - public ResponseEntity> getEntitiesInEnvironment(@PathVariable int environmentId) { - try { - return ResponseEntity.ok(entityRepository.findByEnvironmentId(environmentId)); - } catch (Exception e) { - log.error("Error fetching entities in environment {}: {}", environmentId, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity> getEntitiesInEnvironment(@PathVariable @Min(1) int environmentId) { + List entities = entityRepository.findByEnvironmentId(environmentId); + return ResponseEntity.ok(entityMapper.toDtoList(entities)); } @GetMapping("/grid/{gridId}") - public ResponseEntity> getEntitiesInGrid(@PathVariable int gridId) { - try { - return ResponseEntity.ok(entityRepository.findByGridId(gridId)); - } catch (Exception e) { - log.error("Error fetching entities in grid {}: {}", gridId, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity> getEntitiesInGrid(@PathVariable @Min(1) int gridId) { + List entities = entityRepository.findByGridId(gridId); + return ResponseEntity.ok(entityMapper.toDtoList(entities)); } @GetMapping("/location/{locationId}") - public ResponseEntity> getEntitiesInLocation(@PathVariable int locationId) { - try { - return ResponseEntity.ok(entityRepository.findByLocationId(locationId)); - } catch (Exception e) { - log.error("Error fetching entities in location {}: {}", locationId, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity> getEntitiesInLocation(@PathVariable @Min(1) int locationId) { + List entities = entityRepository.findByLocationId(locationId); + return ResponseEntity.ok(entityMapper.toDtoList(entities)); } @GetMapping("/unassigned") - public ResponseEntity> getEntitiesNotInAnyLocation() { - try { - return ResponseEntity.ok(entityRepository.findEntitiesNotInAnyLocation()); - } catch (Exception e) { - log.error("Error fetching unassigned entities: {}", e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity> getEntitiesNotInAnyLocation() { + List entities = entityRepository.findEntitiesNotInAnyLocation(); + return ResponseEntity.ok(entityMapper.toDtoList(entities)); } @PostMapping("/{name}") - public ResponseEntity createEntity(@PathVariable String name) { - try { - Entity newEntity = entityFactory.createEntity(name); - return ResponseEntity.ok(newEntity); - } catch (EntityCreationException e) { - log.error("Error creating entity with name {}: {}", name, e.getMessage()); - return ResponseEntity.badRequest().build(); - } catch (Exception e) { - log.error("Unexpected error creating entity: {}", e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity createEntity(@PathVariable @NotBlank String name) { + Entity newEntity = entityFactory.createEntity(name); + return ResponseEntity.status(HttpStatus.CREATED).body(entityMapper.toDto(newEntity)); } @DeleteMapping("/{id}") - public ResponseEntity deleteEntity(@PathVariable int id) { - try { - return entityRepository.deleteById(id) - ? ResponseEntity.ok().build() - : ResponseEntity.notFound().build(); - } catch (Exception e) { - log.error("Error deleting entity {}: {}", id, e.getMessage()); - return ResponseEntity.internalServerError().build(); + @ResponseStatus(HttpStatus.NO_CONTENT) + public ResponseEntity deleteEntity(@PathVariable @Min(1) int id) { + if (!entityRepository.deleteById(id)) { + throw new NotFoundException("Entity not found with id: " + id); } + return ResponseEntity.noContent().build(); } @PatchMapping("/{id}/name/{name}") - public ResponseEntity updateEntityName(@PathVariable int id, @PathVariable String name) { - try { - return entityRepository.updateName(id, name) - ? ResponseEntity.ok().build() - : ResponseEntity.notFound().build(); - } catch (Exception e) { - log.error("Error updating name for entity {}: {}", id, e.getMessage()); - return ResponseEntity.internalServerError().build(); + public ResponseEntity updateEntityName(@PathVariable @Min(1) int id, @PathVariable @NotBlank String name) { + if (!entityRepository.updateName(id, name)) { + throw new NotFoundException("Entity not found with id: " + id); } + return ResponseEntity.ok().build(); } -} \ No newline at end of file +} diff --git a/src/main/java/preponderous/viron/controllers/EnvironmentController.java b/src/main/java/preponderous/viron/controllers/EnvironmentController.java index ff1933e..166abb6 100644 --- a/src/main/java/preponderous/viron/controllers/EnvironmentController.java +++ b/src/main/java/preponderous/viron/controllers/EnvironmentController.java @@ -6,189 +6,149 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import preponderous.viron.exceptions.EnvironmentCreationException; +import preponderous.viron.dto.EnvironmentDto; +import preponderous.viron.exceptions.NotFoundException; +import preponderous.viron.exceptions.ServiceException; import preponderous.viron.factories.EnvironmentFactory; +import preponderous.viron.mappers.EnvironmentMapper; import preponderous.viron.models.Environment; import preponderous.viron.repositories.EnvironmentRepository; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; import java.util.List; @RestController @RequestMapping("/api/v1/environments") @Slf4j @RequiredArgsConstructor +@Validated public class EnvironmentController { private final EnvironmentRepository environmentRepository; private final EnvironmentFactory environmentFactory; + private final EnvironmentMapper environmentMapper; @GetMapping - public ResponseEntity> getAllEnvironments() { - try { - return ResponseEntity.ok(environmentRepository.findAll()); - } catch (Exception e) { - log.error("Error fetching all environments: {}", e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity> getAllEnvironments() { + List environments = environmentRepository.findAll(); + return ResponseEntity.ok(environmentMapper.toDtoList(environments)); } @GetMapping("/{id}") - public ResponseEntity getEnvironmentById(@PathVariable int id) { - try { - return environmentRepository.findById(id) - .map(ResponseEntity::ok) - .orElse(ResponseEntity.notFound().build()); - } catch (Exception e) { - log.error("Error fetching environment by id {}: {}", id, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity getEnvironmentById(@PathVariable @Min(1) int id) { + Environment environment = environmentRepository.findById(id) + .orElseThrow(() -> new NotFoundException("Environment not found with id: " + id)); + return ResponseEntity.ok(environmentMapper.toDto(environment)); } @GetMapping("/name/{name}") - public ResponseEntity getEnvironmentByName(@PathVariable String name) { - try { - return environmentRepository.findByName(name) - .map(ResponseEntity::ok) - .orElse(ResponseEntity.notFound().build()); - } catch (Exception e) { - log.error("Error fetching environment by name {}: {}", name, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity getEnvironmentByName(@PathVariable @NotBlank String name) { + Environment environment = environmentRepository.findByName(name) + .orElseThrow(() -> new NotFoundException("Environment not found with name: " + name)); + return ResponseEntity.ok(environmentMapper.toDto(environment)); } @GetMapping("/entity/{entityId}") - public ResponseEntity getEnvironmentOfEntity(@PathVariable int entityId) { - try { - return environmentRepository.findByEntityId(entityId) - .map(ResponseEntity::ok) - .orElse(ResponseEntity.notFound().build()); - } catch (Exception e) { - log.error("Error fetching environment for entity {}: {}", entityId, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity getEnvironmentOfEntity(@PathVariable @Min(1) int entityId) { + Environment environment = environmentRepository.findByEntityId(entityId) + .orElseThrow(() -> new NotFoundException("Environment not found for entity: " + entityId)); + return ResponseEntity.ok(environmentMapper.toDto(environment)); } @PostMapping("/{name}/{numGrids}/{gridSize}") - public ResponseEntity createEnvironment( - @PathVariable String name, - @PathVariable int numGrids, - @PathVariable int gridSize) { - try { - Environment newEnvironment = environmentFactory.createEnvironment(name, numGrids, gridSize); - return ResponseEntity.ok(newEnvironment); - } catch (EnvironmentCreationException e) { - log.error("Error creating environment with name {}: {}", name, e.getMessage()); - return ResponseEntity.badRequest().build(); - } catch (Exception e) { - log.error("Unexpected error creating environment: {}", e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity createEnvironment( + @PathVariable @NotBlank String name, + @PathVariable @Min(1) int numGrids, + @PathVariable @Min(1) int gridSize) { + Environment newEnvironment = environmentFactory.createEnvironment(name, numGrids, gridSize); + return ResponseEntity.status(HttpStatus.CREATED).body(environmentMapper.toDto(newEnvironment)); } @DeleteMapping("/{id}") - public ResponseEntity deleteEnvironment(@PathVariable int id) { - try { - if (environmentRepository.findById(id).isEmpty()) { - log.info("Environment with id {} does not exist, cannot delete", id); - return ResponseEntity.notFound().build(); - } - - log.info("Attempting to delete environment with id {}", id); + public ResponseEntity deleteEnvironment(@PathVariable @Min(1) int id) { + if (environmentRepository.findById(id).isEmpty()) { + throw new NotFoundException("Environment not found with id: " + id); + } - List entityIds = environmentRepository.findEntityIdsByEnvironmentId(id); - List locationIds = environmentRepository.findLocationIdsByEnvironmentId(id); - List gridIds = environmentRepository.findGridIdsByEnvironmentId(id); + log.info("Attempting to delete environment with id {}", id); - // Delete associations - for (int entityId : entityIds) { - if (!environmentRepository.deleteEntityLocation(entityId)) { - log.error("Error deleting entity_location with entity id {}", entityId); - return ResponseEntity.internalServerError().build(); - } - } + List entityIds = environmentRepository.findEntityIdsByEnvironmentId(id); + List locationIds = environmentRepository.findLocationIdsByEnvironmentId(id); + List gridIds = environmentRepository.findGridIdsByEnvironmentId(id); - for (int locationId : locationIds) { - if (!environmentRepository.deleteLocationGrid(locationId)) { - log.error("Error deleting location_grid with location id {}", locationId); - return ResponseEntity.internalServerError().build(); - } + // Delete associations + for (int entityId : entityIds) { + if (!environmentRepository.deleteEntityLocation(entityId)) { + throw new ServiceException("Error deleting entity_location with entity id " + entityId); } + } - for (int gridId : gridIds) { - if (!environmentRepository.deleteGridEnvironment(gridId)) { - log.error("Error deleting grid_environment with grid id {}", gridId); - return ResponseEntity.internalServerError().build(); - } + for (int locationId : locationIds) { + if (!environmentRepository.deleteLocationGrid(locationId)) { + throw new ServiceException("Error deleting location_grid with location id " + locationId); } + } - // Delete entities - for (int entityId : entityIds) { - if (!environmentRepository.deleteEntity(entityId)) { - log.error("Error deleting entity with id {}", entityId); - return ResponseEntity.internalServerError().build(); - } - } - if (!entityIds.isEmpty()) { - log.info("Entities deleted: {}", entityIds); + for (int gridId : gridIds) { + if (!environmentRepository.deleteGridEnvironment(gridId)) { + throw new ServiceException("Error deleting grid_environment with grid id " + gridId); } + } - // Delete locations - for (int locationId : locationIds) { - if (!environmentRepository.deleteLocation(locationId)) { - log.error("Error deleting location with id {}", locationId); - return ResponseEntity.internalServerError().build(); - } - } - if (!locationIds.isEmpty()) { - log.info("Locations deleted: {}", locationIds); + // Delete entities + for (int entityId : entityIds) { + if (!environmentRepository.deleteEntity(entityId)) { + throw new ServiceException("Error deleting entity with id " + entityId); } + } + if (!entityIds.isEmpty()) { + log.info("Entities deleted: {}", entityIds); + } - // Delete grids - for (int gridId : gridIds) { - if (!environmentRepository.deleteGrid(gridId)) { - log.error("Error deleting grid with id {}", gridId); - return ResponseEntity.internalServerError().build(); - } - } - if (!gridIds.isEmpty()) { - log.info("Grids deleted: {}", gridIds); + // Delete locations + for (int locationId : locationIds) { + if (!environmentRepository.deleteLocation(locationId)) { + throw new ServiceException("Error deleting location with id " + locationId); } + } + if (!locationIds.isEmpty()) { + log.info("Locations deleted: {}", locationIds); + } - // Delete environment - if (!environmentRepository.deleteById(id)) { - log.error("Error deleting environment with id {}", id); - return ResponseEntity.internalServerError().build(); + // Delete grids + for (int gridId : gridIds) { + if (!environmentRepository.deleteGrid(gridId)) { + throw new ServiceException("Error deleting grid with id " + gridId); } + } + if (!gridIds.isEmpty()) { + log.info("Grids deleted: {}", gridIds); + } - log.info("Environment with id {} deleted", id); - return ResponseEntity.ok().build(); - } catch (Exception e) { - log.error("Error deleting environment {}: {}", id, e.getMessage()); - return ResponseEntity.internalServerError().build(); + // Delete environment + if (!environmentRepository.deleteById(id)) { + throw new ServiceException("Error deleting environment with id " + id); } + + log.info("Environment with id {} deleted", id); + return ResponseEntity.noContent().build(); } @PatchMapping("/{id}/name/{name}") - public ResponseEntity updateEnvironmentName(@PathVariable int id, @PathVariable String name) { - try { - // First check if the environment exists - if (environmentRepository.findById(id).isEmpty()) { - log.info("Environment with id {} not found", id); - return ResponseEntity.notFound().build(); - } + public ResponseEntity updateEnvironmentName(@PathVariable @Min(1) int id, @PathVariable @NotBlank String name) { + if (environmentRepository.findById(id).isEmpty()) { + throw new NotFoundException("Environment not found with id: " + id); + } - boolean updated = environmentRepository.updateName(id, name); - if (updated) { - log.info("Updated name for environment {} to '{}'", id, name); - return ResponseEntity.ok().build(); - } else { - log.error("Failed to update name for environment {}", id); - return ResponseEntity.internalServerError().build(); - } - } catch (Exception e) { - log.error("Error updating name for environment {}: {}", id, e.getMessage()); - return ResponseEntity.internalServerError().build(); + if (!environmentRepository.updateName(id, name)) { + throw new ServiceException("Failed to update name for environment " + id); } + + log.info("Updated name for environment {} to '{}'", id, name); + return ResponseEntity.ok().build(); } -} \ No newline at end of file +} diff --git a/src/main/java/preponderous/viron/controllers/GridController.java b/src/main/java/preponderous/viron/controllers/GridController.java index 9a78727..312fe42 100644 --- a/src/main/java/preponderous/viron/controllers/GridController.java +++ b/src/main/java/preponderous/viron/controllers/GridController.java @@ -3,60 +3,49 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import preponderous.viron.dto.GridDto; +import preponderous.viron.exceptions.NotFoundException; +import preponderous.viron.mappers.GridMapper; import preponderous.viron.models.Grid; import preponderous.viron.repositories.GridRepository; +import jakarta.validation.constraints.Min; import java.util.List; @RestController @RequestMapping("/api/v1/grids") @Slf4j @RequiredArgsConstructor +@Validated public class GridController { private final GridRepository gridRepository; + private final GridMapper gridMapper; @GetMapping - public ResponseEntity> getAllGrids() { - try { - return ResponseEntity.ok(gridRepository.findAll()); - } catch (Exception e) { - log.error("Error fetching all grids: {}", e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity> getAllGrids() { + List grids = gridRepository.findAll(); + return ResponseEntity.ok(gridMapper.toDtoList(grids)); } @GetMapping("/{id}") - public ResponseEntity getGridById(@PathVariable int id) { - try { - return gridRepository.findById(id) - .map(ResponseEntity::ok) - .orElse(ResponseEntity.notFound().build()); - } catch (Exception e) { - log.error("Error fetching grid by id {}: {}", id, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity getGridById(@PathVariable @Min(1) int id) { + Grid grid = gridRepository.findById(id) + .orElseThrow(() -> new NotFoundException("Grid not found with id: " + id)); + return ResponseEntity.ok(gridMapper.toDto(grid)); } @GetMapping("/environment/{environmentId}") - public ResponseEntity> getGridsInEnvironment(@PathVariable int environmentId) { - try { - return ResponseEntity.ok(gridRepository.findByEnvironmentId(environmentId)); - } catch (Exception e) { - log.error("Error fetching grids in environment {}: {}", environmentId, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity> getGridsInEnvironment(@PathVariable @Min(1) int environmentId) { + List grids = gridRepository.findByEnvironmentId(environmentId); + return ResponseEntity.ok(gridMapper.toDtoList(grids)); } @GetMapping("/entity/{entityId}") - public ResponseEntity getGridOfEntity(@PathVariable int entityId) { - try { - return gridRepository.findByEntityId(entityId) - .map(ResponseEntity::ok) - .orElse(ResponseEntity.notFound().build()); - } catch (Exception e) { - log.error("Error fetching grid for entity {}: {}", entityId, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity getGridOfEntity(@PathVariable @Min(1) int entityId) { + Grid grid = gridRepository.findByEntityId(entityId) + .orElseThrow(() -> new NotFoundException("Grid not found for entity: " + entityId)); + return ResponseEntity.ok(gridMapper.toDto(grid)); } -} \ No newline at end of file +} diff --git a/src/main/java/preponderous/viron/controllers/LocationController.java b/src/main/java/preponderous/viron/controllers/LocationController.java index 152bde9..cf48689 100644 --- a/src/main/java/preponderous/viron/controllers/LocationController.java +++ b/src/main/java/preponderous/viron/controllers/LocationController.java @@ -2,107 +2,81 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import preponderous.viron.dto.LocationDto; +import preponderous.viron.exceptions.NotFoundException; +import preponderous.viron.mappers.LocationMapper; import preponderous.viron.models.Location; import preponderous.viron.repositories.LocationRepository; +import jakarta.validation.constraints.Min; import java.util.List; @RestController @RequestMapping("/api/v1/locations") @Slf4j @RequiredArgsConstructor +@Validated public class LocationController { private final LocationRepository locationRepository; + private final LocationMapper locationMapper; @GetMapping - public ResponseEntity> getAllLocations() { - try { - return ResponseEntity.ok(locationRepository.findAll()); - } catch (Exception e) { - log.error("Error fetching all locations: {}", e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity> getAllLocations() { + List locations = locationRepository.findAll(); + return ResponseEntity.ok(locationMapper.toDtoList(locations)); } @GetMapping("/{id}") - public ResponseEntity getLocationById(@PathVariable int id) { - try { - return locationRepository.findById(id) - .map(ResponseEntity::ok) - .orElse(ResponseEntity.notFound().build()); - } catch (Exception e) { - log.error("Error fetching location by id {}: {}", id, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity getLocationById(@PathVariable @Min(1) int id) { + Location location = locationRepository.findById(id) + .orElseThrow(() -> new NotFoundException("Location not found with id: " + id)); + return ResponseEntity.ok(locationMapper.toDto(location)); } @GetMapping("/environment/{environmentId}") - public ResponseEntity> getLocationsInEnvironment(@PathVariable int environmentId) { - try { - return ResponseEntity.ok(locationRepository.findByEnvironmentId(environmentId)); - } catch (Exception e) { - log.error("Error fetching locations in environment {}: {}", environmentId, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity> getLocationsInEnvironment(@PathVariable @Min(1) int environmentId) { + List locations = locationRepository.findByEnvironmentId(environmentId); + return ResponseEntity.ok(locationMapper.toDtoList(locations)); } @GetMapping("/grid/{gridId}") - public ResponseEntity> getLocationsInGrid(@PathVariable int gridId) { - try { - return ResponseEntity.ok(locationRepository.findByGridId(gridId)); - } catch (Exception e) { - log.error("Error fetching locations in grid {}: {}", gridId, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity> getLocationsInGrid(@PathVariable @Min(1) int gridId) { + List locations = locationRepository.findByGridId(gridId); + return ResponseEntity.ok(locationMapper.toDtoList(locations)); } @GetMapping("/entity/{entityId}") - public ResponseEntity getLocationOfEntity(@PathVariable int entityId) { - try { - return locationRepository.findByEntityId(entityId) - .map(ResponseEntity::ok) - .orElse(ResponseEntity.notFound().build()); - } catch (Exception e) { - log.error("Error fetching location of entity {}: {}", entityId, e.getMessage()); - return ResponseEntity.internalServerError().build(); - } + public ResponseEntity getLocationOfEntity(@PathVariable @Min(1) int entityId) { + Location location = locationRepository.findByEntityId(entityId) + .orElseThrow(() -> new NotFoundException("Location not found for entity: " + entityId)); + return ResponseEntity.ok(locationMapper.toDto(location)); } @PutMapping("/{locationId}/entity/{entityId}") - public ResponseEntity addEntityToLocation(@PathVariable int entityId, @PathVariable int locationId) { - try { - return locationRepository.addEntityToLocation(entityId, locationId) - ? ResponseEntity.ok().build() - : ResponseEntity.notFound().build(); - } catch (Exception e) { - log.error("Error adding entity {} to location {}: {}", entityId, locationId, e.getMessage()); - return ResponseEntity.internalServerError().build(); + public ResponseEntity addEntityToLocation(@PathVariable @Min(1) int entityId, @PathVariable @Min(1) int locationId) { + if (!locationRepository.addEntityToLocation(entityId, locationId)) { + throw new NotFoundException("Location or entity not found"); } + return ResponseEntity.ok().build(); } @DeleteMapping("/{locationId}/entity/{entityId}") - public ResponseEntity removeEntityFromLocation(@PathVariable int entityId, @PathVariable int locationId) { - try { - return locationRepository.removeEntityFromLocation(entityId, locationId) - ? ResponseEntity.ok().build() - : ResponseEntity.notFound().build(); - } catch (Exception e) { - log.error("Error removing entity {} from location {}: {}", entityId, locationId, e.getMessage()); - return ResponseEntity.internalServerError().build(); + public ResponseEntity removeEntityFromLocation(@PathVariable @Min(1) int entityId, @PathVariable @Min(1) int locationId) { + if (!locationRepository.removeEntityFromLocation(entityId, locationId)) { + throw new NotFoundException("Location or entity not found"); } + return ResponseEntity.noContent().build(); } @DeleteMapping("/entity/{entityId}") - public ResponseEntity removeEntityFromCurrentLocation(@PathVariable int entityId) { - try { - return locationRepository.removeEntityFromCurrentLocation(entityId) - ? ResponseEntity.ok().build() - : ResponseEntity.notFound().build(); - } catch (Exception e) { - log.error("Error removing entity {} from current location: {}", entityId, e.getMessage()); - return ResponseEntity.internalServerError().build(); + public ResponseEntity removeEntityFromCurrentLocation(@PathVariable @Min(1) int entityId) { + if (!locationRepository.removeEntityFromCurrentLocation(entityId)) { + throw new NotFoundException("Entity not found with id: " + entityId); } + return ResponseEntity.noContent().build(); } -} \ No newline at end of file +} diff --git a/src/main/java/preponderous/viron/dto/EntityDto.java b/src/main/java/preponderous/viron/dto/EntityDto.java new file mode 100644 index 0000000..3cbd425 --- /dev/null +++ b/src/main/java/preponderous/viron/dto/EntityDto.java @@ -0,0 +1,21 @@ +package preponderous.viron.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "Data transfer object representing an entity") +public class EntityDto { + @Schema(description = "Unique identifier of the entity") + private int entityId; + + @Schema(description = "Name of the entity") + private String name; + + @Schema(description = "Date when the entity was created") + private String creationDate; +} diff --git a/src/main/java/preponderous/viron/dto/EnvironmentDto.java b/src/main/java/preponderous/viron/dto/EnvironmentDto.java new file mode 100644 index 0000000..e5e9716 --- /dev/null +++ b/src/main/java/preponderous/viron/dto/EnvironmentDto.java @@ -0,0 +1,21 @@ +package preponderous.viron.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "Data transfer object representing an environment") +public class EnvironmentDto { + @Schema(description = "Unique identifier of the environment") + private int environmentId; + + @Schema(description = "Name of the environment") + private String name; + + @Schema(description = "Date when the environment was created") + private String creationDate; +} diff --git a/src/main/java/preponderous/viron/dto/ErrorResponse.java b/src/main/java/preponderous/viron/dto/ErrorResponse.java new file mode 100644 index 0000000..b7e65e1 --- /dev/null +++ b/src/main/java/preponderous/viron/dto/ErrorResponse.java @@ -0,0 +1,18 @@ +package preponderous.viron.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "Standard error response body") +public class ErrorResponse { + @Schema(description = "HTTP status code") + private int status; + + @Schema(description = "Error message describing what went wrong") + private String message; +} diff --git a/src/main/java/preponderous/viron/dto/GridDto.java b/src/main/java/preponderous/viron/dto/GridDto.java new file mode 100644 index 0000000..dc278eb --- /dev/null +++ b/src/main/java/preponderous/viron/dto/GridDto.java @@ -0,0 +1,21 @@ +package preponderous.viron.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "Data transfer object representing a grid") +public class GridDto { + @Schema(description = "Unique identifier of the grid") + private int gridId; + + @Schema(description = "Number of rows in the grid") + private int rows; + + @Schema(description = "Number of columns in the grid") + private int columns; +} diff --git a/src/main/java/preponderous/viron/dto/LocationDto.java b/src/main/java/preponderous/viron/dto/LocationDto.java new file mode 100644 index 0000000..fc84495 --- /dev/null +++ b/src/main/java/preponderous/viron/dto/LocationDto.java @@ -0,0 +1,21 @@ +package preponderous.viron.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "Data transfer object representing a location") +public class LocationDto { + @Schema(description = "Unique identifier of the location") + private int locationId; + + @Schema(description = "X coordinate of the location") + private int x; + + @Schema(description = "Y coordinate of the location") + private int y; +} diff --git a/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java b/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java new file mode 100644 index 0000000..16478e9 --- /dev/null +++ b/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java @@ -0,0 +1,82 @@ +package preponderous.viron.exceptions; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.method.annotation.HandlerMethodValidationException; +import preponderous.viron.dto.ErrorResponse; + +@RestControllerAdvice +@Slf4j +public class GlobalExceptionHandler { + + @ExceptionHandler(NotFoundException.class) + public ResponseEntity handleNotFoundException(NotFoundException ex) { + log.error("Resource not found: {}", ex.getMessage()); + ErrorResponse error = new ErrorResponse(HttpStatus.NOT_FOUND.value(), ex.getMessage()); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error); + } + + @ExceptionHandler(EntityCreationException.class) + public ResponseEntity handleEntityCreationException(EntityCreationException ex) { + log.error("Entity creation failed: {}", ex.getMessage()); + ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); + } + + @ExceptionHandler(EnvironmentCreationException.class) + public ResponseEntity handleEnvironmentCreationException(EnvironmentCreationException ex) { + log.error("Environment creation failed: {}", ex.getMessage()); + ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); + } + + @ExceptionHandler(InvalidRequestException.class) + public ResponseEntity handleInvalidRequestException(InvalidRequestException ex) { + log.error("Invalid request: {}", ex.getMessage()); + ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); + } + + @ExceptionHandler(EntityServiceException.class) + public ResponseEntity handleEntityServiceException(EntityServiceException ex) { + log.error("Entity service error: {}", ex.getMessage()); + ErrorResponse error = new ErrorResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } + + @ExceptionHandler(ServiceException.class) + public ResponseEntity handleServiceException(ServiceException ex) { + log.error("Service error: {}", ex.getMessage()); + ErrorResponse error = new ErrorResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleValidationException(MethodArgumentNotValidException ex) { + String message = ex.getBindingResult().getFieldErrors().stream() + .map(error -> error.getField() + ": " + error.getDefaultMessage()) + .reduce((a, b) -> a + "; " + b) + .orElse("Validation failed"); + log.error("Validation error: {}", message); + ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), message); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); + } + + @ExceptionHandler(HandlerMethodValidationException.class) + public ResponseEntity handleHandlerMethodValidationException(HandlerMethodValidationException ex) { + log.error("Validation error: {}", ex.getMessage()); + ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), "Validation failed: " + ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleGenericException(Exception ex) { + log.error("Unexpected error: {}", ex.getMessage(), ex); + ErrorResponse error = new ErrorResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "An unexpected error occurred"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } +} diff --git a/src/main/java/preponderous/viron/exceptions/InvalidRequestException.java b/src/main/java/preponderous/viron/exceptions/InvalidRequestException.java new file mode 100644 index 0000000..9995309 --- /dev/null +++ b/src/main/java/preponderous/viron/exceptions/InvalidRequestException.java @@ -0,0 +1,7 @@ +package preponderous.viron.exceptions; + +public class InvalidRequestException extends RuntimeException { + public InvalidRequestException(String message) { + super(message); + } +} diff --git a/src/main/java/preponderous/viron/mappers/EntityMapper.java b/src/main/java/preponderous/viron/mappers/EntityMapper.java new file mode 100644 index 0000000..2ee4498 --- /dev/null +++ b/src/main/java/preponderous/viron/mappers/EntityMapper.java @@ -0,0 +1,14 @@ +package preponderous.viron.mappers; + +import org.mapstruct.Mapper; +import preponderous.viron.dto.EntityDto; +import preponderous.viron.models.Entity; + +import java.util.List; + +@Mapper(componentModel = "spring") +public interface EntityMapper { + EntityDto toDto(Entity entity); + Entity toEntity(EntityDto dto); + List toDtoList(List entities); +} diff --git a/src/main/java/preponderous/viron/mappers/EnvironmentMapper.java b/src/main/java/preponderous/viron/mappers/EnvironmentMapper.java new file mode 100644 index 0000000..4af9fde --- /dev/null +++ b/src/main/java/preponderous/viron/mappers/EnvironmentMapper.java @@ -0,0 +1,14 @@ +package preponderous.viron.mappers; + +import org.mapstruct.Mapper; +import preponderous.viron.dto.EnvironmentDto; +import preponderous.viron.models.Environment; + +import java.util.List; + +@Mapper(componentModel = "spring") +public interface EnvironmentMapper { + EnvironmentDto toDto(Environment environment); + Environment toEnvironment(EnvironmentDto dto); + List toDtoList(List environments); +} diff --git a/src/main/java/preponderous/viron/mappers/GridMapper.java b/src/main/java/preponderous/viron/mappers/GridMapper.java new file mode 100644 index 0000000..05a9e7f --- /dev/null +++ b/src/main/java/preponderous/viron/mappers/GridMapper.java @@ -0,0 +1,14 @@ +package preponderous.viron.mappers; + +import org.mapstruct.Mapper; +import preponderous.viron.dto.GridDto; +import preponderous.viron.models.Grid; + +import java.util.List; + +@Mapper(componentModel = "spring") +public interface GridMapper { + GridDto toDto(Grid grid); + Grid toGrid(GridDto dto); + List toDtoList(List grids); +} diff --git a/src/main/java/preponderous/viron/mappers/LocationMapper.java b/src/main/java/preponderous/viron/mappers/LocationMapper.java new file mode 100644 index 0000000..80b6d3c --- /dev/null +++ b/src/main/java/preponderous/viron/mappers/LocationMapper.java @@ -0,0 +1,14 @@ +package preponderous.viron.mappers; + +import org.mapstruct.Mapper; +import preponderous.viron.dto.LocationDto; +import preponderous.viron.models.Location; + +import java.util.List; + +@Mapper(componentModel = "spring") +public interface LocationMapper { + LocationDto toDto(Location location); + Location toLocation(LocationDto dto); + List toDtoList(List locations); +} From 45d75905d9ea2341464ed08d8bb281c162f779d2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 04:15:06 +0000 Subject: [PATCH 03/13] Rewrite EntityControllerTest to use MockMvc with @SpringBootTest Replaced direct controller method calls with MockMvc.perform() HTTP requests. Uses @SpringBootTest + @AutoConfigureMockMvc for full Spring context, @MockBean for EntityRepository, EntityFactory, EntityMapper, DbInteractions, and DbConfig. Tests cover: - Happy paths for all 9 endpoints - 404 not-found cases for getById, delete, updateName - 500 error cases where repository throws RuntimeException - 201 Created for entity creation - 204 No Content for deletion - 400 Bad Request for EntityCreationException - Empty list responses - JSON response body shape validation for DTOs and ErrorResponse Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- .../controllers/EntityControllerTest.java | 355 +++++++++++------- 1 file changed, 218 insertions(+), 137 deletions(-) diff --git a/src/test/java/preponderous/viron/controllers/EntityControllerTest.java b/src/test/java/preponderous/viron/controllers/EntityControllerTest.java index f675be9..df7d29f 100644 --- a/src/test/java/preponderous/viron/controllers/EntityControllerTest.java +++ b/src/test/java/preponderous/viron/controllers/EntityControllerTest.java @@ -1,236 +1,317 @@ package preponderous.viron.controllers; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.web.servlet.MockMvc; +import preponderous.viron.config.DbConfig; +import preponderous.viron.database.DbInteractions; +import preponderous.viron.dto.EntityDto; import preponderous.viron.exceptions.EntityCreationException; import preponderous.viron.factories.EntityFactory; +import preponderous.viron.mappers.EntityMapper; import preponderous.viron.models.Entity; import preponderous.viron.repositories.EntityRepository; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Optional; -import static org.junit.jupiter.api.Assertions.*; +import static org.hamcrest.Matchers.*; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; @SpringBootTest +@AutoConfigureMockMvc +@DirtiesContext class EntityControllerTest { + + @Autowired + private MockMvc mockMvc; + + @MockBean private EntityRepository entityRepository; + + @MockBean private EntityFactory entityFactory; - private EntityController entityController; - @BeforeEach - void setUp() { - entityRepository = Mockito.mock(EntityRepository.class); - entityFactory = Mockito.mock(EntityFactory.class); - entityController = new EntityController(entityRepository, entityFactory); - } + @MockBean + private EntityMapper entityMapper; + + @MockBean + private DbInteractions dbInteractions; + + @MockBean + private DbConfig dbConfig; + + // --- GET /api/v1/entities --- @Test - void getAllEntities_Success() { - // prepare + void getAllEntities_Success() throws Exception { List entities = List.of( new Entity(1, "Entity1", "2024-01-01"), new Entity(2, "Entity2", "2024-01-01") ); + List dtos = List.of( + new EntityDto(1, "Entity1", "2024-01-01"), + new EntityDto(2, "Entity2", "2024-01-01") + ); when(entityRepository.findAll()).thenReturn(entities); + when(entityMapper.toDtoList(entities)).thenReturn(dtos); - // execute - ResponseEntity> response = entityController.getAllEntities(); + mockMvc.perform(get("/api/v1/entities")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(2))) + .andExpect(jsonPath("$[0].entityId").value(1)) + .andExpect(jsonPath("$[0].name").value("Entity1")) + .andExpect(jsonPath("$[0].creationDate").value("2024-01-01")) + .andExpect(jsonPath("$[1].entityId").value(2)) + .andExpect(jsonPath("$[1].name").value("Entity2")); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(entities, response.getBody()); verify(entityRepository).findAll(); + verify(entityMapper).toDtoList(entities); } @Test - void getAllEntities_Exception() { - // prepare - when(entityRepository.findAll()).thenThrow(new RuntimeException("Database error")); + void getAllEntities_EmptyList() throws Exception { + when(entityRepository.findAll()).thenReturn(Collections.emptyList()); + when(entityMapper.toDtoList(Collections.emptyList())).thenReturn(Collections.emptyList()); + + mockMvc.perform(get("/api/v1/entities")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(0))); + } - // execute - ResponseEntity> response = entityController.getAllEntities(); + @Test + void getAllEntities_RepositoryThrowsException() throws Exception { + when(entityRepository.findAll()).thenThrow(new RuntimeException("Database error")); - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertNull(response.getBody()); + mockMvc.perform(get("/api/v1/entities")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- GET /api/v1/entities/{id} --- + @Test - void getEntityById_Success() { - // prepare + void getEntityById_Success() throws Exception { Entity entity = new Entity(1, "Entity1", "2024-01-01"); + EntityDto dto = new EntityDto(1, "Entity1", "2024-01-01"); when(entityRepository.findById(1)).thenReturn(Optional.of(entity)); + when(entityMapper.toDto(entity)).thenReturn(dto); - // execute - ResponseEntity response = entityController.getEntityById(1); - - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(entity, response.getBody()); + mockMvc.perform(get("/api/v1/entities/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.entityId").value(1)) + .andExpect(jsonPath("$.name").value("Entity1")) + .andExpect(jsonPath("$.creationDate").value("2024-01-01")); } @Test - void getEntityById_NotFound() { - // prepare - when(entityRepository.findById(anyInt())).thenReturn(Optional.empty()); + void getEntityById_NotFound() throws Exception { + when(entityRepository.findById(999)).thenReturn(Optional.empty()); - // execute - ResponseEntity response = entityController.getEntityById(1); - - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); + mockMvc.perform(get("/api/v1/entities/999")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(404)) + .andExpect(jsonPath("$.message").value("Entity not found with id: 999")); } @Test - void getEntitiesInEnvironment_Success() { - // prepare - List entities = new ArrayList<>(); - when(entityRepository.findByEnvironmentId(anyInt())).thenReturn(entities); - - // execute - ResponseEntity> response = entityController.getEntitiesInEnvironment(1); + void getEntityById_RepositoryThrowsException() throws Exception { + when(entityRepository.findById(1)).thenThrow(new RuntimeException("Database error")); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(entities, response.getBody()); + mockMvc.perform(get("/api/v1/entities/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- GET /api/v1/entities/environment/{environmentId} --- + @Test - void getEntitiesInGrid_Success() { - // prepare - List entities = new ArrayList<>(); - when(entityRepository.findByGridId(anyInt())).thenReturn(entities); + void getEntitiesInEnvironment_Success() throws Exception { + List entities = List.of(new Entity(1, "Entity1", "2024-01-01")); + List dtos = List.of(new EntityDto(1, "Entity1", "2024-01-01")); + when(entityRepository.findByEnvironmentId(1)).thenReturn(entities); + when(entityMapper.toDtoList(entities)).thenReturn(dtos); + + mockMvc.perform(get("/api/v1/entities/environment/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(1))) + .andExpect(jsonPath("$[0].entityId").value(1)); + } - // execute - ResponseEntity> response = entityController.getEntitiesInGrid(1); + @Test + void getEntitiesInEnvironment_EmptyList() throws Exception { + when(entityRepository.findByEnvironmentId(1)).thenReturn(Collections.emptyList()); + when(entityMapper.toDtoList(Collections.emptyList())).thenReturn(Collections.emptyList()); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(entities, response.getBody()); + mockMvc.perform(get("/api/v1/entities/environment/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(0))); } + // --- GET /api/v1/entities/grid/{gridId} --- + @Test - void getEntitiesInLocation_Success() { - // prepare - List entities = new ArrayList<>(); - when(entityRepository.findByLocationId(anyInt())).thenReturn(entities); + void getEntitiesInGrid_Success() throws Exception { + List entities = List.of(new Entity(2, "GridEntity", "2024-02-01")); + List dtos = List.of(new EntityDto(2, "GridEntity", "2024-02-01")); + when(entityRepository.findByGridId(5)).thenReturn(entities); + when(entityMapper.toDtoList(entities)).thenReturn(dtos); + + mockMvc.perform(get("/api/v1/entities/grid/5")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(1))) + .andExpect(jsonPath("$[0].entityId").value(2)) + .andExpect(jsonPath("$[0].name").value("GridEntity")); + } - // execute - ResponseEntity> response = entityController.getEntitiesInLocation(1); + // --- GET /api/v1/entities/location/{locationId} --- - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(entities, response.getBody()); + @Test + void getEntitiesInLocation_Success() throws Exception { + List entities = List.of(new Entity(3, "LocEntity", "2024-03-01")); + List dtos = List.of(new EntityDto(3, "LocEntity", "2024-03-01")); + when(entityRepository.findByLocationId(10)).thenReturn(entities); + when(entityMapper.toDtoList(entities)).thenReturn(dtos); + + mockMvc.perform(get("/api/v1/entities/location/10")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(1))) + .andExpect(jsonPath("$[0].entityId").value(3)) + .andExpect(jsonPath("$[0].name").value("LocEntity")); } + // --- GET /api/v1/entities/unassigned --- + @Test - void getEntitiesNotInAnyLocation_Success() { - // prepare - List entities = new ArrayList<>(); + void getEntitiesNotInAnyLocation_Success() throws Exception { + List entities = List.of(new Entity(4, "Unassigned", "2024-04-01")); + List dtos = List.of(new EntityDto(4, "Unassigned", "2024-04-01")); when(entityRepository.findEntitiesNotInAnyLocation()).thenReturn(entities); + when(entityMapper.toDtoList(entities)).thenReturn(dtos); - // execute - ResponseEntity> response = entityController.getEntitiesNotInAnyLocation(); - - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(entities, response.getBody()); + mockMvc.perform(get("/api/v1/entities/unassigned")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(1))) + .andExpect(jsonPath("$[0].entityId").value(4)) + .andExpect(jsonPath("$[0].name").value("Unassigned")); } @Test - void createEntity_Success() throws EntityCreationException { - // prepare - Entity entity = new Entity(1, "New Entity", "2024-01-01"); - when(entityFactory.createEntity(anyString())).thenReturn(entity); + void getEntitiesNotInAnyLocation_EmptyList() throws Exception { + when(entityRepository.findEntitiesNotInAnyLocation()).thenReturn(Collections.emptyList()); + when(entityMapper.toDtoList(Collections.emptyList())).thenReturn(Collections.emptyList()); - // execute - ResponseEntity response = entityController.createEntity("New Entity"); + mockMvc.perform(get("/api/v1/entities/unassigned")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(0))); + } + + // --- POST /api/v1/entities/{name} --- - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(entity, response.getBody()); + @Test + void createEntity_ReturnsCreated() throws Exception { + Entity entity = new Entity(1, "NewEntity", "2024-01-01"); + EntityDto dto = new EntityDto(1, "NewEntity", "2024-01-01"); + when(entityFactory.createEntity("NewEntity")).thenReturn(entity); + when(entityMapper.toDto(entity)).thenReturn(dto); + + mockMvc.perform(post("/api/v1/entities/NewEntity")) + .andExpect(status().isCreated()) + .andExpect(jsonPath("$.entityId").value(1)) + .andExpect(jsonPath("$.name").value("NewEntity")) + .andExpect(jsonPath("$.creationDate").value("2024-01-01")); } @Test - void createEntity_EntityCreationException() throws EntityCreationException { - // prepare - when(entityFactory.createEntity(anyString())) + void createEntity_FactoryThrowsEntityCreationException() throws Exception { + when(entityFactory.createEntity("BadEntity")) .thenThrow(new EntityCreationException("Creation failed")); - // execute - ResponseEntity response = entityController.createEntity("New Entity"); - - // verify - assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode()); + mockMvc.perform(post("/api/v1/entities/BadEntity")) + .andExpect(status().isBadRequest()) + .andExpect(jsonPath("$.status").value(400)) + .andExpect(jsonPath("$.message").value("Creation failed")); } @Test - void deleteEntity_Success() { - // prepare - when(entityRepository.deleteById(anyInt())).thenReturn(true); + void createEntity_FactoryThrowsRuntimeException() throws Exception { + when(entityFactory.createEntity("ErrorEntity")) + .thenThrow(new RuntimeException("Unexpected error")); + + mockMvc.perform(post("/api/v1/entities/ErrorEntity")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); + } - // execute - ResponseEntity response = entityController.deleteEntity(1); + // --- DELETE /api/v1/entities/{id} --- - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); + @Test + void deleteEntity_ReturnsNoContent() throws Exception { + when(entityRepository.deleteById(1)).thenReturn(true); + + mockMvc.perform(delete("/api/v1/entities/1")) + .andExpect(status().isNoContent()); } @Test - void deleteEntity_NotFound() { - // prepare - when(entityRepository.deleteById(anyInt())).thenReturn(false); - - // execute - ResponseEntity response = entityController.deleteEntity(1); + void deleteEntity_NotFound() throws Exception { + when(entityRepository.deleteById(999)).thenReturn(false); - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); + mockMvc.perform(delete("/api/v1/entities/999")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(404)) + .andExpect(jsonPath("$.message").value("Entity not found with id: 999")); } @Test - void updateEntityName_Success() { - // prepare - when(entityRepository.updateName(anyInt(), anyString())).thenReturn(true); + void deleteEntity_RepositoryThrowsException() throws Exception { + when(entityRepository.deleteById(1)).thenThrow(new RuntimeException("Database error")); - // execute - ResponseEntity response = entityController.updateEntityName(1, "New Name"); - - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); + mockMvc.perform(delete("/api/v1/entities/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } - @Test - void updateEntityName_NotFound() { - // prepare - when(entityRepository.updateName(anyInt(), anyString())).thenReturn(false); + // --- PATCH /api/v1/entities/{id}/name/{name} --- - // execute - ResponseEntity response = entityController.updateEntityName(1, "New Name"); + @Test + void updateEntityName_Success() throws Exception { + when(entityRepository.updateName(1, "UpdatedName")).thenReturn(true); - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); + mockMvc.perform(patch("/api/v1/entities/1/name/UpdatedName")) + .andExpect(status().isOk()); } @Test - void testExceptionHandling_InternalServerError() { - // prepare - when(entityRepository.findAll()).thenThrow(new RuntimeException("Unexpected error")); + void updateEntityName_NotFound() throws Exception { + when(entityRepository.updateName(999, "UpdatedName")).thenReturn(false); + + mockMvc.perform(patch("/api/v1/entities/999/name/UpdatedName")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(404)) + .andExpect(jsonPath("$.message").value("Entity not found with id: 999")); + } - // execute - ResponseEntity> response = entityController.getAllEntities(); + @Test + void updateEntityName_RepositoryThrowsException() throws Exception { + when(entityRepository.updateName(1, "Name")).thenThrow(new RuntimeException("Database error")); - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertNull(response.getBody()); + mockMvc.perform(patch("/api/v1/entities/1/name/Name")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } } \ No newline at end of file From 78ceb14ed4752dc3d6e0d89d9480d43b858ccbd4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 04:18:52 +0000 Subject: [PATCH 04/13] Rewrite GridControllerTest to use MockMvc with @SpringBootTest Replace direct controller method calls with MockMvc.perform(...) using @SpringBootTest + @AutoConfigureMockMvc. Use @MockBean for GridRepository, GridMapper, DbInteractions, and DbConfig. Test all endpoints including happy paths, not-found cases (404), exception cases (500), and empty list scenarios with JSON body assertions. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- .../viron/controllers/GridControllerTest.java | 280 +++++++++--------- 1 file changed, 146 insertions(+), 134 deletions(-) diff --git a/src/test/java/preponderous/viron/controllers/GridControllerTest.java b/src/test/java/preponderous/viron/controllers/GridControllerTest.java index 48eef5d..47ae6c9 100644 --- a/src/test/java/preponderous/viron/controllers/GridControllerTest.java +++ b/src/test/java/preponderous/viron/controllers/GridControllerTest.java @@ -1,190 +1,202 @@ package preponderous.viron.controllers; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.web.servlet.MockMvc; +import preponderous.viron.config.DbConfig; +import preponderous.viron.database.DbInteractions; +import preponderous.viron.dto.GridDto; +import preponderous.viron.mappers.GridMapper; import preponderous.viron.models.Grid; import preponderous.viron.repositories.GridRepository; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Optional; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.when; +import static org.hamcrest.Matchers.*; +import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; @SpringBootTest -public class GridControllerTest { +@AutoConfigureMockMvc +@DirtiesContext +class GridControllerTest { + + @Autowired + private MockMvc mockMvc; + + @MockBean private GridRepository gridRepository; - private GridController gridController; - @BeforeEach - void setUp() { - gridRepository = Mockito.mock(GridRepository.class); - gridController = new GridController(gridRepository); - } + @MockBean + private GridMapper gridMapper; + + @MockBean + private DbInteractions dbInteractions; + + @MockBean + private DbConfig dbConfig; + + // --- GET /api/v1/grids --- @Test - void testGetAllGrids_Success() { - // setup - Grid grid1 = new Grid(1, 1, 1); - Grid grid2 = new Grid(2, 2, 2); - List expectedGrids = Arrays.asList(grid1, grid2); - when(gridRepository.findAll()).thenReturn(expectedGrids); - - // execute - ResponseEntity> response = gridController.getAllGrids(); - - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(expectedGrids, response.getBody()); + void getAllGrids_Success() throws Exception { + List grids = List.of( + new Grid(1, 10, 20), + new Grid(2, 30, 40) + ); + List dtos = List.of( + new GridDto(1, 10, 20), + new GridDto(2, 30, 40) + ); + when(gridRepository.findAll()).thenReturn(grids); + when(gridMapper.toDtoList(grids)).thenReturn(dtos); + + mockMvc.perform(get("/api/v1/grids")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(2))) + .andExpect(jsonPath("$[0].gridId").value(1)) + .andExpect(jsonPath("$[0].rows").value(10)) + .andExpect(jsonPath("$[0].columns").value(20)) + .andExpect(jsonPath("$[1].gridId").value(2)) + .andExpect(jsonPath("$[1].rows").value(30)) + .andExpect(jsonPath("$[1].columns").value(40)); + + verify(gridRepository).findAll(); + verify(gridMapper).toDtoList(grids); } @Test - void testGetAllGrids_Exception() { - // setup - when(gridRepository.findAll()).thenThrow(new RuntimeException("Test Exception")); + void getAllGrids_RepositoryThrowsException() throws Exception { + when(gridRepository.findAll()).thenThrow(new RuntimeException("Database error")); - // execute - ResponseEntity> response = gridController.getAllGrids(); - - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertNull(response.getBody()); + mockMvc.perform(get("/api/v1/grids")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- GET /api/v1/grids/{id} --- + @Test - void testGetGridById_Success() { - // setup - int gridId = 1; - Grid expectedGrid = new Grid(gridId, 1, 1); - when(gridRepository.findById(gridId)).thenReturn(Optional.of(expectedGrid)); - - // execute - ResponseEntity response = gridController.getGridById(gridId); - - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(expectedGrid, response.getBody()); + void getGridById_Success() throws Exception { + Grid grid = new Grid(1, 10, 20); + GridDto dto = new GridDto(1, 10, 20); + when(gridRepository.findById(1)).thenReturn(Optional.of(grid)); + when(gridMapper.toDto(grid)).thenReturn(dto); + + mockMvc.perform(get("/api/v1/grids/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.gridId").value(1)) + .andExpect(jsonPath("$.rows").value(10)) + .andExpect(jsonPath("$.columns").value(20)); + + verify(gridRepository).findById(1); + verify(gridMapper).toDto(grid); } @Test - void testGetGridById_NotFound() { - // setup - int gridId = 1; - when(gridRepository.findById(gridId)).thenReturn(Optional.empty()); + void getGridById_NotFound() throws Exception { + when(gridRepository.findById(999)).thenReturn(Optional.empty()); - // execute - ResponseEntity response = gridController.getGridById(gridId); - - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); - assertNull(response.getBody()); + mockMvc.perform(get("/api/v1/grids/999")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(404)) + .andExpect(jsonPath("$.message").value("Grid not found with id: 999")); } @Test - void testGetGridById_Exception() { - // setup - int gridId = 1; - when(gridRepository.findById(gridId)).thenThrow(new RuntimeException("Test Exception")); - - // execute - ResponseEntity response = gridController.getGridById(gridId); + void getGridById_RepositoryThrowsException() throws Exception { + when(gridRepository.findById(1)).thenThrow(new RuntimeException("Database error")); - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertNull(response.getBody()); + mockMvc.perform(get("/api/v1/grids/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- GET /api/v1/grids/environment/{environmentId} --- + @Test - void testGetGridsInEnvironment_Success() { - // setup - int environmentId = 1; - Grid grid1 = new Grid(1, 1, 1); - Grid grid2 = new Grid(2, 2, 2); - List expectedGrids = Arrays.asList(grid1, grid2); - when(gridRepository.findByEnvironmentId(environmentId)).thenReturn(expectedGrids); - - // execute - ResponseEntity> response = gridController.getGridsInEnvironment(environmentId); - - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(expectedGrids, response.getBody()); + void getGridsInEnvironment_Success() throws Exception { + List grids = List.of(new Grid(1, 10, 20)); + List dtos = List.of(new GridDto(1, 10, 20)); + when(gridRepository.findByEnvironmentId(1)).thenReturn(grids); + when(gridMapper.toDtoList(grids)).thenReturn(dtos); + + mockMvc.perform(get("/api/v1/grids/environment/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(1))) + .andExpect(jsonPath("$[0].gridId").value(1)) + .andExpect(jsonPath("$[0].rows").value(10)) + .andExpect(jsonPath("$[0].columns").value(20)); + + verify(gridRepository).findByEnvironmentId(1); + verify(gridMapper).toDtoList(grids); } @Test - void testGetGridsInEnvironment_EmptyList() { - // setup - int environmentId = 1; - when(gridRepository.findByEnvironmentId(environmentId)).thenReturn(Collections.emptyList()); - - // execute - ResponseEntity> response = gridController.getGridsInEnvironment(environmentId); + void getGridsInEnvironment_EmptyList() throws Exception { + when(gridRepository.findByEnvironmentId(1)).thenReturn(Collections.emptyList()); + when(gridMapper.toDtoList(Collections.emptyList())).thenReturn(Collections.emptyList()); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertTrue(response.getBody().isEmpty()); + mockMvc.perform(get("/api/v1/grids/environment/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(0))); } @Test - void testGetGridsInEnvironment_Exception() { - // setup - int environmentId = 1; - when(gridRepository.findByEnvironmentId(environmentId)).thenThrow(new RuntimeException("Test Exception")); + void getGridsInEnvironment_RepositoryThrowsException() throws Exception { + when(gridRepository.findByEnvironmentId(1)).thenThrow(new RuntimeException("Database error")); - // execute - ResponseEntity> response = gridController.getGridsInEnvironment(environmentId); - - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertNull(response.getBody()); + mockMvc.perform(get("/api/v1/grids/environment/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- GET /api/v1/grids/entity/{entityId} --- + @Test - void testGetGridOfEntity_Success() { - // setup - int entityId = 1; - Grid expectedGrid = new Grid(1, 1, 1); - when(gridRepository.findByEntityId(entityId)).thenReturn(Optional.of(expectedGrid)); - - // execute - ResponseEntity response = gridController.getGridOfEntity(entityId); - - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(expectedGrid, response.getBody()); + void getGridOfEntity_Success() throws Exception { + Grid grid = new Grid(5, 15, 25); + GridDto dto = new GridDto(5, 15, 25); + when(gridRepository.findByEntityId(1)).thenReturn(Optional.of(grid)); + when(gridMapper.toDto(grid)).thenReturn(dto); + + mockMvc.perform(get("/api/v1/grids/entity/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.gridId").value(5)) + .andExpect(jsonPath("$.rows").value(15)) + .andExpect(jsonPath("$.columns").value(25)); + + verify(gridRepository).findByEntityId(1); + verify(gridMapper).toDto(grid); } @Test - void testGetGridOfEntity_NotFound() { - // setup - int entityId = 1; - when(gridRepository.findByEntityId(entityId)).thenReturn(Optional.empty()); + void getGridOfEntity_NotFound() throws Exception { + when(gridRepository.findByEntityId(999)).thenReturn(Optional.empty()); - // execute - ResponseEntity response = gridController.getGridOfEntity(entityId); - - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); - assertNull(response.getBody()); + mockMvc.perform(get("/api/v1/grids/entity/999")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(404)) + .andExpect(jsonPath("$.message").value("Grid not found for entity: 999")); } @Test - void testGetGridOfEntity_Exception() { - // setup - int entityId = 1; - when(gridRepository.findByEntityId(entityId)).thenThrow(new RuntimeException("Test Exception")); - - // execute - ResponseEntity response = gridController.getGridOfEntity(entityId); + void getGridOfEntity_RepositoryThrowsException() throws Exception { + when(gridRepository.findByEntityId(1)).thenThrow(new RuntimeException("Database error")); - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertNull(response.getBody()); + mockMvc.perform(get("/api/v1/grids/entity/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } } \ No newline at end of file From ed7b9e06de32184cfb9a7ba13a83ad466a32f14e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 04:22:35 +0000 Subject: [PATCH 05/13] Rewrite LocationControllerTest to use MockMvc with @SpringBootTest Replace direct controller method calls with MockMvc.perform() integration tests. Use @MockBean for LocationRepository, LocationMapper, DbInteractions, and DbConfig. Test happy paths, 404 not-found, 500 error, 204 no-content, and empty list cases for all endpoints with JSON response body assertions. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 63029 bytes .mvn/wrapper/maven-wrapper.properties | 18 + mvnw | 449 ++++++++++-------- mvnw.cmd | 355 ++++++++------ .../controllers/LocationControllerTest.java | 386 +++++++++------ 5 files changed, 713 insertions(+), 495 deletions(-) create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..716422558d4bd975382c136a1038a18a88157dce GIT binary patch literal 63029 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 QA`GhoSSdO?w)@k603mV&bpQYW literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..7f3c032 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar diff --git a/mvnw b/mvnw index 19529dd..1fdbaf2 100755 --- a/mvnw +++ b/mvnw @@ -19,241 +19,314 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 +# Apache Maven Wrapper startup batch script, version 3.3.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir # # Optional ENV vars # ----------------- -# JAVA_HOME - location of a JDK home dir, required when download maven via java source -# MVNW_REPOURL - repo url base for downloading maven distribution -# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files # ---------------------------------------------------------------------------- -set -euf -[ "${MVNW_VERBOSE-}" != debug ] || set -x +if [ -z "$MAVEN_SKIP_RC" ]; then + + if [ -f /usr/local/etc/mavenrc ]; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ]; then + . /etc/mavenrc + fi -# OS specific support. -native_path() { printf %s\\n "$1"; } + if [ -f "$HOME/.mavenrc" ]; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +darwin=false +mingw=false case "$(uname)" in -CYGWIN* | MINGW*) - [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" - native_path() { cygpath --path --windows "$1"; } +CYGWIN*) cygwin=true ;; +MINGW*) mingw=true ;; +Darwin*) + darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)" + export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home" + export JAVA_HOME + fi + fi ;; esac -# set JAVACMD and JAVACCMD -set_java_home() { - # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched - if [ -n "${JAVA_HOME-}" ]; then +if [ -z "$JAVA_HOME" ]; then + if [ -r /etc/gentoo-release ]; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin; then + [ -n "$JAVA_HOME" ] \ + && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] \ + && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \ + && JAVA_HOME="$( + cd "$JAVA_HOME" || ( + echo "cannot cd into $JAVA_HOME." >&2 + exit 1 + ) + pwd + )" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin; then + javaHome="$(dirname "$javaExecutable")" + javaExecutable="$(cd "$javaHome" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "$javaExecutable")" + fi + javaHome="$(dirname "$javaExecutable")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ]; then + if [ -n "$JAVA_HOME" ]; then if [ -x "$JAVA_HOME/jre/sh/java" ]; then # IBM's JDK on AIX uses strange locations for the executables JAVACMD="$JAVA_HOME/jre/sh/java" - JAVACCMD="$JAVA_HOME/jre/sh/javac" else JAVACMD="$JAVA_HOME/bin/java" - JAVACCMD="$JAVA_HOME/bin/javac" - - if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then - echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 - echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 - return 1 - fi fi else JAVACMD="$( - 'set' +e - 'unset' -f command 2>/dev/null - 'command' -v java - )" || : - JAVACCMD="$( - 'set' +e - 'unset' -f command 2>/dev/null - 'command' -v javac - )" || : - - if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then - echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 - return 1 - fi + \unset -f command 2>/dev/null + \command -v java + )" fi -} - -# hash string like Java String::hashCode -hash_string() { - str="${1:-}" h=0 - while [ -n "$str" ]; do - char="${str%"${str#?}"}" - h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) - str="${str#?}" - done - printf %x\\n $h -} - -verbose() { :; } -[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } +fi -die() { - printf %s\\n "$1" >&2 +if [ ! -x "$JAVACMD" ]; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 exit 1 -} +fi -trim() { - # MWRAPPER-139: - # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. - # Needed for removing poorly interpreted newline sequences when running in more - # exotic environments such as mingw bash on Windows. - printf "%s" "${1}" | tr -d '[:space:]' -} +if [ -z "$JAVA_HOME" ]; then + echo "Warning: JAVA_HOME environment variable is not set." >&2 +fi -# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties -while IFS="=" read -r key value; do - case "${key-}" in - distributionUrl) distributionUrl=$(trim "${value-}") ;; - distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; - esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ]; then + echo "Path not specified to find_maven_basedir" >&2 + return 1 + fi -case "${distributionUrl##*/}" in -maven-mvnd-*bin.*) - MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ - case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in - *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; - :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; - :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; - :Linux*x86_64*) distributionPlatform=linux-amd64 ;; - *) - echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 - distributionPlatform=linux-amd64 - ;; - esac - distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" - ;; -maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; -esac + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ]; do + if [ -d "$wdir"/.mvn ]; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$( + cd "$wdir/.." || exit 1 + pwd + ) + fi + # end of workaround + done + printf '%s' "$( + cd "$basedir" || exit 1 + pwd + )" +} -# apply MVNW_REPOURL and calculate MAVEN_HOME -# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ -[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" -distributionUrlName="${distributionUrl##*/}" -distributionUrlNameMain="${distributionUrlName%.*}" -distributionUrlNameMain="${distributionUrlNameMain%-bin}" -MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" -MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' <"$1" + fi +} -exec_maven() { - unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : - exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi } -if [ -d "$MAVEN_HOME" ]; then - verbose "found existing MAVEN_HOME at $MAVEN_HOME" - exec_maven "$@" +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1 fi -case "${distributionUrl-}" in -*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; -*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; -esac +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" -# prepare tmp dir -if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then - clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } - trap clean HUP INT TERM EXIT +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" else - die "cannot create temp dir" -fi - -mkdir -p -- "${MAVEN_HOME%/*}" + log "Couldn't find $wrapperJarPath, downloading it ..." -# Download and Install Apache Maven -verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." -verbose "Downloading from: $distributionUrl" -verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" - -# select .zip or .tar.gz -if ! command -v unzip >/dev/null; then - distributionUrl="${distributionUrl%.zip}.tar.gz" - distributionUrlName="${distributionUrl##*/}" -fi - -# verbose opt -__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' -[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in wrapperUrl) + wrapperUrl="$safeValue" + break + ;; + esac + done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" -# normalize http auth -case "${MVNW_PASSWORD:+has-password}" in -'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; -has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; -esac + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi -if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then - verbose "Found wget ... using wget" - wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" -elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then - verbose "Found curl ... using curl" - curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" -elif set_java_home; then - verbose "Falling back to use Java to download" - javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" - targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" - cat >"$javaSource" <<-END - public class Downloader extends java.net.Authenticator - { - protected java.net.PasswordAuthentication getPasswordAuthentication() - { - return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); - } - public static void main( String[] args ) throws Exception - { - setDefault( new Downloader() ); - java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); - } - } - END - # For Cygwin/MinGW, switch paths to Windows format before running javac and java - verbose " - Compiling Downloader.java ..." - "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" - verbose " - Running Downloader.java ..." - "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" + if command -v wget >/dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl >/dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi fi +########################################################################################## +# End of extension +########################################################################################## -# If specified, validate the SHA-256 sum of the Maven distribution zip file -if [ -n "${distributionSha256Sum-}" ]; then - distributionSha256Result=false - if [ "$MVN_CMD" = mvnd.sh ]; then - echo "Checksum validation is not supported for maven-mvnd." >&2 - echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 - exit 1 - elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then - distributionSha256Result=true +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in wrapperSha256Sum) + wrapperSha256Sum=$value + break + ;; + esac +done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum >/dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then + wrapperSha256Result=true fi elif command -v shasum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then - distributionSha256Result=true + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then + wrapperSha256Result=true fi else echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 - echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2 exit 1 fi - if [ $distributionSha256Result = false ]; then - echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 - echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 exit 1 fi fi -# unzip and move -if command -v unzip >/dev/null; then - unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" -else - tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] \ + && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] \ + && CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] \ + && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" -clean || : -exec_maven "$@" +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd index 249bdf3..b694e6c 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -1,149 +1,206 @@ -<# : batch portion -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.2 -@REM -@REM Optional ENV vars -@REM MVNW_REPOURL - repo url base for downloading maven distribution -@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output -@REM ---------------------------------------------------------------------------- - -@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) -@SET __MVNW_CMD__= -@SET __MVNW_ERROR__= -@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% -@SET PSModulePath= -@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( - IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) -) -@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% -@SET __MVNW_PSMODULEP_SAVE= -@SET __MVNW_ARG0_NAME__= -@SET MVNW_USERNAME= -@SET MVNW_PASSWORD= -@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) -@echo Cannot start maven from wrapper >&2 && exit /b 1 -@GOTO :EOF -: end batch / begin powershell #> - -$ErrorActionPreference = "Stop" -if ($env:MVNW_VERBOSE -eq "true") { - $VerbosePreference = "Continue" -} - -# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties -$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl -if (!$distributionUrl) { - Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" -} - -switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { - "maven-mvnd-*" { - $USE_MVND = $true - $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" - $MVN_CMD = "mvnd.cmd" - break - } - default { - $USE_MVND = $false - $MVN_CMD = $script -replace '^mvnw','mvn' - break - } -} - -# apply MVNW_REPOURL and calculate MAVEN_HOME -# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ -if ($env:MVNW_REPOURL) { - $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } - $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" -} -$distributionUrlName = $distributionUrl -replace '^.*/','' -$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' -$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" -if ($env:MAVEN_USER_HOME) { - $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" -} -$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' -$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" - -if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { - Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" - Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" - exit $? -} - -if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { - Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" -} - -# prepare tmp dir -$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile -$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" -$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null -trap { - if ($TMP_DOWNLOAD_DIR.Exists) { - try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } - catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } - } -} - -New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null - -# Download and Install Apache Maven -Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." -Write-Verbose "Downloading from: $distributionUrl" -Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" - -$webclient = New-Object System.Net.WebClient -if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { - $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) -} -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null - -# If specified, validate the SHA-256 sum of the Maven distribution zip file -$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum -if ($distributionSha256Sum) { - if ($USE_MVND) { - Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." - } - Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash - if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { - Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." - } -} - -# unzip and move -Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null -Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null -try { - Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null -} catch { - if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { - Write-Error "fail to move MAVEN_HOME" - } -} finally { - try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } - catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } -} - -Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. >&2 +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. >&2 +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. >&2 +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. >&2 +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/src/test/java/preponderous/viron/controllers/LocationControllerTest.java b/src/test/java/preponderous/viron/controllers/LocationControllerTest.java index 351adac..878ace5 100644 --- a/src/test/java/preponderous/viron/controllers/LocationControllerTest.java +++ b/src/test/java/preponderous/viron/controllers/LocationControllerTest.java @@ -1,267 +1,337 @@ package preponderous.viron.controllers; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; + +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.web.servlet.MockMvc; +import preponderous.viron.config.DbConfig; +import preponderous.viron.database.DbInteractions; +import preponderous.viron.dto.LocationDto; +import preponderous.viron.mappers.LocationMapper; import preponderous.viron.models.Location; import preponderous.viron.repositories.LocationRepository; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Optional; -import static org.junit.jupiter.api.Assertions.*; +import static org.hamcrest.Matchers.*; import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; @SpringBootTest +@AutoConfigureMockMvc class LocationControllerTest { + + @Autowired + private MockMvc mockMvc; + + @MockBean private LocationRepository locationRepository; - private LocationController locationController; - @BeforeEach - void setUp() { - locationRepository = Mockito.mock(LocationRepository.class); - locationController = new LocationController(locationRepository); - } + @MockBean + private LocationMapper locationMapper; + + @MockBean + private DbInteractions dbInteractions; + + @MockBean + private DbConfig dbConfig; + + // --- GET /api/v1/locations --- @Test - void getAllLocations_Success() { - // setup - List locations = Arrays.asList( - new Location(1, 10, 20) + void getAllLocations_Success() throws Exception { + List locations = List.of( + new Location(1, 10, 20), + new Location(2, 30, 40) + ); + List dtos = List.of( + new LocationDto(1, 10, 20), + new LocationDto(2, 30, 40) ); when(locationRepository.findAll()).thenReturn(locations); + when(locationMapper.toDtoList(locations)).thenReturn(dtos); + + mockMvc.perform(get("/api/v1/locations")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(2))) + .andExpect(jsonPath("$[0].locationId").value(1)) + .andExpect(jsonPath("$[0].x").value(10)) + .andExpect(jsonPath("$[0].y").value(20)) + .andExpect(jsonPath("$[1].locationId").value(2)) + .andExpect(jsonPath("$[1].x").value(30)) + .andExpect(jsonPath("$[1].y").value(40)); - // execute - ResponseEntity> response = locationController.getAllLocations(); - - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(locations, response.getBody()); verify(locationRepository).findAll(); + verify(locationMapper).toDtoList(locations); } @Test - void getAllLocations_Exception() { - // setup - when(locationRepository.findAll()).thenThrow(new RuntimeException("Database error")); + void getAllLocations_EmptyList() throws Exception { + when(locationRepository.findAll()).thenReturn(Collections.emptyList()); + when(locationMapper.toDtoList(Collections.emptyList())).thenReturn(Collections.emptyList()); + + mockMvc.perform(get("/api/v1/locations")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(0))); + } - // execute - ResponseEntity> response = locationController.getAllLocations(); + @Test + void getAllLocations_RepositoryThrowsException() throws Exception { + when(locationRepository.findAll()).thenThrow(new RuntimeException("Database error")); - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertNull(response.getBody()); - verify(locationRepository).findAll(); + mockMvc.perform(get("/api/v1/locations")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- GET /api/v1/locations/{id} --- + @Test - void getLocationById_Success() { - // setup + void getLocationById_Success() throws Exception { Location location = new Location(1, 10, 20); + LocationDto dto = new LocationDto(1, 10, 20); when(locationRepository.findById(1)).thenReturn(Optional.of(location)); + when(locationMapper.toDto(location)).thenReturn(dto); - // execute - ResponseEntity response = locationController.getLocationById(1); + mockMvc.perform(get("/api/v1/locations/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.locationId").value(1)) + .andExpect(jsonPath("$.x").value(10)) + .andExpect(jsonPath("$.y").value(20)); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(location, response.getBody()); verify(locationRepository).findById(1); + verify(locationMapper).toDto(location); } @Test - void getLocationById_NotFound() { - // setup - when(locationRepository.findById(1)).thenReturn(Optional.empty()); + void getLocationById_NotFound() throws Exception { + when(locationRepository.findById(999)).thenReturn(Optional.empty()); - // execute - ResponseEntity response = locationController.getLocationById(1); + mockMvc.perform(get("/api/v1/locations/999")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(404)) + .andExpect(jsonPath("$.message").value("Location not found with id: 999")); + } - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); - assertNull(response.getBody()); - verify(locationRepository).findById(1); + @Test + void getLocationById_RepositoryThrowsException() throws Exception { + when(locationRepository.findById(1)).thenThrow(new RuntimeException("Database error")); + + mockMvc.perform(get("/api/v1/locations/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- GET /api/v1/locations/environment/{environmentId} --- + @Test - void getLocationsInEnvironment_Success() { - // setup - List locations = Arrays.asList(new Location(1, 10, 20)); + void getLocationsInEnvironment_Success() throws Exception { + List locations = List.of(new Location(1, 10, 20)); + List dtos = List.of(new LocationDto(1, 10, 20)); when(locationRepository.findByEnvironmentId(1)).thenReturn(locations); + when(locationMapper.toDtoList(locations)).thenReturn(dtos); - // execute - ResponseEntity> response = locationController.getLocationsInEnvironment(1); + mockMvc.perform(get("/api/v1/locations/environment/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(1))) + .andExpect(jsonPath("$[0].locationId").value(1)) + .andExpect(jsonPath("$[0].x").value(10)) + .andExpect(jsonPath("$[0].y").value(20)); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(locations, response.getBody()); verify(locationRepository).findByEnvironmentId(1); + verify(locationMapper).toDtoList(locations); } @Test - void getLocationsInEnvironment_Exception() { - // setup - when(locationRepository.findByEnvironmentId(1)).thenThrow(new RuntimeException()); - - // execute - ResponseEntity> response = locationController.getLocationsInEnvironment(1); + void getLocationsInEnvironment_EmptyList() throws Exception { + when(locationRepository.findByEnvironmentId(1)).thenReturn(Collections.emptyList()); + when(locationMapper.toDtoList(Collections.emptyList())).thenReturn(Collections.emptyList()); - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertNull(response.getBody()); - verify(locationRepository).findByEnvironmentId(1); + mockMvc.perform(get("/api/v1/locations/environment/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(0))); } @Test - void getLocationsInGrid_Success() { - // setup - List locations = Arrays.asList(new Location(1, 10, 20)); - when(locationRepository.findByGridId(1)).thenReturn(locations); - - // execute - ResponseEntity> response = locationController.getLocationsInGrid(1); - - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(locations, response.getBody()); - verify(locationRepository).findByGridId(1); + void getLocationsInEnvironment_RepositoryThrowsException() throws Exception { + when(locationRepository.findByEnvironmentId(1)).thenThrow(new RuntimeException("Database error")); + + mockMvc.perform(get("/api/v1/locations/environment/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- GET /api/v1/locations/grid/{gridId} --- + @Test - void getLocationsInGrid_Exception() { - // setup - when(locationRepository.findByGridId(1)).thenThrow(new RuntimeException()); + void getLocationsInGrid_Success() throws Exception { + List locations = List.of(new Location(5, 50, 60)); + List dtos = List.of(new LocationDto(5, 50, 60)); + when(locationRepository.findByGridId(3)).thenReturn(locations); + when(locationMapper.toDtoList(locations)).thenReturn(dtos); + + mockMvc.perform(get("/api/v1/locations/grid/3")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(1))) + .andExpect(jsonPath("$[0].locationId").value(5)) + .andExpect(jsonPath("$[0].x").value(50)) + .andExpect(jsonPath("$[0].y").value(60)); + + verify(locationRepository).findByGridId(3); + verify(locationMapper).toDtoList(locations); + } - // execute - ResponseEntity> response = locationController.getLocationsInGrid(1); + @Test + void getLocationsInGrid_RepositoryThrowsException() throws Exception { + when(locationRepository.findByGridId(1)).thenThrow(new RuntimeException("Database error")); - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertNull(response.getBody()); - verify(locationRepository).findByGridId(1); + mockMvc.perform(get("/api/v1/locations/grid/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- GET /api/v1/locations/entity/{entityId} --- + @Test - void getLocationOfEntity_Success() { - // setup + void getLocationOfEntity_Success() throws Exception { Location location = new Location(1, 10, 20); + LocationDto dto = new LocationDto(1, 10, 20); when(locationRepository.findByEntityId(1)).thenReturn(Optional.of(location)); + when(locationMapper.toDto(location)).thenReturn(dto); - // execute - ResponseEntity response = locationController.getLocationOfEntity(1); + mockMvc.perform(get("/api/v1/locations/entity/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.locationId").value(1)) + .andExpect(jsonPath("$.x").value(10)) + .andExpect(jsonPath("$.y").value(20)); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(location, response.getBody()); verify(locationRepository).findByEntityId(1); + verify(locationMapper).toDto(location); } @Test - void getLocationOfEntity_NotFound() { - // setup - when(locationRepository.findByEntityId(1)).thenReturn(Optional.empty()); + void getLocationOfEntity_NotFound() throws Exception { + when(locationRepository.findByEntityId(999)).thenReturn(Optional.empty()); - // execute - ResponseEntity response = locationController.getLocationOfEntity(1); - - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); - assertNull(response.getBody()); - verify(locationRepository).findByEntityId(1); + mockMvc.perform(get("/api/v1/locations/entity/999")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(404)) + .andExpect(jsonPath("$.message").value("Location not found for entity: 999")); } @Test - void addEntityToLocation_Success() { - // setup - when(locationRepository.addEntityToLocation(1, 1)).thenReturn(true); - - // execute - ResponseEntity response = locationController.addEntityToLocation(1, 1); + void getLocationOfEntity_RepositoryThrowsException() throws Exception { + when(locationRepository.findByEntityId(1)).thenThrow(new RuntimeException("Database error")); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - verify(locationRepository).addEntityToLocation(1, 1); + mockMvc.perform(get("/api/v1/locations/entity/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- PUT /api/v1/locations/{locationId}/entity/{entityId} --- + @Test - void addEntityToLocation_NotFound() { - // setup - when(locationRepository.addEntityToLocation(1, 1)).thenReturn(false); + void addEntityToLocation_Success() throws Exception { + when(locationRepository.addEntityToLocation(1, 2)).thenReturn(true); - // execute - ResponseEntity response = locationController.addEntityToLocation(1, 1); + mockMvc.perform(put("/api/v1/locations/2/entity/1")) + .andExpect(status().isOk()); - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); - verify(locationRepository).addEntityToLocation(1, 1); + verify(locationRepository).addEntityToLocation(1, 2); } @Test - void addEntityToLocation_Exception() { - // setup - when(locationRepository.addEntityToLocation(1, 1)).thenThrow(new RuntimeException()); + void addEntityToLocation_NotFound() throws Exception { + when(locationRepository.addEntityToLocation(1, 2)).thenReturn(false); + + mockMvc.perform(put("/api/v1/locations/2/entity/1")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(404)) + .andExpect(jsonPath("$.message").value("Location or entity not found")); + } - // execute - ResponseEntity response = locationController.addEntityToLocation(1, 1); + @Test + void addEntityToLocation_RepositoryThrowsException() throws Exception { + when(locationRepository.addEntityToLocation(1, 2)).thenThrow(new RuntimeException("Database error")); - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - verify(locationRepository).addEntityToLocation(1, 1); + mockMvc.perform(put("/api/v1/locations/2/entity/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- DELETE /api/v1/locations/{locationId}/entity/{entityId} --- + @Test - void removeEntityFromLocation_Success() { - // setup - when(locationRepository.removeEntityFromLocation(1, 1)).thenReturn(true); + void removeEntityFromLocation_Success() throws Exception { + when(locationRepository.removeEntityFromLocation(1, 2)).thenReturn(true); - // execute - ResponseEntity response = locationController.removeEntityFromLocation(1, 1); + mockMvc.perform(delete("/api/v1/locations/2/entity/1")) + .andExpect(status().isNoContent()); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - verify(locationRepository).removeEntityFromLocation(1, 1); + verify(locationRepository).removeEntityFromLocation(1, 2); } @Test - void removeEntityFromLocation_NotFound() { - // setup - when(locationRepository.removeEntityFromLocation(1, 1)).thenReturn(false); + void removeEntityFromLocation_NotFound() throws Exception { + when(locationRepository.removeEntityFromLocation(1, 2)).thenReturn(false); - // execute - ResponseEntity response = locationController.removeEntityFromLocation(1, 1); + mockMvc.perform(delete("/api/v1/locations/2/entity/1")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(404)) + .andExpect(jsonPath("$.message").value("Location or entity not found")); + } + + @Test + void removeEntityFromLocation_RepositoryThrowsException() throws Exception { + when(locationRepository.removeEntityFromLocation(1, 2)).thenThrow(new RuntimeException("Database error")); - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); - verify(locationRepository).removeEntityFromLocation(1, 1); + mockMvc.perform(delete("/api/v1/locations/2/entity/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } + // --- DELETE /api/v1/locations/entity/{entityId} --- + @Test - void removeEntityFromCurrentLocation_Success() { - // setup + void removeEntityFromCurrentLocation_Success() throws Exception { when(locationRepository.removeEntityFromCurrentLocation(1)).thenReturn(true); - // execute - ResponseEntity response = locationController.removeEntityFromCurrentLocation(1); + mockMvc.perform(delete("/api/v1/locations/entity/1")) + .andExpect(status().isNoContent()); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); verify(locationRepository).removeEntityFromCurrentLocation(1); } @Test - void removeEntityFromCurrentLocation_NotFound() { - // setup - when(locationRepository.removeEntityFromCurrentLocation(1)).thenReturn(false); + void removeEntityFromCurrentLocation_NotFound() throws Exception { + when(locationRepository.removeEntityFromCurrentLocation(999)).thenReturn(false); - // execute - ResponseEntity response = locationController.removeEntityFromCurrentLocation(1); + mockMvc.perform(delete("/api/v1/locations/entity/999")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status").value(404)) + .andExpect(jsonPath("$.message").value("Entity not found with id: 999")); + } - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); - verify(locationRepository).removeEntityFromCurrentLocation(1); + @Test + void removeEntityFromCurrentLocation_RepositoryThrowsException() throws Exception { + when(locationRepository.removeEntityFromCurrentLocation(1)).thenThrow(new RuntimeException("Database error")); + + mockMvc.perform(delete("/api/v1/locations/entity/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").isString()); } } \ No newline at end of file From 88767e71c7a39c9ba2cefd618143f0f00210432d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 04:26:59 +0000 Subject: [PATCH 06/13] Rewrite EnvironmentControllerTest to use MockMvc integration testing Replace direct controller method calls with @SpringBootTest + @AutoConfigureMockMvc + MockMvc.perform() approach. Use @MockBean for all dependencies including EnvironmentRepository, EnvironmentFactory, EnvironmentMapper, DbInteractions, and DbConfig. Add tests for all endpoints including happy paths, 404 not-found cases, 400 creation exceptions, 500 runtime exceptions, empty list, 201 created status, and 204 no-content for deletion. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- .../EnvironmentControllerTest.java | 299 ++++++++++-------- 1 file changed, 159 insertions(+), 140 deletions(-) diff --git a/src/test/java/preponderous/viron/controllers/EnvironmentControllerTest.java b/src/test/java/preponderous/viron/controllers/EnvironmentControllerTest.java index 019d353..1de945b 100644 --- a/src/test/java/preponderous/viron/controllers/EnvironmentControllerTest.java +++ b/src/test/java/preponderous/viron/controllers/EnvironmentControllerTest.java @@ -1,211 +1,240 @@ package preponderous.viron.controllers; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; +import org.springframework.boot.test.mock.bean.MockBean; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.web.servlet.MockMvc; +import preponderous.viron.config.DbConfig; +import preponderous.viron.database.DbInteractions; +import preponderous.viron.dto.EnvironmentDto; import preponderous.viron.exceptions.EnvironmentCreationException; import preponderous.viron.factories.EnvironmentFactory; +import preponderous.viron.mappers.EnvironmentMapper; import preponderous.viron.models.Environment; import preponderous.viron.repositories.EnvironmentRepository; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Optional; -import static org.junit.jupiter.api.Assertions.*; +import static org.hamcrest.Matchers.*; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; @SpringBootTest +@AutoConfigureMockMvc +@DirtiesContext class EnvironmentControllerTest { + + @Autowired + private MockMvc mockMvc; + + @MockBean private EnvironmentRepository environmentRepository; + + @MockBean private EnvironmentFactory environmentFactory; - private EnvironmentController environmentController; - @BeforeEach - void setUp() { - environmentRepository = Mockito.mock(EnvironmentRepository.class); - environmentFactory = Mockito.mock(EnvironmentFactory.class); - environmentController = new EnvironmentController(environmentRepository, environmentFactory); - } + @MockBean + private EnvironmentMapper environmentMapper; + + @MockBean + private DbInteractions dbInteractions; + + @MockBean + private DbConfig dbConfig; @Test - void getAllEnvironments_Success() { - // setup + void getAllEnvironments_Success() throws Exception { List environments = Arrays.asList( new Environment(1, "Env1", "2023-01-01"), new Environment(2, "Env2", "2023-01-02") ); + List dtos = Arrays.asList( + new EnvironmentDto(1, "Env1", "2023-01-01"), + new EnvironmentDto(2, "Env2", "2023-01-02") + ); when(environmentRepository.findAll()).thenReturn(environments); + when(environmentMapper.toDtoList(environments)).thenReturn(dtos); - // execute - ResponseEntity> response = environmentController.getAllEnvironments(); + mockMvc.perform(get("/api/v1/environments")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(2))) + .andExpect(jsonPath("$[0].environmentId", is(1))) + .andExpect(jsonPath("$[0].name", is("Env1"))) + .andExpect(jsonPath("$[0].creationDate", is("2023-01-01"))) + .andExpect(jsonPath("$[1].environmentId", is(2))) + .andExpect(jsonPath("$[1].name", is("Env2"))); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertNotNull(response.getBody()); - assertEquals(2, response.getBody().size()); verify(environmentRepository).findAll(); + verify(environmentMapper).toDtoList(environments); } @Test - void getAllEnvironments_ThrowsException() { - // setup - when(environmentRepository.findAll()).thenThrow(new RuntimeException("Database error")); + void getAllEnvironments_EmptyList() throws Exception { + when(environmentRepository.findAll()).thenReturn(Collections.emptyList()); + when(environmentMapper.toDtoList(Collections.emptyList())).thenReturn(Collections.emptyList()); - // execute - ResponseEntity> response = environmentController.getAllEnvironments(); + mockMvc.perform(get("/api/v1/environments")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(0))); - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertNull(response.getBody()); verify(environmentRepository).findAll(); } @Test - void getEnvironmentById_Success() { - // setup + void getAllEnvironments_ThrowsException() throws Exception { + when(environmentRepository.findAll()).thenThrow(new RuntimeException("Database error")); + + mockMvc.perform(get("/api/v1/environments")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status", is(500))) + .andExpect(jsonPath("$.message", is("An unexpected error occurred"))); + } + + @Test + void getEnvironmentById_Success() throws Exception { Environment environment = new Environment(1, "Env1", "2023-01-01"); + EnvironmentDto dto = new EnvironmentDto(1, "Env1", "2023-01-01"); when(environmentRepository.findById(1)).thenReturn(Optional.of(environment)); + when(environmentMapper.toDto(environment)).thenReturn(dto); - // execute - ResponseEntity response = environmentController.getEnvironmentById(1); + mockMvc.perform(get("/api/v1/environments/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.environmentId", is(1))) + .andExpect(jsonPath("$.name", is("Env1"))) + .andExpect(jsonPath("$.creationDate", is("2023-01-01"))); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertNotNull(response.getBody()); - assertEquals("Env1", response.getBody().getName()); verify(environmentRepository).findById(1); + verify(environmentMapper).toDto(environment); } @Test - void getEnvironmentById_NotFound() { - // setup + void getEnvironmentById_NotFound() throws Exception { when(environmentRepository.findById(1)).thenReturn(Optional.empty()); - // execute - ResponseEntity response = environmentController.getEnvironmentById(1); - - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); - assertNull(response.getBody()); - verify(environmentRepository).findById(1); + mockMvc.perform(get("/api/v1/environments/1")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status", is(404))) + .andExpect(jsonPath("$.message", is("Environment not found with id: 1"))); } @Test - void getEnvironmentById_ThrowsException() { - // setup + void getEnvironmentById_ThrowsException() throws Exception { when(environmentRepository.findById(1)).thenThrow(new RuntimeException("Database error")); - // execute - ResponseEntity response = environmentController.getEnvironmentById(1); - - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertNull(response.getBody()); - verify(environmentRepository).findById(1); + mockMvc.perform(get("/api/v1/environments/1")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status", is(500))) + .andExpect(jsonPath("$.message", is("An unexpected error occurred"))); } @Test - void getEnvironmentByName_Success() { - // setup + void getEnvironmentByName_Success() throws Exception { Environment environment = new Environment(1, "Env1", "2023-01-01"); + EnvironmentDto dto = new EnvironmentDto(1, "Env1", "2023-01-01"); when(environmentRepository.findByName("Env1")).thenReturn(Optional.of(environment)); + when(environmentMapper.toDto(environment)).thenReturn(dto); - // execute - ResponseEntity response = environmentController.getEnvironmentByName("Env1"); + mockMvc.perform(get("/api/v1/environments/name/Env1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.environmentId", is(1))) + .andExpect(jsonPath("$.name", is("Env1"))) + .andExpect(jsonPath("$.creationDate", is("2023-01-01"))); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertNotNull(response.getBody()); - assertEquals("Env1", response.getBody().getName()); verify(environmentRepository).findByName("Env1"); + verify(environmentMapper).toDto(environment); } @Test - void getEnvironmentByName_NotFound() { - // setup + void getEnvironmentByName_NotFound() throws Exception { when(environmentRepository.findByName("NonExistent")).thenReturn(Optional.empty()); - // execute - ResponseEntity response = environmentController.getEnvironmentByName("NonExistent"); - - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); - assertNull(response.getBody()); - verify(environmentRepository).findByName("NonExistent"); + mockMvc.perform(get("/api/v1/environments/name/NonExistent")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status", is(404))) + .andExpect(jsonPath("$.message", is("Environment not found with name: NonExistent"))); } @Test - void getEnvironmentOfEntity_Success() { - // setup + void getEnvironmentOfEntity_Success() throws Exception { Environment environment = new Environment(1, "Env1", "2023-01-01"); + EnvironmentDto dto = new EnvironmentDto(1, "Env1", "2023-01-01"); when(environmentRepository.findByEntityId(1)).thenReturn(Optional.of(environment)); + when(environmentMapper.toDto(environment)).thenReturn(dto); - // execute - ResponseEntity response = environmentController.getEnvironmentOfEntity(1); + mockMvc.perform(get("/api/v1/environments/entity/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.environmentId", is(1))) + .andExpect(jsonPath("$.name", is("Env1"))) + .andExpect(jsonPath("$.creationDate", is("2023-01-01"))); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertNotNull(response.getBody()); - assertEquals("Env1", response.getBody().getName()); verify(environmentRepository).findByEntityId(1); + verify(environmentMapper).toDto(environment); } @Test - void getEnvironmentOfEntity_NotFound() { - // setup + void getEnvironmentOfEntity_NotFound() throws Exception { when(environmentRepository.findByEntityId(1)).thenReturn(Optional.empty()); - // execute - ResponseEntity response = environmentController.getEnvironmentOfEntity(1); - - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); - assertNull(response.getBody()); - verify(environmentRepository).findByEntityId(1); + mockMvc.perform(get("/api/v1/environments/entity/1")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status", is(404))) + .andExpect(jsonPath("$.message", is("Environment not found for entity: 1"))); } @Test - void createEnvironment_Success() throws EnvironmentCreationException { - // setup + void createEnvironment_Success() throws Exception { Environment environment = new Environment(1, "NewEnv", "2023-01-01"); + EnvironmentDto dto = new EnvironmentDto(1, "NewEnv", "2023-01-01"); when(environmentFactory.createEnvironment("NewEnv", 5, 10)).thenReturn(environment); + when(environmentMapper.toDto(environment)).thenReturn(dto); - // execute - ResponseEntity response = environmentController.createEnvironment("NewEnv", 5, 10); + mockMvc.perform(post("/api/v1/environments/NewEnv/5/10")) + .andExpect(status().isCreated()) + .andExpect(jsonPath("$.environmentId", is(1))) + .andExpect(jsonPath("$.name", is("NewEnv"))) + .andExpect(jsonPath("$.creationDate", is("2023-01-01"))); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertNotNull(response.getBody()); - assertEquals("NewEnv", response.getBody().getName()); verify(environmentFactory).createEnvironment("NewEnv", 5, 10); + verify(environmentMapper).toDto(environment); } @Test - void createEnvironment_CreationException() throws EnvironmentCreationException { - // setup + void createEnvironment_CreationException() throws Exception { when(environmentFactory.createEnvironment("NewEnv", 5, 10)) .thenThrow(new EnvironmentCreationException("Creation failed")); - // execute - ResponseEntity response = environmentController.createEnvironment("NewEnv", 5, 10); + mockMvc.perform(post("/api/v1/environments/NewEnv/5/10")) + .andExpect(status().isBadRequest()) + .andExpect(jsonPath("$.status", is(400))) + .andExpect(jsonPath("$.message", is("Creation failed"))); + } - // verify - assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode()); - assertNull(response.getBody()); - verify(environmentFactory).createEnvironment("NewEnv", 5, 10); + @Test + void createEnvironment_ThrowsException() throws Exception { + when(environmentFactory.createEnvironment("NewEnv", 5, 10)) + .thenThrow(new RuntimeException("Database error")); + + mockMvc.perform(post("/api/v1/environments/NewEnv/5/10")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status", is(500))) + .andExpect(jsonPath("$.message", is("An unexpected error occurred"))); } @Test - void deleteEnvironment_Success() { - // setup - when(environmentRepository.findById(1)).thenReturn(Optional.of(new Environment(1, "Env1", "2023-01-01"))); - when(environmentRepository.findEntityIdsByEnvironmentId(1)).thenReturn(Arrays.asList(1, 2)); - when(environmentRepository.findLocationIdsByEnvironmentId(1)).thenReturn(Arrays.asList(3, 4)); - when(environmentRepository.findGridIdsByEnvironmentId(1)).thenReturn(Arrays.asList(5, 6)); + void deleteEnvironment_Success() throws Exception { + Environment env = new Environment(1, "Env1", "2023-01-01"); + when(environmentRepository.findById(1)).thenReturn(Optional.of(env)); + when(environmentRepository.findEntityIdsByEnvironmentId(1)).thenReturn(List.of(1, 2)); + when(environmentRepository.findLocationIdsByEnvironmentId(1)).thenReturn(List.of(3, 4)); + when(environmentRepository.findGridIdsByEnvironmentId(1)).thenReturn(List.of(5)); when(environmentRepository.deleteEntityLocation(anyInt())).thenReturn(true); when(environmentRepository.deleteLocationGrid(anyInt())).thenReturn(true); when(environmentRepository.deleteGridEnvironment(anyInt())).thenReturn(true); @@ -214,65 +243,55 @@ void deleteEnvironment_Success() { when(environmentRepository.deleteGrid(anyInt())).thenReturn(true); when(environmentRepository.deleteById(1)).thenReturn(true); - // execute - ResponseEntity response = environmentController.deleteEnvironment(1); + mockMvc.perform(delete("/api/v1/environments/1")) + .andExpect(status().isNoContent()); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); verify(environmentRepository).deleteById(1); } @Test - void deleteEnvironment_NotFound() { - // setup + void deleteEnvironment_NotFound() throws Exception { when(environmentRepository.findById(1)).thenReturn(Optional.empty()); - // execute - ResponseEntity response = environmentController.deleteEnvironment(1); + mockMvc.perform(delete("/api/v1/environments/1")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status", is(404))) + .andExpect(jsonPath("$.message", is("Environment not found with id: 1"))); - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); verify(environmentRepository, never()).deleteById(anyInt()); } @Test - void updateEnvironmentName_Success() { - // setup + void updateEnvironmentName_Success() throws Exception { when(environmentRepository.findById(1)).thenReturn(Optional.of(new Environment(1, "OldName", "2023-01-01"))); when(environmentRepository.updateName(1, "NewName")).thenReturn(true); - // execute - ResponseEntity response = environmentController.updateEnvironmentName(1, "NewName"); + mockMvc.perform(patch("/api/v1/environments/1/name/NewName")) + .andExpect(status().isOk()); - // verify - assertEquals(HttpStatus.OK, response.getStatusCode()); verify(environmentRepository).updateName(1, "NewName"); } @Test - void updateEnvironmentName_NotFound() { - // setup + void updateEnvironmentName_NotFound() throws Exception { when(environmentRepository.findById(1)).thenReturn(Optional.empty()); - // execute - ResponseEntity response = environmentController.updateEnvironmentName(1, "NewName"); + mockMvc.perform(patch("/api/v1/environments/1/name/NewName")) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.status", is(404))) + .andExpect(jsonPath("$.message", is("Environment not found with id: 1"))); - // verify - assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); verify(environmentRepository, never()).updateName(anyInt(), anyString()); } @Test - void updateEnvironmentName_ThrowsException() { - // setup + void updateEnvironmentName_ThrowsException() throws Exception { when(environmentRepository.findById(1)).thenReturn(Optional.of(new Environment(1, "OldName", "2023-01-01"))); when(environmentRepository.updateName(1, "NewName")).thenThrow(new RuntimeException("Database error")); - // execute - ResponseEntity response = environmentController.updateEnvironmentName(1, "NewName"); - - // verify - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - verify(environmentRepository).updateName(1, "NewName"); + mockMvc.perform(patch("/api/v1/environments/1/name/NewName")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status", is(500))) + .andExpect(jsonPath("$.message", is("An unexpected error occurred"))); } } \ No newline at end of file From 10f806ce5ab07eb38ec1c39560310def4ed5e87a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 04:31:50 +0000 Subject: [PATCH 07/13] Rewrite DebugControllerTest with comprehensive MockMvc-based tests - createSampleData happy path: verifies 201 with correct EnvironmentDto JSON - createWorldAndPlaceEntity happy path: verifies 201 with correct EntityDto JSON - createWorldAndPlaceEntity with ServiceException: verifies 500 error response - createWorldAndPlaceEntity with no valid location: verifies 400 error response - Fix pre-existing typo in EnvironmentControllerTest MockBean import Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- .../controllers/DebugControllerTest.java | 178 ++++++++++++++++-- .../EnvironmentControllerTest.java | 2 +- 2 files changed, 159 insertions(+), 21 deletions(-) diff --git a/src/test/java/preponderous/viron/controllers/DebugControllerTest.java b/src/test/java/preponderous/viron/controllers/DebugControllerTest.java index 9305dc4..fdbfdba 100644 --- a/src/test/java/preponderous/viron/controllers/DebugControllerTest.java +++ b/src/test/java/preponderous/viron/controllers/DebugControllerTest.java @@ -1,43 +1,181 @@ package preponderous.viron.controllers; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mock; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.web.servlet.MockMvc; +import preponderous.viron.config.DbConfig; +import preponderous.viron.database.DbInteractions; +import preponderous.viron.dto.EntityDto; +import preponderous.viron.dto.EnvironmentDto; +import preponderous.viron.exceptions.ServiceException; +import preponderous.viron.mappers.EntityMapper; +import preponderous.viron.mappers.EnvironmentMapper; +import preponderous.viron.models.Entity; +import preponderous.viron.models.Environment; +import preponderous.viron.models.Grid; +import preponderous.viron.models.Location; import preponderous.viron.services.EntityService; import preponderous.viron.services.EnvironmentService; import preponderous.viron.services.GridService; import preponderous.viron.services.LocationService; +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @SpringBootTest -public class DebugControllerTest { +@AutoConfigureMockMvc +@DirtiesContext +class DebugControllerTest { - @Mock + @Autowired + private MockMvc mockMvc; + + @MockBean private EntityService entityService; - @Mock + @MockBean private EnvironmentService environmentService; - @Mock + @MockBean private GridService gridService; - @Mock + @MockBean private LocationService locationService; - @InjectMocks - private DebugController debugController; + @MockBean + private EntityMapper entityMapper; + + @MockBean + private EnvironmentMapper environmentMapper; + + @MockBean + private DbInteractions dbInteractions; + + @MockBean + private DbConfig dbConfig; + + // --- POST /api/v1/debug/create-sample-data --- + + @Test + void createSampleData_Success() throws Exception { + Environment environment = new Environment(1, "Sample Environment", "2024-01-01"); + Grid grid = new Grid(1, 10, 10); + List locations = buildLocationGrid(10, 10); - @BeforeEach - public void setUp() { - entityService = mock(EntityService.class); - environmentService = mock(EnvironmentService.class); - gridService = mock(GridService.class); - locationService = mock(LocationService.class); - debugController = new DebugController(entityService, environmentService, gridService, locationService); + when(environmentService.createEnvironment("Sample Environment", 1, 10)).thenReturn(environment); + when(gridService.getGridsInEnvironment(1)).thenReturn(List.of(grid)); + when(locationService.getLocationsInGrid(1)).thenReturn(locations); + when(entityService.createEntity(anyString())).thenAnswer(invocation -> { + String name = invocation.getArgument(0); + return new Entity(name.hashCode(), name, "2024-01-01"); + }); + doNothing().when(locationService).addEntityToLocation(anyInt(), anyInt()); + + EnvironmentDto dto = new EnvironmentDto(1, "Sample Environment", "2024-01-01"); + when(environmentMapper.toDto(environment)).thenReturn(dto); + + mockMvc.perform(post("/api/v1/debug/create-sample-data")) + .andExpect(status().isCreated()) + .andExpect(jsonPath("$.environmentId").value(1)) + .andExpect(jsonPath("$.name").value("Sample Environment")) + .andExpect(jsonPath("$.creationDate").value("2024-01-01")); + + verify(environmentService).createEnvironment("Sample Environment", 1, 10); + verify(gridService).getGridsInEnvironment(1); + verify(locationService).getLocationsInGrid(1); + verify(entityService, times(10)).createEntity(anyString()); + verify(locationService, times(10)).addEntityToLocation(anyInt(), anyInt()); + verify(environmentMapper).toDto(environment); } - // TODO: implement tests for DebugController methods + // --- POST /api/v1/debug/create-world-and-place-entity/{environmentName} --- + + @Test + void createWorldAndPlaceEntity_Success() throws Exception { + Environment environment = new Environment(2, "TestWorld", "2024-02-01"); + Grid grid = new Grid(5, 5, 5); + List locations = buildLocationGrid(5, 5); + + when(environmentService.createEnvironment("TestWorld", 1, 5)).thenReturn(environment); + when(gridService.getGridsInEnvironment(2)).thenReturn(List.of(grid)); + when(locationService.getLocationsInGrid(5)).thenReturn(locations); + + Entity entity = new Entity(10, "Tom", "2024-02-01"); + when(entityService.createEntity(anyString())).thenReturn(entity); + doNothing().when(locationService).addEntityToLocation(anyInt(), anyInt()); + + EntityDto dto = new EntityDto(10, "Tom", "2024-02-01"); + when(entityMapper.toDto(entity)).thenReturn(dto); + + mockMvc.perform(post("/api/v1/debug/create-world-and-place-entity/TestWorld")) + .andExpect(status().isCreated()) + .andExpect(jsonPath("$.entityId").value(10)) + .andExpect(jsonPath("$.name").value("Tom")) + .andExpect(jsonPath("$.creationDate").value("2024-02-01")); + + verify(environmentService).createEnvironment("TestWorld", 1, 5); + verify(gridService).getGridsInEnvironment(2); + verify(entityService).createEntity(anyString()); + verify(locationService).getLocationsInGrid(5); + verify(locationService).addEntityToLocation(eq(10), anyInt()); + verify(entityMapper).toDto(entity); + } + + @Test + void createWorldAndPlaceEntity_ServiceException_Returns500() throws Exception { + Environment environment = new Environment(3, "FailWorld", "2024-03-01"); + Grid grid = new Grid(6, 5, 5); + + when(environmentService.createEnvironment("FailWorld", 1, 5)).thenReturn(environment); + when(gridService.getGridsInEnvironment(3)).thenReturn(List.of(grid)); + when(entityService.createEntity(anyString())).thenThrow(new ServiceException("Entity creation failed")); + + mockMvc.perform(post("/api/v1/debug/create-world-and-place-entity/FailWorld")) + .andExpect(status().isInternalServerError()) + .andExpect(jsonPath("$.status").value(500)) + .andExpect(jsonPath("$.message").value("Entity creation failed")); + } + + @Test + void createWorldAndPlaceEntity_NoValidLocation_Returns400() throws Exception { + Environment environment = new Environment(4, "EmptyWorld", "2024-04-01"); + Grid grid = new Grid(7, 5, 5); + + when(environmentService.createEnvironment("EmptyWorld", 1, 5)).thenReturn(environment); + when(gridService.getGridsInEnvironment(4)).thenReturn(List.of(grid)); + + Entity entity = new Entity(20, "Jerry", "2024-04-01"); + when(entityService.createEntity(anyString())).thenReturn(entity); + // Return an empty location list so no valid location can be found + when(locationService.getLocationsInGrid(7)).thenReturn(List.of()); + + mockMvc.perform(post("/api/v1/debug/create-world-and-place-entity/EmptyWorld")) + .andExpect(status().isBadRequest()) + .andExpect(jsonPath("$.status").value(400)) + .andExpect(jsonPath("$.message").isString()); + } + + /** + * Builds a list of locations covering all coordinates in a grid of the given size. + * Location IDs are assigned sequentially starting from 1. + */ + private List buildLocationGrid(int rows, int columns) { + List locations = new ArrayList<>(); + int id = 1; + for (int x = 0; x < rows; x++) { + for (int y = 0; y < columns; y++) { + locations.add(new Location(id++, x, y)); + } + } + return locations; + } } \ No newline at end of file diff --git a/src/test/java/preponderous/viron/controllers/EnvironmentControllerTest.java b/src/test/java/preponderous/viron/controllers/EnvironmentControllerTest.java index 1de945b..1e89233 100644 --- a/src/test/java/preponderous/viron/controllers/EnvironmentControllerTest.java +++ b/src/test/java/preponderous/viron/controllers/EnvironmentControllerTest.java @@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.bean.MockBean; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import preponderous.viron.config.DbConfig; From 71ce4b80fb2d92c2835e9ff7ddd0aaa5f431a01e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 04:51:17 +0000 Subject: [PATCH 08/13] Return DTOs directly from controllers, add existence checks for delete/update ops Agent-Logs-Url: https://github.com/Preponderous-Software/viron/sessions/43e28cf8-afe5-493e-a12f-a9dc027f0f46 Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- .../viron/controllers/DebugController.java | 16 +++---- .../viron/controllers/EntityController.java | 47 ++++++++++-------- .../controllers/EnvironmentController.java | 29 ++++++----- .../viron/controllers/GridController.java | 17 ++++--- .../viron/controllers/LocationController.java | 48 +++++++++++-------- .../controllers/EntityControllerTest.java | 8 +++- .../controllers/LocationControllerTest.java | 16 +++++-- 7 files changed, 100 insertions(+), 81 deletions(-) diff --git a/src/main/java/preponderous/viron/controllers/DebugController.java b/src/main/java/preponderous/viron/controllers/DebugController.java index edf1bba..8f326f6 100644 --- a/src/main/java/preponderous/viron/controllers/DebugController.java +++ b/src/main/java/preponderous/viron/controllers/DebugController.java @@ -7,12 +7,8 @@ import jakarta.validation.constraints.NotBlank; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import preponderous.viron.dto.EntityDto; import preponderous.viron.dto.EnvironmentDto; @@ -58,7 +54,8 @@ public DebugController(EntityService entityService, EnvironmentService environme * It ensures the entities are properly created and assigned to valid locations in the grid. */ @PostMapping("/create-sample-data") - public ResponseEntity createSampleData() { + @ResponseStatus(HttpStatus.CREATED) + public EnvironmentDto createSampleData() { // create an environment with one 10x10 grid Environment environment = environmentService.createEnvironment("Sample Environment", 1, 10); List grids = gridService.getGridsInEnvironment(environment.getEnvironmentId()); @@ -85,7 +82,7 @@ public ResponseEntity createSampleData() { locationService.addEntityToLocation(entity.getEntityId(), location.getLocationId()); } - return ResponseEntity.status(HttpStatus.CREATED).body(environmentMapper.toDto(environment)); + return environmentMapper.toDto(environment); } /** @@ -95,7 +92,8 @@ public ResponseEntity createSampleData() { * @param environmentName the name of the environment to be created */ @PostMapping("/create-world-and-place-entity/{environmentName}") - public ResponseEntity createWorldAndPlaceEntity(@PathVariable @NotBlank String environmentName) { + @ResponseStatus(HttpStatus.CREATED) + public EntityDto createWorldAndPlaceEntity(@PathVariable @NotBlank String environmentName) { // create an environment int numGrids = 1; int gridSize = 5; @@ -128,6 +126,6 @@ public ResponseEntity createWorldAndPlaceEntity(@PathVariable @NotBla } locationService.addEntityToLocation(entity.getEntityId(), location.getLocationId()); log.info("Entity {} placed at location ({}, {})", entity.getName(), entityRow, entityColumn); - return ResponseEntity.status(HttpStatus.CREATED).body(entityMapper.toDto(entity)); + return entityMapper.toDto(entity); } } \ No newline at end of file diff --git a/src/main/java/preponderous/viron/controllers/EntityController.java b/src/main/java/preponderous/viron/controllers/EntityController.java index a7dae68..a1bf6bb 100644 --- a/src/main/java/preponderous/viron/controllers/EntityController.java +++ b/src/main/java/preponderous/viron/controllers/EntityController.java @@ -3,11 +3,11 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import preponderous.viron.dto.EntityDto; import preponderous.viron.exceptions.NotFoundException; +import preponderous.viron.exceptions.ServiceException; import preponderous.viron.factories.EntityFactory; import preponderous.viron.mappers.EntityMapper; import preponderous.viron.models.Entity; @@ -28,62 +28,67 @@ public class EntityController { private final EntityMapper entityMapper; @GetMapping - public ResponseEntity> getAllEntities() { + public List getAllEntities() { List entities = entityRepository.findAll(); - return ResponseEntity.ok(entityMapper.toDtoList(entities)); + return entityMapper.toDtoList(entities); } @GetMapping("/{id}") - public ResponseEntity getEntityById(@PathVariable @Min(1) int id) { + public EntityDto getEntityById(@PathVariable @Min(1) int id) { Entity entity = entityRepository.findById(id) .orElseThrow(() -> new NotFoundException("Entity not found with id: " + id)); - return ResponseEntity.ok(entityMapper.toDto(entity)); + return entityMapper.toDto(entity); } @GetMapping("/environment/{environmentId}") - public ResponseEntity> getEntitiesInEnvironment(@PathVariable @Min(1) int environmentId) { + public List getEntitiesInEnvironment(@PathVariable @Min(1) int environmentId) { List entities = entityRepository.findByEnvironmentId(environmentId); - return ResponseEntity.ok(entityMapper.toDtoList(entities)); + return entityMapper.toDtoList(entities); } @GetMapping("/grid/{gridId}") - public ResponseEntity> getEntitiesInGrid(@PathVariable @Min(1) int gridId) { + public List getEntitiesInGrid(@PathVariable @Min(1) int gridId) { List entities = entityRepository.findByGridId(gridId); - return ResponseEntity.ok(entityMapper.toDtoList(entities)); + return entityMapper.toDtoList(entities); } @GetMapping("/location/{locationId}") - public ResponseEntity> getEntitiesInLocation(@PathVariable @Min(1) int locationId) { + public List getEntitiesInLocation(@PathVariable @Min(1) int locationId) { List entities = entityRepository.findByLocationId(locationId); - return ResponseEntity.ok(entityMapper.toDtoList(entities)); + return entityMapper.toDtoList(entities); } @GetMapping("/unassigned") - public ResponseEntity> getEntitiesNotInAnyLocation() { + public List getEntitiesNotInAnyLocation() { List entities = entityRepository.findEntitiesNotInAnyLocation(); - return ResponseEntity.ok(entityMapper.toDtoList(entities)); + return entityMapper.toDtoList(entities); } @PostMapping("/{name}") - public ResponseEntity createEntity(@PathVariable @NotBlank String name) { + @ResponseStatus(HttpStatus.CREATED) + public EntityDto createEntity(@PathVariable @NotBlank String name) { Entity newEntity = entityFactory.createEntity(name); - return ResponseEntity.status(HttpStatus.CREATED).body(entityMapper.toDto(newEntity)); + return entityMapper.toDto(newEntity); } @DeleteMapping("/{id}") @ResponseStatus(HttpStatus.NO_CONTENT) - public ResponseEntity deleteEntity(@PathVariable @Min(1) int id) { - if (!entityRepository.deleteById(id)) { + public void deleteEntity(@PathVariable @Min(1) int id) { + if (entityRepository.findById(id).isEmpty()) { throw new NotFoundException("Entity not found with id: " + id); } - return ResponseEntity.noContent().build(); + if (!entityRepository.deleteById(id)) { + throw new ServiceException("Failed to delete entity with id: " + id); + } } @PatchMapping("/{id}/name/{name}") - public ResponseEntity updateEntityName(@PathVariable @Min(1) int id, @PathVariable @NotBlank String name) { - if (!entityRepository.updateName(id, name)) { + public void updateEntityName(@PathVariable @Min(1) int id, @PathVariable @NotBlank String name) { + if (entityRepository.findById(id).isEmpty()) { throw new NotFoundException("Entity not found with id: " + id); } - return ResponseEntity.ok().build(); + if (!entityRepository.updateName(id, name)) { + throw new ServiceException("Failed to update name for entity " + id); + } } } diff --git a/src/main/java/preponderous/viron/controllers/EnvironmentController.java b/src/main/java/preponderous/viron/controllers/EnvironmentController.java index 166abb6..c7708cf 100644 --- a/src/main/java/preponderous/viron/controllers/EnvironmentController.java +++ b/src/main/java/preponderous/viron/controllers/EnvironmentController.java @@ -7,7 +7,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import preponderous.viron.dto.EnvironmentDto; @@ -33,43 +32,45 @@ public class EnvironmentController { private final EnvironmentMapper environmentMapper; @GetMapping - public ResponseEntity> getAllEnvironments() { + public List getAllEnvironments() { List environments = environmentRepository.findAll(); - return ResponseEntity.ok(environmentMapper.toDtoList(environments)); + return environmentMapper.toDtoList(environments); } @GetMapping("/{id}") - public ResponseEntity getEnvironmentById(@PathVariable @Min(1) int id) { + public EnvironmentDto getEnvironmentById(@PathVariable @Min(1) int id) { Environment environment = environmentRepository.findById(id) .orElseThrow(() -> new NotFoundException("Environment not found with id: " + id)); - return ResponseEntity.ok(environmentMapper.toDto(environment)); + return environmentMapper.toDto(environment); } @GetMapping("/name/{name}") - public ResponseEntity getEnvironmentByName(@PathVariable @NotBlank String name) { + public EnvironmentDto getEnvironmentByName(@PathVariable @NotBlank String name) { Environment environment = environmentRepository.findByName(name) .orElseThrow(() -> new NotFoundException("Environment not found with name: " + name)); - return ResponseEntity.ok(environmentMapper.toDto(environment)); + return environmentMapper.toDto(environment); } @GetMapping("/entity/{entityId}") - public ResponseEntity getEnvironmentOfEntity(@PathVariable @Min(1) int entityId) { + public EnvironmentDto getEnvironmentOfEntity(@PathVariable @Min(1) int entityId) { Environment environment = environmentRepository.findByEntityId(entityId) .orElseThrow(() -> new NotFoundException("Environment not found for entity: " + entityId)); - return ResponseEntity.ok(environmentMapper.toDto(environment)); + return environmentMapper.toDto(environment); } @PostMapping("/{name}/{numGrids}/{gridSize}") - public ResponseEntity createEnvironment( + @ResponseStatus(HttpStatus.CREATED) + public EnvironmentDto createEnvironment( @PathVariable @NotBlank String name, @PathVariable @Min(1) int numGrids, @PathVariable @Min(1) int gridSize) { Environment newEnvironment = environmentFactory.createEnvironment(name, numGrids, gridSize); - return ResponseEntity.status(HttpStatus.CREATED).body(environmentMapper.toDto(newEnvironment)); + return environmentMapper.toDto(newEnvironment); } @DeleteMapping("/{id}") - public ResponseEntity deleteEnvironment(@PathVariable @Min(1) int id) { + @ResponseStatus(HttpStatus.NO_CONTENT) + public void deleteEnvironment(@PathVariable @Min(1) int id) { if (environmentRepository.findById(id).isEmpty()) { throw new NotFoundException("Environment not found with id: " + id); } @@ -135,11 +136,10 @@ public ResponseEntity deleteEnvironment(@PathVariable @Min(1) int id) { } log.info("Environment with id {} deleted", id); - return ResponseEntity.noContent().build(); } @PatchMapping("/{id}/name/{name}") - public ResponseEntity updateEnvironmentName(@PathVariable @Min(1) int id, @PathVariable @NotBlank String name) { + public void updateEnvironmentName(@PathVariable @Min(1) int id, @PathVariable @NotBlank String name) { if (environmentRepository.findById(id).isEmpty()) { throw new NotFoundException("Environment not found with id: " + id); } @@ -149,6 +149,5 @@ public ResponseEntity updateEnvironmentName(@PathVariable @Min(1) int id, } log.info("Updated name for environment {} to '{}'", id, name); - return ResponseEntity.ok().build(); } } diff --git a/src/main/java/preponderous/viron/controllers/GridController.java b/src/main/java/preponderous/viron/controllers/GridController.java index 312fe42..2436429 100644 --- a/src/main/java/preponderous/viron/controllers/GridController.java +++ b/src/main/java/preponderous/viron/controllers/GridController.java @@ -2,7 +2,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import preponderous.viron.dto.GridDto; @@ -24,28 +23,28 @@ public class GridController { private final GridMapper gridMapper; @GetMapping - public ResponseEntity> getAllGrids() { + public List getAllGrids() { List grids = gridRepository.findAll(); - return ResponseEntity.ok(gridMapper.toDtoList(grids)); + return gridMapper.toDtoList(grids); } @GetMapping("/{id}") - public ResponseEntity getGridById(@PathVariable @Min(1) int id) { + public GridDto getGridById(@PathVariable @Min(1) int id) { Grid grid = gridRepository.findById(id) .orElseThrow(() -> new NotFoundException("Grid not found with id: " + id)); - return ResponseEntity.ok(gridMapper.toDto(grid)); + return gridMapper.toDto(grid); } @GetMapping("/environment/{environmentId}") - public ResponseEntity> getGridsInEnvironment(@PathVariable @Min(1) int environmentId) { + public List getGridsInEnvironment(@PathVariable @Min(1) int environmentId) { List grids = gridRepository.findByEnvironmentId(environmentId); - return ResponseEntity.ok(gridMapper.toDtoList(grids)); + return gridMapper.toDtoList(grids); } @GetMapping("/entity/{entityId}") - public ResponseEntity getGridOfEntity(@PathVariable @Min(1) int entityId) { + public GridDto getGridOfEntity(@PathVariable @Min(1) int entityId) { Grid grid = gridRepository.findByEntityId(entityId) .orElseThrow(() -> new NotFoundException("Grid not found for entity: " + entityId)); - return ResponseEntity.ok(gridMapper.toDto(grid)); + return gridMapper.toDto(grid); } } diff --git a/src/main/java/preponderous/viron/controllers/LocationController.java b/src/main/java/preponderous/viron/controllers/LocationController.java index cf48689..d035f88 100644 --- a/src/main/java/preponderous/viron/controllers/LocationController.java +++ b/src/main/java/preponderous/viron/controllers/LocationController.java @@ -3,11 +3,11 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import preponderous.viron.dto.LocationDto; import preponderous.viron.exceptions.NotFoundException; +import preponderous.viron.exceptions.ServiceException; import preponderous.viron.mappers.LocationMapper; import preponderous.viron.models.Location; import preponderous.viron.repositories.LocationRepository; @@ -25,58 +25,66 @@ public class LocationController { private final LocationMapper locationMapper; @GetMapping - public ResponseEntity> getAllLocations() { + public List getAllLocations() { List locations = locationRepository.findAll(); - return ResponseEntity.ok(locationMapper.toDtoList(locations)); + return locationMapper.toDtoList(locations); } @GetMapping("/{id}") - public ResponseEntity getLocationById(@PathVariable @Min(1) int id) { + public LocationDto getLocationById(@PathVariable @Min(1) int id) { Location location = locationRepository.findById(id) .orElseThrow(() -> new NotFoundException("Location not found with id: " + id)); - return ResponseEntity.ok(locationMapper.toDto(location)); + return locationMapper.toDto(location); } @GetMapping("/environment/{environmentId}") - public ResponseEntity> getLocationsInEnvironment(@PathVariable @Min(1) int environmentId) { + public List getLocationsInEnvironment(@PathVariable @Min(1) int environmentId) { List locations = locationRepository.findByEnvironmentId(environmentId); - return ResponseEntity.ok(locationMapper.toDtoList(locations)); + return locationMapper.toDtoList(locations); } @GetMapping("/grid/{gridId}") - public ResponseEntity> getLocationsInGrid(@PathVariable @Min(1) int gridId) { + public List getLocationsInGrid(@PathVariable @Min(1) int gridId) { List locations = locationRepository.findByGridId(gridId); - return ResponseEntity.ok(locationMapper.toDtoList(locations)); + return locationMapper.toDtoList(locations); } @GetMapping("/entity/{entityId}") - public ResponseEntity getLocationOfEntity(@PathVariable @Min(1) int entityId) { + public LocationDto getLocationOfEntity(@PathVariable @Min(1) int entityId) { Location location = locationRepository.findByEntityId(entityId) .orElseThrow(() -> new NotFoundException("Location not found for entity: " + entityId)); - return ResponseEntity.ok(locationMapper.toDto(location)); + return locationMapper.toDto(location); } @PutMapping("/{locationId}/entity/{entityId}") - public ResponseEntity addEntityToLocation(@PathVariable @Min(1) int entityId, @PathVariable @Min(1) int locationId) { + public void addEntityToLocation(@PathVariable @Min(1) int entityId, @PathVariable @Min(1) int locationId) { + if (locationRepository.findById(locationId).isEmpty()) { + throw new NotFoundException("Location not found with id: " + locationId); + } if (!locationRepository.addEntityToLocation(entityId, locationId)) { - throw new NotFoundException("Location or entity not found"); + throw new ServiceException("Failed to add entity " + entityId + " to location " + locationId); } - return ResponseEntity.ok().build(); } @DeleteMapping("/{locationId}/entity/{entityId}") - public ResponseEntity removeEntityFromLocation(@PathVariable @Min(1) int entityId, @PathVariable @Min(1) int locationId) { + @ResponseStatus(HttpStatus.NO_CONTENT) + public void removeEntityFromLocation(@PathVariable @Min(1) int entityId, @PathVariable @Min(1) int locationId) { + if (locationRepository.findById(locationId).isEmpty()) { + throw new NotFoundException("Location not found with id: " + locationId); + } if (!locationRepository.removeEntityFromLocation(entityId, locationId)) { - throw new NotFoundException("Location or entity not found"); + throw new ServiceException("Failed to remove entity " + entityId + " from location " + locationId); } - return ResponseEntity.noContent().build(); } @DeleteMapping("/entity/{entityId}") - public ResponseEntity removeEntityFromCurrentLocation(@PathVariable @Min(1) int entityId) { - if (!locationRepository.removeEntityFromCurrentLocation(entityId)) { + @ResponseStatus(HttpStatus.NO_CONTENT) + public void removeEntityFromCurrentLocation(@PathVariable @Min(1) int entityId) { + if (locationRepository.findByEntityId(entityId).isEmpty()) { throw new NotFoundException("Entity not found with id: " + entityId); } - return ResponseEntity.noContent().build(); + if (!locationRepository.removeEntityFromCurrentLocation(entityId)) { + throw new ServiceException("Failed to remove entity " + entityId + " from current location"); + } } } diff --git a/src/test/java/preponderous/viron/controllers/EntityControllerTest.java b/src/test/java/preponderous/viron/controllers/EntityControllerTest.java index df7d29f..fdeee4b 100644 --- a/src/test/java/preponderous/viron/controllers/EntityControllerTest.java +++ b/src/test/java/preponderous/viron/controllers/EntityControllerTest.java @@ -259,6 +259,7 @@ void createEntity_FactoryThrowsRuntimeException() throws Exception { @Test void deleteEntity_ReturnsNoContent() throws Exception { + when(entityRepository.findById(1)).thenReturn(Optional.of(new Entity(1, "Entity1", "2024-01-01"))); when(entityRepository.deleteById(1)).thenReturn(true); mockMvc.perform(delete("/api/v1/entities/1")) @@ -267,7 +268,7 @@ void deleteEntity_ReturnsNoContent() throws Exception { @Test void deleteEntity_NotFound() throws Exception { - when(entityRepository.deleteById(999)).thenReturn(false); + when(entityRepository.findById(999)).thenReturn(Optional.empty()); mockMvc.perform(delete("/api/v1/entities/999")) .andExpect(status().isNotFound()) @@ -277,6 +278,7 @@ void deleteEntity_NotFound() throws Exception { @Test void deleteEntity_RepositoryThrowsException() throws Exception { + when(entityRepository.findById(1)).thenReturn(Optional.of(new Entity(1, "Entity1", "2024-01-01"))); when(entityRepository.deleteById(1)).thenThrow(new RuntimeException("Database error")); mockMvc.perform(delete("/api/v1/entities/1")) @@ -289,6 +291,7 @@ void deleteEntity_RepositoryThrowsException() throws Exception { @Test void updateEntityName_Success() throws Exception { + when(entityRepository.findById(1)).thenReturn(Optional.of(new Entity(1, "OldName", "2024-01-01"))); when(entityRepository.updateName(1, "UpdatedName")).thenReturn(true); mockMvc.perform(patch("/api/v1/entities/1/name/UpdatedName")) @@ -297,7 +300,7 @@ void updateEntityName_Success() throws Exception { @Test void updateEntityName_NotFound() throws Exception { - when(entityRepository.updateName(999, "UpdatedName")).thenReturn(false); + when(entityRepository.findById(999)).thenReturn(Optional.empty()); mockMvc.perform(patch("/api/v1/entities/999/name/UpdatedName")) .andExpect(status().isNotFound()) @@ -307,6 +310,7 @@ void updateEntityName_NotFound() throws Exception { @Test void updateEntityName_RepositoryThrowsException() throws Exception { + when(entityRepository.findById(1)).thenReturn(Optional.of(new Entity(1, "OldName", "2024-01-01"))); when(entityRepository.updateName(1, "Name")).thenThrow(new RuntimeException("Database error")); mockMvc.perform(patch("/api/v1/entities/1/name/Name")) diff --git a/src/test/java/preponderous/viron/controllers/LocationControllerTest.java b/src/test/java/preponderous/viron/controllers/LocationControllerTest.java index 878ace5..e3a4ef2 100644 --- a/src/test/java/preponderous/viron/controllers/LocationControllerTest.java +++ b/src/test/java/preponderous/viron/controllers/LocationControllerTest.java @@ -243,6 +243,7 @@ void getLocationOfEntity_RepositoryThrowsException() throws Exception { @Test void addEntityToLocation_Success() throws Exception { + when(locationRepository.findById(2)).thenReturn(Optional.of(new Location(2, 10, 20))); when(locationRepository.addEntityToLocation(1, 2)).thenReturn(true); mockMvc.perform(put("/api/v1/locations/2/entity/1")) @@ -253,16 +254,17 @@ void addEntityToLocation_Success() throws Exception { @Test void addEntityToLocation_NotFound() throws Exception { - when(locationRepository.addEntityToLocation(1, 2)).thenReturn(false); + when(locationRepository.findById(2)).thenReturn(Optional.empty()); mockMvc.perform(put("/api/v1/locations/2/entity/1")) .andExpect(status().isNotFound()) .andExpect(jsonPath("$.status").value(404)) - .andExpect(jsonPath("$.message").value("Location or entity not found")); + .andExpect(jsonPath("$.message").value("Location not found with id: 2")); } @Test void addEntityToLocation_RepositoryThrowsException() throws Exception { + when(locationRepository.findById(2)).thenReturn(Optional.of(new Location(2, 10, 20))); when(locationRepository.addEntityToLocation(1, 2)).thenThrow(new RuntimeException("Database error")); mockMvc.perform(put("/api/v1/locations/2/entity/1")) @@ -275,6 +277,7 @@ void addEntityToLocation_RepositoryThrowsException() throws Exception { @Test void removeEntityFromLocation_Success() throws Exception { + when(locationRepository.findById(2)).thenReturn(Optional.of(new Location(2, 10, 20))); when(locationRepository.removeEntityFromLocation(1, 2)).thenReturn(true); mockMvc.perform(delete("/api/v1/locations/2/entity/1")) @@ -285,16 +288,17 @@ void removeEntityFromLocation_Success() throws Exception { @Test void removeEntityFromLocation_NotFound() throws Exception { - when(locationRepository.removeEntityFromLocation(1, 2)).thenReturn(false); + when(locationRepository.findById(2)).thenReturn(Optional.empty()); mockMvc.perform(delete("/api/v1/locations/2/entity/1")) .andExpect(status().isNotFound()) .andExpect(jsonPath("$.status").value(404)) - .andExpect(jsonPath("$.message").value("Location or entity not found")); + .andExpect(jsonPath("$.message").value("Location not found with id: 2")); } @Test void removeEntityFromLocation_RepositoryThrowsException() throws Exception { + when(locationRepository.findById(2)).thenReturn(Optional.of(new Location(2, 10, 20))); when(locationRepository.removeEntityFromLocation(1, 2)).thenThrow(new RuntimeException("Database error")); mockMvc.perform(delete("/api/v1/locations/2/entity/1")) @@ -307,6 +311,7 @@ void removeEntityFromLocation_RepositoryThrowsException() throws Exception { @Test void removeEntityFromCurrentLocation_Success() throws Exception { + when(locationRepository.findByEntityId(1)).thenReturn(Optional.of(new Location(5, 10, 20))); when(locationRepository.removeEntityFromCurrentLocation(1)).thenReturn(true); mockMvc.perform(delete("/api/v1/locations/entity/1")) @@ -317,7 +322,7 @@ void removeEntityFromCurrentLocation_Success() throws Exception { @Test void removeEntityFromCurrentLocation_NotFound() throws Exception { - when(locationRepository.removeEntityFromCurrentLocation(999)).thenReturn(false); + when(locationRepository.findByEntityId(999)).thenReturn(Optional.empty()); mockMvc.perform(delete("/api/v1/locations/entity/999")) .andExpect(status().isNotFound()) @@ -327,6 +332,7 @@ void removeEntityFromCurrentLocation_NotFound() throws Exception { @Test void removeEntityFromCurrentLocation_RepositoryThrowsException() throws Exception { + when(locationRepository.findByEntityId(1)).thenReturn(Optional.of(new Location(5, 10, 20))); when(locationRepository.removeEntityFromCurrentLocation(1)).thenThrow(new RuntimeException("Database error")); mockMvc.perform(delete("/api/v1/locations/entity/1")) From d584877a72b8ab629e5c9c38b648cd26a8e734dd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 04:58:59 +0000 Subject: [PATCH 09/13] Fix @PathVariable binding, log levels, validation message, revert mvnw changes Agent-Logs-Url: https://github.com/Preponderous-Software/viron/sessions/0484260a-0b05-45d5-a3ad-1626f917f0da Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- mvnw | 449 ++++++++---------- mvnw.cmd | 355 ++++++-------- .../viron/controllers/LocationController.java | 4 +- .../exceptions/GlobalExceptionHandler.java | 6 +- 4 files changed, 342 insertions(+), 472 deletions(-) mode change 100755 => 100644 mvnw diff --git a/mvnw b/mvnw old mode 100755 new mode 100644 index 1fdbaf2..19529dd --- a/mvnw +++ b/mvnw @@ -19,314 +19,241 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.0 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir +# Apache Maven Wrapper startup batch script, version 3.3.2 # # Optional ENV vars # ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output # ---------------------------------------------------------------------------- -if [ -z "$MAVEN_SKIP_RC" ]; then - - if [ -f /usr/local/etc/mavenrc ]; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ]; then - . /etc/mavenrc - fi +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x - if [ -f "$HOME/.mavenrc" ]; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false -darwin=false -mingw=false +# OS specific support. +native_path() { printf %s\\n "$1"; } case "$(uname)" in -CYGWIN*) cygwin=true ;; -MINGW*) mingw=true ;; -Darwin*) - darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)" - export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home" - export JAVA_HOME - fi - fi +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } ;; esac -if [ -z "$JAVA_HOME" ]; then - if [ -r /etc/gentoo-release ]; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin; then - [ -n "$JAVA_HOME" ] \ - && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] \ - && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \ - && JAVA_HOME="$( - cd "$JAVA_HOME" || ( - echo "cannot cd into $JAVA_HOME." >&2 - exit 1 - ) - pwd - )" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin; then - javaHome="$(dirname "$javaExecutable")" - javaExecutable="$(cd "$javaHome" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "$javaExecutable")" - fi - javaHome="$(dirname "$javaExecutable")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ]; then - if [ -n "$JAVA_HOME" ]; then +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then if [ -x "$JAVA_HOME/jre/sh/java" ]; then # IBM's JDK on AIX uses strange locations for the executables JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" else JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi fi else JAVACMD="$( - \unset -f command 2>/dev/null - \command -v java - )" - fi -fi - -if [ ! -x "$JAVACMD" ]; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : -if [ -z "$JAVA_HOME" ]; then - echo "Warning: JAVA_HOME environment variable is not set." >&2 -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ]; then - echo "Path not specified to find_maven_basedir" >&2 - return 1 + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi fi +} - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ]; do - if [ -d "$wdir"/.mvn ]; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$( - cd "$wdir/.." || exit 1 - pwd - ) - fi - # end of workaround +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" done - printf '%s' "$( - cd "$basedir" || exit 1 - pwd - )" + printf %x\\n $h } -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' <"$1" - fi +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 } -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' } -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1 +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" fi -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT else - log "Couldn't find $wrapperJarPath, downloading it ..." + die "cannot create temp dir" +fi - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" - fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in wrapperUrl) - wrapperUrl="$safeValue" - break - ;; - esac - done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" +mkdir -p -- "${MAVEN_HOME%/*}" - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" - if command -v wget >/dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl >/dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" fi -########################################################################################## -# End of extension -########################################################################################## -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in wrapperSha256Sum) - wrapperSha256Sum=$value - break - ;; - esac -done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum >/dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then - wrapperSha256Result=true +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true fi elif command -v shasum >/dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then - wrapperSha256Result=true + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true fi else echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 exit 1 fi fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] \ - && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] \ - && CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] \ - && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd index b694e6c..249bdf3 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -1,206 +1,149 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.0 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. >&2 -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. >&2 -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. >&2 -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. >&2 -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B -) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/src/main/java/preponderous/viron/controllers/LocationController.java b/src/main/java/preponderous/viron/controllers/LocationController.java index d035f88..c9de183 100644 --- a/src/main/java/preponderous/viron/controllers/LocationController.java +++ b/src/main/java/preponderous/viron/controllers/LocationController.java @@ -57,7 +57,7 @@ public LocationDto getLocationOfEntity(@PathVariable @Min(1) int entityId) { } @PutMapping("/{locationId}/entity/{entityId}") - public void addEntityToLocation(@PathVariable @Min(1) int entityId, @PathVariable @Min(1) int locationId) { + public void addEntityToLocation(@PathVariable("entityId") @Min(1) int entityId, @PathVariable("locationId") @Min(1) int locationId) { if (locationRepository.findById(locationId).isEmpty()) { throw new NotFoundException("Location not found with id: " + locationId); } @@ -68,7 +68,7 @@ public void addEntityToLocation(@PathVariable @Min(1) int entityId, @PathVariabl @DeleteMapping("/{locationId}/entity/{entityId}") @ResponseStatus(HttpStatus.NO_CONTENT) - public void removeEntityFromLocation(@PathVariable @Min(1) int entityId, @PathVariable @Min(1) int locationId) { + public void removeEntityFromLocation(@PathVariable("entityId") @Min(1) int entityId, @PathVariable("locationId") @Min(1) int locationId) { if (locationRepository.findById(locationId).isEmpty()) { throw new NotFoundException("Location not found with id: " + locationId); } diff --git a/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java b/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java index 16478e9..7fa4f5b 100644 --- a/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java +++ b/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java @@ -15,7 +15,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(NotFoundException.class) public ResponseEntity handleNotFoundException(NotFoundException ex) { - log.error("Resource not found: {}", ex.getMessage()); + log.warn("Resource not found: {}", ex.getMessage()); ErrorResponse error = new ErrorResponse(HttpStatus.NOT_FOUND.value(), ex.getMessage()); return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error); } @@ -68,8 +68,8 @@ public ResponseEntity handleValidationException(MethodArgumentNot @ExceptionHandler(HandlerMethodValidationException.class) public ResponseEntity handleHandlerMethodValidationException(HandlerMethodValidationException ex) { - log.error("Validation error: {}", ex.getMessage()); - ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), "Validation failed: " + ex.getMessage()); + log.error("Validation error during handler method validation", ex); + ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), "Validation failed"); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); } From 01de1b949036eaac0c17d42a23cafbeb26ab7708 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 13 Apr 2026 01:24:34 +0000 Subject: [PATCH 10/13] Address review: WARN for 400s, private final entityNamePool, empty grid checks, tests Agent-Logs-Url: https://github.com/Preponderous-Software/viron/sessions/c38d0021-36ad-4fc0-b9f9-4b904d0861d0 Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- .../viron/controllers/DebugController.java | 10 ++++--- .../exceptions/GlobalExceptionHandler.java | 2 +- .../controllers/DebugControllerTest.java | 26 +++++++++++++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/main/java/preponderous/viron/controllers/DebugController.java b/src/main/java/preponderous/viron/controllers/DebugController.java index 8f326f6..6a1a314 100644 --- a/src/main/java/preponderous/viron/controllers/DebugController.java +++ b/src/main/java/preponderous/viron/controllers/DebugController.java @@ -1,7 +1,5 @@ package preponderous.viron.controllers; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import jakarta.validation.constraints.NotBlank; @@ -36,7 +34,7 @@ public class DebugController { private final EntityMapper entityMapper; private final EnvironmentMapper environmentMapper; - List entityNamePool = new ArrayList<>(Arrays.asList("Tom", "Jerry", "Spike", "Tyke", "Nibbles", "Butch", "Tuffy", "Lightning", "Mammy", "Quacker", "Toodles", "Droopy", "Screwy", "Meathead", "George", "Dripple", "McWolf")); + private final List entityNamePool = List.of("Tom", "Jerry", "Spike", "Tyke", "Nibbles", "Butch", "Tuffy", "Lightning", "Mammy", "Quacker", "Toodles", "Droopy", "Screwy", "Meathead", "George", "Dripple", "McWolf"); public DebugController(EntityService entityService, EnvironmentService environmentService, GridService gridService, LocationService locationService, @@ -59,6 +57,9 @@ public EnvironmentDto createSampleData() { // create an environment with one 10x10 grid Environment environment = environmentService.createEnvironment("Sample Environment", 1, 10); List grids = gridService.getGridsInEnvironment(environment.getEnvironmentId()); + if (grids.isEmpty()) { + throw new InvalidRequestException("No grids found in environment: " + environment.getEnvironmentId()); + } Grid grid = grids.getFirst(); List locations = locationService.getLocationsInGrid(grid.getGridId()); @@ -102,6 +103,9 @@ public EntityDto createWorldAndPlaceEntity(@PathVariable @NotBlank String enviro // get grid info List grids = gridService.getGridsInEnvironment(environment.getEnvironmentId()); + if (grids.isEmpty()) { + throw new InvalidRequestException("No grids found in environment: " + environment.getEnvironmentId()); + } Grid grid = grids.get(0); log.info("Grid created: {} with size {}x{}", grid.getGridId(), grid.getRows(), grid.getColumns()); diff --git a/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java b/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java index 7fa4f5b..9977038 100644 --- a/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java +++ b/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java @@ -36,7 +36,7 @@ public ResponseEntity handleEnvironmentCreationException(Environm @ExceptionHandler(InvalidRequestException.class) public ResponseEntity handleInvalidRequestException(InvalidRequestException ex) { - log.error("Invalid request: {}", ex.getMessage()); + log.warn("Invalid request: {}", ex.getMessage()); ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), ex.getMessage()); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); } diff --git a/src/test/java/preponderous/viron/controllers/DebugControllerTest.java b/src/test/java/preponderous/viron/controllers/DebugControllerTest.java index fdbfdba..8b9c09a 100644 --- a/src/test/java/preponderous/viron/controllers/DebugControllerTest.java +++ b/src/test/java/preponderous/viron/controllers/DebugControllerTest.java @@ -97,6 +97,19 @@ void createSampleData_Success() throws Exception { verify(environmentMapper).toDto(environment); } + @Test + void createSampleData_NoGrids_Returns400() throws Exception { + Environment environment = new Environment(5, "NoGridEnv", "2024-05-01"); + + when(environmentService.createEnvironment("Sample Environment", 1, 10)).thenReturn(environment); + when(gridService.getGridsInEnvironment(5)).thenReturn(List.of()); + + mockMvc.perform(post("/api/v1/debug/create-sample-data")) + .andExpect(status().isBadRequest()) + .andExpect(jsonPath("$.status").value(400)) + .andExpect(jsonPath("$.message").value("No grids found in environment: 5")); + } + // --- POST /api/v1/debug/create-world-and-place-entity/{environmentName} --- @Test @@ -145,6 +158,19 @@ void createWorldAndPlaceEntity_ServiceException_Returns500() throws Exception { .andExpect(jsonPath("$.message").value("Entity creation failed")); } + @Test + void createWorldAndPlaceEntity_NoGrids_Returns400() throws Exception { + Environment environment = new Environment(6, "NoGridWorld", "2024-06-01"); + + when(environmentService.createEnvironment("NoGridWorld", 1, 5)).thenReturn(environment); + when(gridService.getGridsInEnvironment(6)).thenReturn(List.of()); + + mockMvc.perform(post("/api/v1/debug/create-world-and-place-entity/NoGridWorld")) + .andExpect(status().isBadRequest()) + .andExpect(jsonPath("$.status").value(400)) + .andExpect(jsonPath("$.message").value("No grids found in environment: 6")); + } + @Test void createWorldAndPlaceEntity_NoValidLocation_Returns400() throws Exception { Environment environment = new Environment(4, "EmptyWorld", "2024-04-01"); From de0f18747710e0e7135d1ddebb40ab67b27239d6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 13 Apr 2026 01:26:33 +0000 Subject: [PATCH 11/13] Use consistent getFirst() for grid list access in DebugController Agent-Logs-Url: https://github.com/Preponderous-Software/viron/sessions/c38d0021-36ad-4fc0-b9f9-4b904d0861d0 Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- .../java/preponderous/viron/controllers/DebugController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/preponderous/viron/controllers/DebugController.java b/src/main/java/preponderous/viron/controllers/DebugController.java index 6a1a314..1dd54ba 100644 --- a/src/main/java/preponderous/viron/controllers/DebugController.java +++ b/src/main/java/preponderous/viron/controllers/DebugController.java @@ -106,7 +106,7 @@ public EntityDto createWorldAndPlaceEntity(@PathVariable @NotBlank String enviro if (grids.isEmpty()) { throw new InvalidRequestException("No grids found in environment: " + environment.getEnvironmentId()); } - Grid grid = grids.get(0); + Grid grid = grids.getFirst(); log.info("Grid created: {} with size {}x{}", grid.getGridId(), grid.getRows(), grid.getColumns()); // create an entity From 57bb7e7b71eee07bc7e275b04e2c0be35ebabf92 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 13 Apr 2026 01:29:34 +0000 Subject: [PATCH 12/13] Add CI workflow for compilation and test checks Agent-Logs-Url: https://github.com/Preponderous-Software/viron/sessions/1535fdca-59f0-45d5-91fa-8fd7e4954198 Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- .github/workflows/ci.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..737e4a8 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,27 @@ +name: CI + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + cache: maven + + - name: Compile + run: mvn compile -B + + - name: Run tests + run: mvn test -B From 22af90667d848794eb5cf7d636d85f59c8f55bd7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 04:05:29 +0000 Subject: [PATCH 13/13] Log all 400 handlers at WARN, use ./mvnw in CI, fix location error message Agent-Logs-Url: https://github.com/Preponderous-Software/viron/sessions/7fbc4fa1-5d0b-482e-a2e1-0521306c1614 Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com> --- .github/workflows/ci.yml | 4 ++-- .../viron/controllers/LocationController.java | 2 +- .../viron/exceptions/GlobalExceptionHandler.java | 8 ++++---- .../viron/controllers/LocationControllerTest.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 737e4a8..b312ed4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: cache: maven - name: Compile - run: mvn compile -B + run: ./mvnw compile -B - name: Run tests - run: mvn test -B + run: ./mvnw test -B diff --git a/src/main/java/preponderous/viron/controllers/LocationController.java b/src/main/java/preponderous/viron/controllers/LocationController.java index c9de183..cbe90aa 100644 --- a/src/main/java/preponderous/viron/controllers/LocationController.java +++ b/src/main/java/preponderous/viron/controllers/LocationController.java @@ -81,7 +81,7 @@ public void removeEntityFromLocation(@PathVariable("entityId") @Min(1) int entit @ResponseStatus(HttpStatus.NO_CONTENT) public void removeEntityFromCurrentLocation(@PathVariable @Min(1) int entityId) { if (locationRepository.findByEntityId(entityId).isEmpty()) { - throw new NotFoundException("Entity not found with id: " + entityId); + throw new NotFoundException("Location not found for entity: " + entityId); } if (!locationRepository.removeEntityFromCurrentLocation(entityId)) { throw new ServiceException("Failed to remove entity " + entityId + " from current location"); diff --git a/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java b/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java index 9977038..1bd538f 100644 --- a/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java +++ b/src/main/java/preponderous/viron/exceptions/GlobalExceptionHandler.java @@ -22,14 +22,14 @@ public ResponseEntity handleNotFoundException(NotFoundException e @ExceptionHandler(EntityCreationException.class) public ResponseEntity handleEntityCreationException(EntityCreationException ex) { - log.error("Entity creation failed: {}", ex.getMessage()); + log.warn("Entity creation failed: {}", ex.getMessage()); ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), ex.getMessage()); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); } @ExceptionHandler(EnvironmentCreationException.class) public ResponseEntity handleEnvironmentCreationException(EnvironmentCreationException ex) { - log.error("Environment creation failed: {}", ex.getMessage()); + log.warn("Environment creation failed: {}", ex.getMessage()); ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), ex.getMessage()); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); } @@ -61,14 +61,14 @@ public ResponseEntity handleValidationException(MethodArgumentNot .map(error -> error.getField() + ": " + error.getDefaultMessage()) .reduce((a, b) -> a + "; " + b) .orElse("Validation failed"); - log.error("Validation error: {}", message); + log.warn("Validation error: {}", message); ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), message); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); } @ExceptionHandler(HandlerMethodValidationException.class) public ResponseEntity handleHandlerMethodValidationException(HandlerMethodValidationException ex) { - log.error("Validation error during handler method validation", ex); + log.warn("Validation error during handler method validation: {}", ex.getMessage()); ErrorResponse error = new ErrorResponse(HttpStatus.BAD_REQUEST.value(), "Validation failed"); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); } diff --git a/src/test/java/preponderous/viron/controllers/LocationControllerTest.java b/src/test/java/preponderous/viron/controllers/LocationControllerTest.java index e3a4ef2..eaf5d0f 100644 --- a/src/test/java/preponderous/viron/controllers/LocationControllerTest.java +++ b/src/test/java/preponderous/viron/controllers/LocationControllerTest.java @@ -327,7 +327,7 @@ void removeEntityFromCurrentLocation_NotFound() throws Exception { mockMvc.perform(delete("/api/v1/locations/entity/999")) .andExpect(status().isNotFound()) .andExpect(jsonPath("$.status").value(404)) - .andExpect(jsonPath("$.message").value("Entity not found with id: 999")); + .andExpect(jsonPath("$.message").value("Location not found for entity: 999")); } @Test