Skip to content

Commit 3dc6013

Browse files
authored
Upgrade Spring Version to 3.5.6
#35 Upgrade Spring Version to 3.5.6
2 parents 6d98a3e + a859836 commit 3dc6013

11 files changed

Lines changed: 42 additions & 61 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*Spring Boot Boilerplate* is a **starter kit**. This project is a very simple and useful.
33

44
## Technologies
5-
- Spring Boot (v3.5.5)
5+
- Spring Boot (v3.5.6)
66
- Spring Data JPA
77
- Spring Validation
88
- Spring Security + JWT Token

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616

1717
app:
1818
container_name: app
19-
image: omerfarukgenc34/spring-boot-boilerplate:3.5.5
19+
image: omerfarukgenc34/spring-boot-boilerplate:3.5.6
2020
ports:
2121
- "8080:8080"
2222
environment:

pom.xml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.5.5</version>
9+
<version>3.5.6</version>
1010
</parent>
1111

1212
<groupId>com.farukgenc</groupId>
1313
<artifactId>springboot-boilerplate</artifactId>
14-
<version>3.5.5</version>
14+
<version>3.5.6</version>
1515

1616
<name>spring-boot-boilerplate</name>
1717
<description>
1818
Spring Boot Boilerplate is a starter kit.
19-
This project includes : Spring Boot(3.5.5), Spring Data JPA, Spring Validation, Spring Security + JWT Token, PostgreSQL, Mapstruct, Lombok, Swagger (Open API)
19+
This project includes : Spring Boot(3.5.6), Spring Data JPA, Spring Validation, Spring Security + JWT Token, PostgreSQL, Mapstruct, Lombok,
20+
Swagger (Open API)
2021
</description>
2122

2223
<developers>
@@ -30,11 +31,11 @@
3031
<properties>
3132

3233
<java.version>21</java.version>
33-
<jwt.version>4.5.0</jwt.version>
34-
35-
<openapi-swagger.version>2.8.12</openapi-swagger.version>
3634

35+
<jwt.version>4.5.0</jwt.version>
3736
<mapstruct.version>1.6.3</mapstruct.version>
37+
<commons-lang3.version>3.18.0</commons-lang3.version>
38+
<openapi-swagger.version>2.8.13</openapi-swagger.version>
3839
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
3940

4041
</properties>
@@ -102,10 +103,22 @@
102103
<version>${lombok-mapstruct-binding.version}</version>
103104
</dependency>
104105

106+
<dependency>
107+
<groupId>org.apache.commons</groupId>
108+
<artifactId>commons-lang3</artifactId>
109+
<version>${commons-lang3.version}</version>
110+
</dependency>
111+
105112
<dependency>
106113
<groupId>org.springdoc</groupId>
107114
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
108115
<version>${openapi-swagger.version}</version>
116+
<exclusions>
117+
<exclusion>
118+
<groupId>org.apache.commons</groupId>
119+
<artifactId>commons-lang3</artifactId>
120+
</exclusion>
121+
</exclusions>
109122
</dependency>
110123

111124
<dependency>

src/main/java/com/farukgenc/boilerplate/springboot/configuration/SecurityConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import org.springframework.context.annotation.Bean;
77
import org.springframework.context.annotation.Configuration;
88
import org.springframework.security.authentication.AuthenticationManager;
9-
import org.springframework.security.config.Customizer;
109
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
1110
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
12-
import org.springframework.security.config.annotation.web.configurers.*;
11+
import org.springframework.security.config.annotation.web.configurers.CorsConfigurer;
12+
import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
1313
import org.springframework.security.config.http.SessionCreationPolicy;
1414
import org.springframework.security.web.SecurityFilterChain;
1515
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;

src/main/java/com/farukgenc/boilerplate/springboot/exceptions/ValidationAdvice.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import java.time.LocalDateTime;
1313
import java.util.List;
14-
import java.util.stream.Collectors;
1514

1615
/**
1716
* Created on Ağustos, 2020
@@ -26,7 +25,7 @@ public class ValidationAdvice {
2625
public final ResponseEntity<ValidationErrorResponse> handleMethodArgumentNotValidException(MethodArgumentNotValidException exception) {
2726

2827
final List<FieldError> fieldErrors = exception.getBindingResult().getFieldErrors();
29-
final List<String> errorList = fieldErrors.stream().map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.toList());
28+
final List<String> errorList = fieldErrors.stream().map(DefaultMessageSourceResolvable::getDefaultMessage).toList();
3029

3130
final ValidationErrorResponse validationErrorResponse = new ValidationErrorResponse(HttpStatus.BAD_REQUEST, LocalDateTime.now(), errorList);
3231

src/main/java/com/farukgenc/boilerplate/springboot/model/User.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
package com.farukgenc.boilerplate.springboot.model;
22

3-
import jakarta.persistence.*;
4-
import lombok.*;
5-
3+
import jakarta.persistence.Column;
4+
import jakarta.persistence.Entity;
5+
import jakarta.persistence.EnumType;
6+
import jakarta.persistence.Enumerated;
7+
import jakarta.persistence.GeneratedValue;
8+
import jakarta.persistence.GenerationType;
9+
import jakarta.persistence.Id;
10+
import jakarta.persistence.Table;
11+
import lombok.AllArgsConstructor;
12+
import lombok.Getter;
13+
import lombok.NoArgsConstructor;
14+
import lombok.Setter;
615

716
/**
817
* Created on Ağustos, 2020
@@ -12,7 +21,6 @@
1221
@Getter
1322
@Setter
1423
@Entity
15-
@Builder
1624
@NoArgsConstructor
1725
@AllArgsConstructor
1826
@Table(name = "USERS")

src/main/java/com/farukgenc/boilerplate/springboot/security/service/UserServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.farukgenc.boilerplate.springboot.security.service;
22

3-
import com.farukgenc.boilerplate.springboot.service.UserValidationService;
43
import com.farukgenc.boilerplate.springboot.model.User;
54
import com.farukgenc.boilerplate.springboot.model.UserRole;
5+
import com.farukgenc.boilerplate.springboot.repository.UserRepository;
66
import com.farukgenc.boilerplate.springboot.security.dto.AuthenticatedUserDto;
77
import com.farukgenc.boilerplate.springboot.security.dto.RegistrationRequest;
88
import com.farukgenc.boilerplate.springboot.security.dto.RegistrationResponse;
99
import com.farukgenc.boilerplate.springboot.security.mapper.UserMapper;
10+
import com.farukgenc.boilerplate.springboot.service.UserValidationService;
1011
import com.farukgenc.boilerplate.springboot.utils.GeneralMessageAccessor;
11-
import com.farukgenc.boilerplate.springboot.repository.UserRepository;
1212
import lombok.RequiredArgsConstructor;
1313
import lombok.extern.slf4j.Slf4j;
1414
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,12 @@
11
package com.farukgenc.boilerplate.springboot.security.utils;
22

3-
import org.springframework.security.core.Authentication;
4-
import org.springframework.security.core.context.SecurityContextHolder;
5-
import org.springframework.security.core.userdetails.UserDetails;
6-
73
/**
84
* Created on Ağustos, 2020
95
*
106
* @author Faruk
117
*/
128
public class SecurityConstants {
139

14-
// FIXME : Customize security constants for your application.
15-
16-
/**
17-
* Token expiration time 1 days.
18-
*/
19-
public static final long EXPIRATION_TIME = 24 * 60 * 60 * 1000;
20-
21-
/**
22-
* Secret key for signature
23-
*/
24-
public static final String SECRET_KEY = "mySecretKey";
25-
26-
/**
27-
* The company who provided token.
28-
* You can customize issuer name, this is given as an example.
29-
*/
30-
public static final String ISSUER = "www.boilerplate.design";
31-
3210
/**
3311
* Token Prefix
3412
* We will use this prefix when parsing JWT Token
@@ -42,24 +20,9 @@ public class SecurityConstants {
4220
*/
4321
public static final String HEADER_STRING = "Authorization";
4422

45-
public static final String LOGIN_REQUEST_URI = "/login";
46-
47-
public static final String REGISTRATION_REQUEST_URI = "/register";
48-
4923
private SecurityConstants() {
5024

5125
throw new UnsupportedOperationException();
5226
}
5327

54-
/**
55-
* @return authenticated username from Security Context
56-
*/
57-
public static String getAuthenticatedUsername() {
58-
59-
final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
60-
final UserDetails userDetails = (UserDetails) authentication.getPrincipal();
61-
62-
return userDetails.getUsername();
63-
}
64-
6528
}

src/main/java/com/farukgenc/boilerplate/springboot/service/UserValidationService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private void checkUsername(String username) {
4141

4242
if (existsByUsername) {
4343

44-
log.warn("{} is already being used!", username);
44+
log.warn("Username: {} already being used!", username);
4545

4646
final String existsUsername = exceptionMessageAccessor.getMessage(null, USERNAME_ALREADY_EXISTS);
4747
throw new RegistrationException(existsUsername);
@@ -55,7 +55,7 @@ private void checkEmail(String email) {
5555

5656
if (existsByEmail) {
5757

58-
log.warn("{} is already being used!", email);
58+
log.warn("Email: {} already being used!", email);
5959

6060
final String existsEmail = exceptionMessageAccessor.getMessage(null, EMAIL_ALREADY_EXISTS);
6161
throw new RegistrationException(existsEmail);

src/main/java/com/farukgenc/boilerplate/springboot/utils/ProjectConstants.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
*/
1010
public final class ProjectConstants {
1111

12-
// FIXME : Customize project constants for your application.
13-
1412
public static final String DEFAULT_ENCODING = "UTF-8";
1513

1614
public static final Locale TURKISH_LOCALE = new Locale.Builder().setLanguage("tr").setRegion("TR").build();

0 commit comments

Comments
 (0)