Skip to content
Snippets Groups Projects

Merge 'develop' into 'master'.

Merged BEAUVAIS ANTOINE requested to merge develop into master
Viewing commit 3f921dcc
Next
Show latest version
2 files
+ 3
3
Preferences
Compare changes
Files
2
@@ -24,7 +24,7 @@ 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.
@@ -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.");
}