Merge branch 'refactoring' into 'master'

Refactoring

See merge request !1

src/main/java/com/school/project/controller/CourseController.java

@@ -18,12 +18,12 @@ import java.util.NoSuchElementException;
 import java.util.Optional;
 
 @Controller
-@RequestMapping()
+@RequestMapping("/course")
 public class CourseController {
     @Autowired(required = true)
     public CourseServiceImp courseServiceImpl;
 
-    @PostMapping("/courses")
+    @PostMapping("/save")
     public ResponseEntity<CourseDTO> saveCourse(@RequestBody CourseDTO courseDTO) {
 
         try {
@@ -35,7 +35,7 @@ public class CourseController {
         }
     }
 
-    @GetMapping("/courses")
+    @GetMapping("/findAll")
     public ResponseEntity<List<CourseDTO>> readAllCourses() {
         List<CourseDTO> course = courseServiceImpl.readAllCourse();
 
@@ -46,7 +46,7 @@ public class CourseController {
         }
     }
 
-    @GetMapping("/courses/{id}")
+    @GetMapping("/find/{id}")
     public ResponseEntity<CourseDTO> readCourseById(@PathVariable(name = "id") Long id) {
 
         try {
@@ -58,7 +58,7 @@ public class CourseController {
 
     }
 
-    @PutMapping("/courses/{id}")
+    @PutMapping("/update/{id}")
     public ResponseEntity<CourseDTO> updateCourseById(@RequestBody CourseDTO courseDTO, @PathVariable(name = "id") Long id) {
         try {
             CourseDTO updateCourse = courseServiceImpl.updateCourseById(courseDTO, id);
@@ -70,7 +70,7 @@ public class CourseController {
 
     }
 
-    @DeleteMapping("/courses/{id}")
+    @DeleteMapping("/delete/{id}")
     public ResponseEntity deleteCourseById(@PathVariable(name = "id") Long id) {
 
         try {

src/main/java/com/school/project/controller/DepartmentController.java

@@ -15,11 +15,12 @@ import java.util.NoSuchElementException;
 import java.util.Optional;
 
 @RestController
+@RequestMapping("/department")
 public class DepartmentController {
     @Autowired(required = true)
     public DepartmentServiceImp departmentServiceImp;
 
-    @GetMapping("departments")
+    @GetMapping("/findAll")
     public ResponseEntity<List<DepartmentDTO>> readAllDepartments() {
         List<DepartmentDTO> departmentDTO = departmentServiceImp.readDepartment();
 
@@ -30,7 +31,7 @@ public class DepartmentController {
         }
     }
 
-    @GetMapping("departmentId/{id}")
+    @GetMapping("/find/{id}")
     public ResponseEntity<DepartmentDTO> readDepartmentById(@PathVariable("id") Long id) {
         try {
             DepartmentDTO departmentDTO = departmentServiceImp.readDepartmentById(id);
@@ -44,7 +45,7 @@ public class DepartmentController {
 
     }
 
-    @GetMapping("departmentName/{name}")
+    @GetMapping("/find/{name}")
     public ResponseEntity<DepartmentDTO> findDepartmentByName(@PathVariable("name") String name) {
         DepartmentDTO departmentDTO = departmentServiceImp.findDepartmentByName(name);
 
@@ -55,7 +56,7 @@ public class DepartmentController {
         }
     }
 
-    @PostMapping("departments")
+    @PostMapping("/save")
     public ResponseEntity<DepartmentDTO> saveDepartment(@RequestBody DepartmentDTO department) {
 
         try {
@@ -71,7 +72,7 @@ public class DepartmentController {
 
     }
 
-    @PutMapping("departments/{id}")
+    @PutMapping("/update/{id}")
     public ResponseEntity<DepartmentDTO> updateDepartmentById(@RequestBody DepartmentDTO department, @PathVariable("id") Long id) {
         try {
             DepartmentDTO updateDepartment = departmentServiceImp.updateDepartment(department, id);
@@ -81,7 +82,7 @@ public class DepartmentController {
         }
     }
 
-    @DeleteMapping("departments/{id}")
+    @DeleteMapping("/delete/{id}")
     public ResponseEntity<Object> deleteDepartmentById(@PathVariable("id") Long id) {
         try {
             departmentServiceImp.deleteDepartmentById(id);

src/main/java/com/school/project/controller/HomeController.java

-package com.school.project.controller;
-
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class HomeController {
-
-    @GetMapping("/home")
-    public String getHomePage() {
-        return "hello";
-    }
-
-    @GetMapping("/welcome")
-    public String getWelcomePage() {
-        return "welcomPage";
-    }
-
-    @GetMapping("/accessDenied")
-    public String getAccessDeniedPage() {
-        return "accessDeniedPage";
-    }
-}

src/main/java/com/school/project/controller/StudentController.java

@@ -16,11 +16,12 @@ import java.util.NoSuchElementException;
 import java.util.Optional;
 
 @RestController
+@RequestMapping("/student")
 public class StudentController {
     @Autowired(required = true)
     public StudentServiceImp studentServiceImp;
 
-    @PostMapping("/students")
+    @PostMapping("/save")
     public ResponseEntity<StudentDTO> saveStudent(@RequestBody StudentDTO studentDTO) {
 
         StudentDTO student = studentServiceImp.saveStudent(studentDTO);
@@ -32,7 +33,7 @@ public class StudentController {
         }
     }
 
-    @GetMapping("/students")
+    @GetMapping("/findAll")
     public ResponseEntity<List<StudentDTO>> readAllStudents() {
         List<StudentDTO> studentsDTO = studentServiceImp.readAllStudents();
 
@@ -43,7 +44,7 @@ public class StudentController {
         }
     }
 
-    @GetMapping("students/{id}")
+    @GetMapping("/find/{id}")
     public ResponseEntity<StudentDTO> readStudentById(@PathVariable("id") Long id) {
 
         try {
@@ -55,7 +56,7 @@ public class StudentController {
 
     }
 
-    @PutMapping("students/{id}")
+    @PutMapping("/update/{id}")
     public ResponseEntity<StudentDTO> updateStudentById(@RequestBody StudentDTO studentDTO, @PathVariable("id") Long id) {
         try {
             StudentDTO updateStudent = studentServiceImp.updateStudentById(studentDTO, id);
@@ -66,7 +67,7 @@ public class StudentController {
 
     }
 
-    @DeleteMapping("students/{id}")
+    @DeleteMapping("/delete/{id}")
     public ResponseEntity deleteStudentById(@PathVariable("id") Long id) {
         try {
             studentServiceImp.deleteStudentById(id);

src/main/java/com/school/project/controller/TeacherController.java

@@ -19,12 +19,13 @@ import java.util.Optional;
 
 @RestController
 @ComponentScan(basePackages = "com.school.project.service.interfaces.TeacherService")
+@RequestMapping("/teacher")
 public class TeacherController {
 
     @Autowired(required = true)
     public TeacherServiceImp teacherServiceImp;
 
-    @PostMapping("/saveTeachers")
+    @PostMapping("/save")
     public ResponseEntity<TeacherDTO> saveTeacher(@RequestBody TeacherDTO teacherDTO) {
         TeacherDTO dto = teacherServiceImp.saveTeacher(teacherDTO);
 
@@ -35,7 +36,7 @@ public class TeacherController {
         }
     }
 
-    @GetMapping("/teachers")
+    @GetMapping("/findAll")
     public ResponseEntity<List<TeacherDTO>> readAllTeachers() {
         List<TeacherDTO> teacherDTOS = teacherServiceImp.readAllTeachers();
 
@@ -46,7 +47,7 @@ public class TeacherController {
         }
     }
 
-    @GetMapping("teachers/{id}")
+    @GetMapping("/find/{id}")
     public ResponseEntity<TeacherDTO> readTeacherById(@PathVariable("id") Long id) {
 
         try {
@@ -58,7 +59,7 @@ public class TeacherController {
 
     }
 
-    @PutMapping("teachers/{id}")
+    @PutMapping("/update/{id}")
     public ResponseEntity<TeacherDTO> updateTeacherById(@RequestBody TeacherDTO teacherDTO, @PathVariable("id") Long id) {
         try {
             TeacherDTO updateTeacher = teacherServiceImp.updateTeacher(teacherDTO, id);
@@ -68,7 +69,7 @@ public class TeacherController {
         }
     }
 
-    @DeleteMapping("teachers/{id}")
+    @DeleteMapping("/delete/{id}")
     public ResponseEntity deleteTeacherById(@PathVariable("id") Long id) {
         try {
             teacherServiceImp.deleteTeacherById(id);

src/main/java/com/school/project/controller/UserController.java

@@ -7,9 +7,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
-@Controller
+@RestController
+@RequestMapping("/user")
 public class UserController {
 
     @Autowired(required = true)
@@ -18,7 +21,7 @@ public class UserController {
     @Autowired(required = true)
     UserMapper userMapper;
 
-    @PostMapping("/saveuser")
+    @PostMapping("/save")
     public String saveUser(@ModelAttribute UserDTO userDTO) {
 
         Integer id = userService.saveUser(userMapper.userDtoToUser(userDTO));

src/main/java/com/school/project/security/OAuth2ServerConfiguration.java

@@ -48,9 +48,8 @@ public class OAuth2ServerConfiguration {
                     .disable()
                     .and()
                     .authorizeRequests()
-                    .antMatchers("/department").fullyAuthenticated()
-                    .antMatchers("/saveuser").permitAll()
-                    .antMatchers("/home").authenticated();
+                    .antMatchers("/user/**").permitAll()
+                    .antMatchers("/course/**","/department/**","/student/**","/teacher/**").authenticated();
         }
     }
 

src/main/java/com/school/project/security/SecurityConfig.java

@@ -31,7 +31,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
         http
                 .requestMatcher(new BasicRequestMatcher())
                 .authorizeRequests()
-                .antMatchers("/saveuser").permitAll()
                 .antMatchers("/oauth/token").authenticated()
                 .and()
                 .httpBasic()

src/main/resources/application.properties

-#
-#spring.jpa.hibernate.ddl-auto=update
-#spring.datasource.url=jdbc:mysql://localhost:3306/schoolDataBase
-#spring.datasource.username=root
-#spring.datasource.password=charlie123
 
 spring.jpa.hibernate.ddl-auto=update
-spring.datasource.url=jdbc:mysql://localhost:3306/schooldataBase
+spring.datasource.url=jdbc:mysql://localhost:3306/schoolDataBase
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=charlie123
+
+#spring.jpa.hibernate.ddl-auto=update
+#spring.datasource.url=jdbc:mysql://localhost:3306/schooldataBase
+#spring.datasource.username=root
+#spring.datasource.password=root
 
 spring.security.user.name= sulemantalpur6@gmail.com
 spring.security.user.password=charlie

src/main/resources/templates/accessDeniedPage.html

-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-  <meta charset="ISO-8859-1">
-  <title>Insert title here</title>
-</head>
-<body>
-<h3>You are not allowed to access this page. Please go to Welcome Page</h3>
-<a th:href="@{/welcome}" >Welcome</a>
-<a th:href="@{/logout}" >LOGOUT</a>
-</body>
-</html>
\ No newline at end of file

src/main/resources/templates/homePage.html

-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-  <meta charset="ISO-8859-1">
-  <title>Insert title here</title>
-</head>
-<body>
-<h3> welcome to the Home Page </h3>
-This page is accessible to ALL.
-</body>
-</html>
\ No newline at end of file

src/main/resources/templates/welcomPage.html

-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-  <meta charset="ISO-8859-1">
-  <title>Insert title here</title>
-</head>
-<body>
-<h3> Welcome Page after successful Login</h3>
-<a th:href="@{/logout}" >LOGOUT</a>
-</body>
-</html>
\ No newline at end of file