Resolved conflicts

src/main/java/com/sba6/srm/controller/RequestController.java

@@ -19,6 +19,7 @@
 import com.sba6.srm.entity.Comment;
 import com.sba6.srm.entity.Employee;
 import com.sba6.srm.entity.Request;
+
 import com.sba6.srm.enumsconstants.RequestStatus;
 import com.sba6.srm.service.CommentService;
 import com.sba6.srm.service.EmailService;
@@ -86,6 +87,7 @@ public ResponseEntity createRequest(@RequestBody Request newRequest) {
 	public Employee getEmployee(@PathVariable Long empId) {
 		return employeeService.getEmployee(empId);
 	}
+
 
 	/*@RequestMapping(value = "/user")
 	   public Principal user(Principal principal) {
@@ -94,16 +96,17 @@ public Principal user(Principal principal) {
 
 	//6. Add request comment POST/api/request/comment
 	@ApiOperation(value = "Add request comment")
-	@RequestMapping(value="/api/request/comment", method = RequestMethod.POST)
+	@PostMapping(value="/api/request/comment")
 	public ResponseEntity addComment(@RequestBody Comment newComment){
 		commentService.addComment(newComment);
 		return new ResponseEntity(HttpStatus.OK);
 	}
 
 	//7. Get comments for request GET/api/request/comment/{requestId}
 	@ApiOperation(value = "Get comments for request")
-	@RequestMapping(value="/api/request/comment/{requestId}", method = RequestMethod.GET)
+	@GetMapping(value="/api/request/comment/{requestId}")
 	public List<Comment> getCommentsForRequest(@PathVariable Long requestId){
 		return commentService.getCommentsForRequest(requestId);
 	}
+
 }

src/main/resources/application.properties

@@ -15,8 +15,8 @@ spring.datasource.hikari.connection-test-query=SELECT 1
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
 #To execute data.sql
 #spring.datasource.initialization-mode=always 
-spring.datasource.username=root
-spring.datasource.password=We1c0me2GgK
+spring.datasource.username=
+spring.datasource.password=
 
 
 # SQL logging
@@ -36,8 +36,8 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 
 #Google Login
-security.oauth2.client.clientId = 698682231712-gbno37u3fdovq1rjrhurj4o6bo00okg9.apps.googleusercontent.com
-security.oauth2.client.clientSecret = IImw1dZ0P1tm2tq82QeXPW19
+security.oauth2.client.clientId = 
+security.oauth2.client.clientSecret = 
 security.oauth2.client.accessTokenUri  =  https://www.googleapis.com/oauth2/v3/token
 security.oauth2.client.userAuthorizationUri  =  https://accounts.google.com/o/oauth2/auth
 security.oauth2.client.tokenName = oauth_token