Skip to content
Snippets Groups Projects

Merge 'develop' into 'master'.

Merged BEAUVAIS ANTOINE requested to merge develop into master
Compare and
11 files
+ 201
12
Preferences
Compare changes
Files
11
@@ -24,14 +24,14 @@ import org.springframework.web.bind.annotation.RestController;
* @author BEAUVAIS ANTOINE
*/
@RestController
public class ApiRetrieveInfoController implements IRetrieveInfoController {
public class ApiRetrieveItemsController implements IRetrieveInfoController {
/**
* Returns all products as a JSON response.
* @param cat an optional category.
* @return a JSON response.
* @throws fr.unistra.sil.erp.back.controller.api.ApiServerErrorException
* @throws fr.unistra.sil.erp.back.controller.api.ApiBadRequestException
* @throws ApiServerErrorException if the request could not be served.
* @throws ApiBadRequestException if the category parameter is invalid.
*/
@GetMapping(MAPPING_RETRIEVEALL)
public ResponseEntity<Object> retrieveInfo(
@@ -42,7 +42,7 @@ public class ApiRetrieveInfoController implements IRetrieveInfoController {
try {
db = DatabaseSystem.getInstance();
} catch (DatabaseConnectionException ex) {
Logger.getLogger(ApiRetrieveInfoController.class.getName()).log(
Logger.getLogger(ApiRetrieveItemsController.class.getName()).log(
Level.SEVERE, "Could not connect to database.", ex);
throw new ApiServerErrorException("Database failure.");
}