Skip to content
Snippets Groups Projects
Commit c751ae6b authored by fz2907's avatar fz2907
Browse files

Merge branch 'frontend_backend_connection' into 'sprint_1'

Updated the example controller model class

See merge request !4
parents feff9ccf 3281aa13
No related branches found
No related tags found
3 merge requests!27Sprint 1 done,!7Changed DB port from 3306 to 3307. So it will not interrupt with your own local MySQL,!4Updated the example controller model class
...@@ -32,7 +32,7 @@ public class ExampleController { ...@@ -32,7 +32,7 @@ public class ExampleController {
public ResponseModel getExample() { public ResponseModel getExample() {
logger.info("You reached the getExample() function."); logger.info("You reached the getExample() function.");
return ResponseModel.generateResponse( return new ResponseModel(
"This this a example String response", "This this a example String response",
HttpStatus.OK, HttpStatus.OK,
"Some Json Object Later"); "Some Json Object Later");
...@@ -45,7 +45,7 @@ public class ExampleController { ...@@ -45,7 +45,7 @@ public class ExampleController {
*/ */
@GetMapping("/{userId}") @GetMapping("/{userId}")
public ResponseModel getExampleWithInput(@PathVariable long userId){ public ResponseModel getExampleWithInput(@PathVariable long userId){
return ResponseModel.generateResponse( return new ResponseModel(
"This this a example String response", "This this a example String response",
HttpStatus.OK, HttpStatus.OK,
"You GET this function with id = "+ userId); "You GET this function with id = "+ userId);
...@@ -58,7 +58,7 @@ public class ExampleController { ...@@ -58,7 +58,7 @@ public class ExampleController {
*/ */
@GetMapping("/detail/{userId}") @GetMapping("/detail/{userId}")
public ResponseModel getExampleDetailWithInput(@PathVariable long userId){ public ResponseModel getExampleDetailWithInput(@PathVariable long userId){
return ResponseModel.generateResponse( return new ResponseModel(
"This this a example String response", "This this a example String response",
HttpStatus.OK, HttpStatus.OK,
"You GET this function with detail id: "+ userId); "You GET this function with detail id: "+ userId);
...@@ -71,7 +71,7 @@ public class ExampleController { ...@@ -71,7 +71,7 @@ public class ExampleController {
@RequestMapping("/getUser") @RequestMapping("/getUser")
public ResponseModel getExampleUser(){ public ResponseModel getExampleUser(){
ExampleModel user = new ExampleModel(233, "example-user"); ExampleModel user = new ExampleModel(233, "example-user");
return ResponseModel.generateResponse( return new ResponseModel(
"There is your example user info", "There is your example user info",
HttpStatus.OK, HttpStatus.OK,
user); user);
...@@ -85,7 +85,7 @@ public class ExampleController { ...@@ -85,7 +85,7 @@ public class ExampleController {
@PostMapping("/newUser") @PostMapping("/newUser")
public ResponseModel handlePost(@RequestBody ExampleModel newUser){ public ResponseModel handlePost(@RequestBody ExampleModel newUser){
logger.info("You reached the handlePost() function."); logger.info("You reached the handlePost() function.");
return ResponseModel.generateResponse( return new ResponseModel(
"I received your new user data, check it in data section", "I received your new user data, check it in data section",
HttpStatus.OK, HttpStatus.OK,
newUser); newUser);
...@@ -99,7 +99,7 @@ public class ExampleController { ...@@ -99,7 +99,7 @@ public class ExampleController {
@DeleteMapping("/logout/{userId}") @DeleteMapping("/logout/{userId}")
public ResponseModel logout(@PathVariable long userId){ public ResponseModel logout(@PathVariable long userId){
logger.warn("You reached the logout() function."); logger.warn("You reached the logout() function.");
return ResponseModel.generateResponse( return new ResponseModel(
"I received your logout request", "I received your logout request",
HttpStatus.OK, HttpStatus.OK,
null); null);
......
...@@ -11,14 +11,6 @@ public class ResponseModel { ...@@ -11,14 +11,6 @@ public class ResponseModel {
String message; String message;
HttpStatus status; HttpStatus status;
Object data; Object data;
public static ResponseModel generateResponse(String message, HttpStatus status, Object data) {
ResponseModel responseModel = new ResponseModel();
//Map<String, Object> map = new HashMap<>();
responseModel.message = message;
responseModel.status = status;
responseModel.data = data;
return responseModel;
}
public ResponseModel(){ public ResponseModel(){
message = ""; message = "";
...@@ -26,6 +18,12 @@ public class ResponseModel { ...@@ -26,6 +18,12 @@ public class ResponseModel {
data = null; data = null;
} }
public ResponseModel(String message, HttpStatus status, Object data){
this.message = message;
this.status = status;
this.data = data;
}
public void setMessage(String message){ public void setMessage(String message){
this.message = message; this.message = message;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment