project update

- update to spring-boot 2.6.0;
- update to springdoc-openapi 1.5.12;
- update to maven 3.8.3;
- update to mysql docker image 8.0.27;
- update npm dependencies;
- remove empty lines at the end of some classes;
- remove start_period in docker-compose.yml;
- rename images folder to documentation;
- update README.

Author: Ivan Franchin

README.md

@@ -38,8 +38,8 @@ The goal of this project is to implement an application called `order-app` to ma
 
 ## Prerequisites
 
-- [`npm`](https://www.npmjs.com/get-npm)
-- [`Java 11+`](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html)
+- [`npm`](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
+- [`Java 11+`](https://www.oracle.com/java/technologies/downloads/#java11)
 - [`Docker`](https://www.docker.com/)
 - [`Docker-Compose`](https://docs.docker.com/compose/install/)
 - [`jq`](https://stedolan.github.io/jq)
@@ -51,7 +51,7 @@ The goal of this project is to implement an application called `order-app` to ma
   docker-compose up -d
   ```
 
-- Wait for `mysql` container to be with status `running (healthy)`. To check it, run
+- Wait for `mysql` Docker container to be up and running. To check it, run
   ```
   docker-compose ps
   ```
@@ -94,11 +94,11 @@ The goal of this project is to implement an application called `order-app` to ma
 
 - The gif below shows a `user` loging in
 
-  ![user-login](images/user-login.gif)
+  ![user-login](documentation/user-login.gif)
 
 - The gif below shows an `admin` loging in
 
-  ![admin-login](images/admin-login.gif)
+  ![admin-login](documentation/admin-login.gif)
 
 ## Testing order-api Endpoints
 

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.8'
 services:
 
   mysql:
-    image: mysql:8.0.26
+    image: mysql:8.0.27
     container_name: mysql
     ports:
       - "3306:3306"
@@ -12,5 +12,3 @@ services:
       - MYSQL_DATABASE=orderdb
     healthcheck:
       test: "mysqladmin ping -u root -p$${MYSQL_ROOT_PASSWORD}"
-      start_period: 30s
-

images/admin-login.gif renamed to documentation/admin-login.gif

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

images/user-login.gif renamed to documentation/user-login.gif

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.6.0</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
 
@@ -19,7 +19,7 @@
         <jjwt.version>0.11.2</jjwt.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
-        <springdoc-openapi.version>1.5.10</springdoc-openapi.version>
+        <springdoc-openapi.version>1.5.12</springdoc-openapi.version>
     </properties>
 
     <dependencies>

order-api/.mvn/wrapper/maven-wrapper.properties

@@ -9,5 +9,4 @@ public class OrderApiApplication {
     public static void main(String[] args) {
         SpringApplication.run(OrderApiApplication.class, args);
     }
-
 }

order-api/pom.xml

@@ -24,5 +24,4 @@ CorsFilter corsFilter(@Value("${app.cors.allowed-origins}") List<String> allowed
         source.registerCorsConfiguration("/**", config);
         return new CorsFilter(source);
     }
-
 }

order-api/src/main/java/com/mycompany/orderapi/OrderApiApplication.java

@@ -24,5 +24,4 @@ public OpenAPI customOpenAPI() {
     }
 
     public static final String BEARER_KEY_SECURITY_SCHEME = "bearer-key";
-
 }

order-api/src/main/java/com/mycompany/orderapi/config/CorsConfig.java

@@ -16,5 +16,4 @@ public interface OrderMapper {
 
   @Mapping(target = "createdAt", dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
   OrderDto toOrderDto(Order order);
-
 }

order-api/src/main/java/com/mycompany/orderapi/config/SwaggerConfig.java

@@ -11,5 +11,4 @@
 public interface UserMapper {
 
   UserDto toUserDto(User user);
-
 }

order-api/src/main/java/com/mycompany/orderapi/mapper/OrderMapper.java

@@ -38,5 +38,4 @@ public Order(String id, String description, User user) {
     public void onPrePersist() {
         createdAt = ZonedDateTime.now();
     }
-
 }

order-api/src/main/java/com/mycompany/orderapi/mapper/UserMapper.java

@@ -4,11 +4,12 @@
 
 import com.mycompany.orderapi.model.Order;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface OrderRepository extends JpaRepository<Order, String> {
 
   List<Order> findAllByOrderByCreatedAtDesc();
 
   List<Order> findByIdContainingOrDescriptionContainingOrderByCreatedAt(String id, String description);
-
 }

order-api/src/main/java/com/mycompany/orderapi/model/Order.java

@@ -2,15 +2,16 @@
 
 import com.mycompany.orderapi.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
 
+@Repository
 public interface UserRepository extends JpaRepository<User, Long> {
 
     Optional<User> findByUsername(String username);
 
     boolean existsByUsername(String username);
 
     boolean existsByEmail(String email);
-
 }

order-api/src/main/java/com/mycompany/orderapi/repository/OrderRepository.java

@@ -68,5 +68,4 @@ private User mapSignUpRequestToUser(SignUpRequest signUpRequest) {
         user.setRole(WebSecurityConfig.USER);
         return user;
     }
-
 }

order-api/src/main/java/com/mycompany/orderapi/repository/UserRepository.java

@@ -67,5 +67,4 @@ public OrderDto deleteOrders(@PathVariable UUID id) {
         orderService.deleteOrder(order);
         return orderMapper.toOrderDto(order);
     }
-
 }

order-api/src/main/java/com/mycompany/orderapi/rest/AuthController.java

@@ -24,5 +24,4 @@ public Integer getNumberOfUsers() {
     public Integer getNumberOfOrders() {
         return orderService.getOrders().size();
     }
-
 }

order-api/src/main/java/com/mycompany/orderapi/rest/OrderController.java

@@ -55,5 +55,4 @@ public UserDto deleteUser(@PathVariable String username) {
         userService.deleteUser(user);
         return userMapper.toUserDto(user);
     }
-
 }

order-api/src/main/java/com/mycompany/orderapi/rest/PublicController.java

@@ -8,5 +8,4 @@
 public class AuthResponse {
 
     private String accessToken;
-
 }

order-api/src/main/java/com/mycompany/orderapi/rest/UserController.java

@@ -12,5 +12,4 @@ public class CreateOrderRequest {
     @Schema(example = "Buy two iPhones")
     @NotBlank
     private String description;
-
 }

order-api/src/main/java/com/mycompany/orderapi/rest/dto/AuthResponse.java

@@ -15,5 +15,4 @@ public class LoginRequest {
     @Schema(example = "user")
     @NotBlank
     private String password;
-
 }

order-api/src/main/java/com/mycompany/orderapi/rest/dto/CreateOrderRequest.java

@@ -16,5 +16,4 @@ public class OrderDto {
   public static final class UserDto {
     private String username;
   }
-
 }

order-api/src/main/java/com/mycompany/orderapi/rest/dto/LoginRequest.java

@@ -24,5 +24,4 @@ public class SignUpRequest {
     @Schema(example = "user3@mycompany.com")
     @Email
     private String email;
-
 }

order-api/src/main/java/com/mycompany/orderapi/rest/dto/OrderDto.java

@@ -21,5 +21,4 @@ public static final class OrderDto {
     private String description;
     private ZonedDateTime createdAt;
   }
-
 }

order-api/src/main/java/com/mycompany/orderapi/rest/dto/SignUpRequest.java

@@ -38,5 +38,4 @@ public void run(String... args) {
             new User("admin", "admin", "Admin", "admin@mycompany.com", WebSecurityConfig.ADMIN),
             new User("user", "user", "User", "user@mycompany.com", WebSecurityConfig.USER)
     );
-
 }

order-api/src/main/java/com/mycompany/orderapi/rest/dto/UserDto.java

@@ -54,5 +54,4 @@ private Optional<String> getJwtFromRequest(HttpServletRequest request) {
 
     public static final String TOKEN_HEADER = "Authorization";
     public static final String TOKEN_PREFIX = "Bearer ";
-
 }

order-api/src/main/java/com/mycompany/orderapi/runner/DatabaseInitializer.java

@@ -85,5 +85,4 @@ public Optional<Jws<Claims>> validateTokenAndGetJws(String token) {
     public static final String TOKEN_TYPE = "JWT";
     public static final String TOKEN_ISSUER = "order-api";
     public static final String TOKEN_AUDIENCE = "order-app";
-
 }

order-api/src/main/java/com/mycompany/orderapi/security/TokenAuthenticationFilter.java

@@ -36,5 +36,4 @@ private CustomUserDetails mapUserToCustomUserDetails(User user, List<SimpleGrant
         customUserDetails.setAuthorities(authorities);
         return customUserDetails;
     }
-
 }

order-api/src/main/java/com/mycompany/orderapi/security/TokenProvider.java

@@ -59,5 +59,4 @@ public PasswordEncoder passwordEncoder() {
 
     public static final String ADMIN = "ADMIN";
     public static final String USER = "USER";
-
 }

order-api/src/main/java/com/mycompany/orderapi/security/UserDetailsServiceImpl.java

@@ -15,5 +15,4 @@ public interface OrderService {
     Order saveOrder(Order order);
 
     void deleteOrder(Order order);
-
 }

order-api/src/main/java/com/mycompany/orderapi/security/WebSecurityConfig.java

@@ -39,5 +39,4 @@ public Order saveOrder(Order order) {
     public void deleteOrder(Order order) {
         orderRepository.delete(order);
     }
-
 }

order-api/src/main/java/com/mycompany/orderapi/service/OrderService.java

@@ -20,5 +20,4 @@ public interface UserService {
     User saveUser(User user);
 
     void deleteUser(User user);
-
 }

order-api/src/main/java/com/mycompany/orderapi/service/OrderServiceImpl.java

@@ -50,5 +50,4 @@ public User saveUser(User user) {
     public void deleteUser(User user) {
         userRepository.delete(user);
     }
-
 }

order-api/src/main/java/com/mycompany/orderapi/service/UserService.java

@@ -11,5 +11,4 @@ class OrderApiApplicationTests {
     @Test
     void contextLoads() {
     }
-
 }

order-api/src/main/java/com/mycompany/orderapi/service/UserServiceImpl.java

@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.1.1",
-    "@testing-library/user-event": "^13.2.1",
-    "axios": "^0.22.0",
+    "@testing-library/jest-dom": "^5.15.1",
+    "@testing-library/react": "^12.1.2",
+    "@testing-library/user-event": "^13.5.0",
+    "axios": "^0.24.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "^5.3.0",