diff --git a/pom.xml b/pom.xml index 8de6f2c..b8625a7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.4.RELEASE + 3.0.2 @@ -18,12 +18,12 @@ 1.4.3 - 1.3.1.Final + 1.5.3.Final 5.15.0 29.0-jre - 0.7.1 + 1.9.0 3.5.1 @@ -34,7 +34,7 @@ 0.14.1 3.6.0.1398 - 0.8.5 + 0.8.8 3.1.0 8.36.1 src/main/resources/checkstyle.xml @@ -51,7 +51,7 @@ UTF-8 UTF-8 - 11 + 17 ${java.version} ${java.version} @@ -72,11 +72,7 @@ org.springframework.boot spring-boot-starter-thymeleaf - - eu.michael-simons - wro4j-spring-boot-starter - ${wro4j-sb-starter.version} - + org.springframework.boot spring-boot-starter-mail @@ -85,7 +81,7 @@ org.thymeleaf.extras - thymeleaf-extras-springsecurity5 + thymeleaf-extras-springsecurity6 @@ -100,6 +96,18 @@ jakarta.annotation jakarta.annotation-api + + jakarta.mail + jakarta.mail-api + + + jakarta.persistence + jakarta.persistence-api + + + jakarta.servlet + jakarta.servlet-api + @@ -162,12 +170,6 @@ org.springframework.boot spring-boot-starter-test test - - - org.junit.vintage - junit-vintage-engine - - @@ -202,7 +204,28 @@ ${build.profile}-${project.version}-app spring-boot:run - + + ro.isdc.wro4j + wro4j-maven-plugin + ${wro4j.version} + + + compile + + run + + + + + + ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory + + ${project.build.directory}/classes/static/css + ${project.build.directory}/classes/static/js + ${basedir}/src/main/resources/wro.xml + ${basedir}/src/main/resources/wro.properties + + org.springframework.boot spring-boot-maven-plugin @@ -331,6 +354,39 @@ + + org.openrewrite.maven + rewrite-maven-plugin + 4.40.0 + + + org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0 + org.openrewrite.java.migrate.UpgradeToJava17 + org.openrewrite.java.spring.boot2.SpringBoot2JUnit4to5Migration + org.openrewrite.java.logging.slf4j.Log4jToSlf4j + org.openrewrite.java.logging.slf4j.ParameterizedLogging + org.openrewrite.java.cleanup.CommonStaticAnalysis + + + + + org.openrewrite.recipe + rewrite-spring + 4.33.0 + + + org.openrewrite.recipe + rewrite-migrate-java + 1.17.0 + + + org.openrewrite.recipe + rewrite-logging-frameworks + 1.18.0 + + + + diff --git a/src/main/java/gt/app/config/CachingHttpHeadersFilter.java b/src/main/java/gt/app/config/CachingHttpHeadersFilter.java index 326ab88..efd9403 100644 --- a/src/main/java/gt/app/config/CachingHttpHeadersFilter.java +++ b/src/main/java/gt/app/config/CachingHttpHeadersFilter.java @@ -2,10 +2,10 @@ import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/gt/app/config/ReqLogFilter.java b/src/main/java/gt/app/config/ReqLogFilter.java index 4ad1afa..48d2409 100644 --- a/src/main/java/gt/app/config/ReqLogFilter.java +++ b/src/main/java/gt/app/config/ReqLogFilter.java @@ -2,8 +2,8 @@ import lombok.extern.slf4j.Slf4j; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -17,8 +17,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha req.put("req.remoteHost", request.getRemoteHost()); - if (request instanceof HttpServletRequest) { - HttpServletRequest httpServletRequest = (HttpServletRequest) request; + if (request instanceof HttpServletRequest httpServletRequest) { req.put("req.requestURI", httpServletRequest.getRequestURI()); StringBuffer requestURL = httpServletRequest.getRequestURL(); if (requestURL != null) { diff --git a/src/main/java/gt/app/config/WebConfigurer.java b/src/main/java/gt/app/config/WebConfigurer.java index 67fa689..00d50c7 100644 --- a/src/main/java/gt/app/config/WebConfigurer.java +++ b/src/main/java/gt/app/config/WebConfigurer.java @@ -10,9 +10,9 @@ import org.springframework.core.env.Environment; import org.springframework.core.env.Profiles; -import javax.servlet.DispatcherType; -import javax.servlet.FilterRegistration; -import javax.servlet.ServletContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.ServletContext; import java.util.EnumSet; @Configuration @@ -42,7 +42,7 @@ private void initCachingHttpHeadersFilter(ServletContext servletContext, EnumSet } @Bean - public FilterRegistrationBean loggingFilter() { + FilterRegistrationBean loggingFilter() { FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); registrationBean.setFilter(new ReqLogFilter()); diff --git a/src/main/java/gt/app/config/security/AppUserDetails.java b/src/main/java/gt/app/config/security/AppUserDetails.java index 1782db2..b57026d 100644 --- a/src/main/java/gt/app/config/security/AppUserDetails.java +++ b/src/main/java/gt/app/config/security/AppUserDetails.java @@ -14,6 +14,8 @@ @Getter public class AppUserDetails extends User { + private static final long serialVersionUID = 1; + private Long id; private String firstName; @@ -48,9 +50,15 @@ public Collection getGrantedAuthorities() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } AppUserDetails that = (AppUserDetails) o; return id.equals(that.id); } diff --git a/src/main/java/gt/app/config/security/SecurityAuditorResolver.java b/src/main/java/gt/app/config/security/SecurityAuditorResolver.java index e0cb87e..b517079 100644 --- a/src/main/java/gt/app/config/security/SecurityAuditorResolver.java +++ b/src/main/java/gt/app/config/security/SecurityAuditorResolver.java @@ -5,7 +5,7 @@ import org.springframework.data.domain.AuditorAware; import org.springframework.stereotype.Component; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Optional; @Component diff --git a/src/main/java/gt/app/config/security/SecurityConfig.java b/src/main/java/gt/app/config/security/SecurityConfig.java index 818aecf..7d7d063 100644 --- a/src/main/java/gt/app/config/security/SecurityConfig.java +++ b/src/main/java/gt/app/config/security/SecurityConfig.java @@ -9,14 +9,14 @@ import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; @EnableWebSecurity @Configuration @RequiredArgsConstructor -public class SecurityConfig extends WebSecurityConfigurerAdapter { +public class SecurityConfig { private static final String[] AUTH_WHITELIST = { "/swagger-resources/**", @@ -30,25 +30,25 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { "/" //landing page is allowed for all }; - private final AppUserDetailsService appUserDetailsService; +// private final AppUserDetailsService appUserDetailsService; +// +// @Autowired +// public void configureGlobal(AuthenticationManagerBuilder authenticationManagerBuilder) throws Exception { +// authenticationManagerBuilder +// .userDetailsService(appUserDetailsService) +// .passwordEncoder(passwordEncoder()); +// } - @Autowired - public void configureGlobal(AuthenticationManagerBuilder authenticationManagerBuilder) throws Exception { - authenticationManagerBuilder - .userDetailsService(appUserDetailsService) - .passwordEncoder(passwordEncoder()); - } - - @Override - protected void configure(HttpSecurity http) throws Exception { + @Bean + SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http .headers().frameOptions().sameOrigin() .and() - .authorizeRequests() - .antMatchers(AUTH_WHITELIST).permitAll() - .antMatchers("/admin/**").hasAuthority(Constants.ROLE_ADMIN) - .antMatchers("/user/**").hasAuthority(Constants.ROLE_USER) - .antMatchers("/api/**").authenticated()//individual api will be secured differently + .authorizeHttpRequests() + .requestMatchers(AUTH_WHITELIST).permitAll() + .requestMatchers("/admin/**").hasAuthority(Constants.ROLE_ADMIN) + .requestMatchers("/user/**").hasAuthority(Constants.ROLE_USER) + .requestMatchers("/api/**").authenticated()//individual api will be secured differently .anyRequest().authenticated() //this one will catch the rest patterns .and() .csrf().disable() @@ -60,11 +60,12 @@ protected void configure(HttpSecurity http) throws Exception { .logoutUrl("/auth/logout") .logoutSuccessUrl("/?logout") .permitAll(); + return http.build(); } @Bean - public PasswordEncoder passwordEncoder() { + PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } diff --git a/src/main/java/gt/app/config/security/SecurityUtils.java b/src/main/java/gt/app/config/security/SecurityUtils.java index b419330..082e576 100644 --- a/src/main/java/gt/app/config/security/SecurityUtils.java +++ b/src/main/java/gt/app/config/security/SecurityUtils.java @@ -40,8 +40,7 @@ public static Optional getCurrentUserLogin() { public static Long getCurrentUserId() { User user = getCurrentUserDetails(); - if (user instanceof AppUserDetails) { - AppUserDetails appUserDetails = (AppUserDetails) user; + if (user instanceof AppUserDetails appUserDetails) { return appUserDetails.getId(); } return null; diff --git a/src/main/java/gt/app/domain/Authority.java b/src/main/java/gt/app/domain/Authority.java index 1673f87..b2d6c08 100644 --- a/src/main/java/gt/app/domain/Authority.java +++ b/src/main/java/gt/app/domain/Authority.java @@ -3,14 +3,16 @@ import lombok.Setter; import org.springframework.security.core.GrantedAuthority; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity @Setter public class Authority implements GrantedAuthority { + private static final long serialVersionUID = 1; + @Id @Column(length = 16) private String name; @@ -22,8 +24,12 @@ public String getAuthority() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Authority authority1 = (Authority) o; diff --git a/src/main/java/gt/app/domain/BaseAuditingEntity.java b/src/main/java/gt/app/domain/BaseAuditingEntity.java index c2de177..a79527c 100644 --- a/src/main/java/gt/app/domain/BaseAuditingEntity.java +++ b/src/main/java/gt/app/domain/BaseAuditingEntity.java @@ -9,7 +9,7 @@ import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.Instant; @MappedSuperclass diff --git a/src/main/java/gt/app/domain/BaseEntity.java b/src/main/java/gt/app/domain/BaseEntity.java index bb55bc9..fa800ed 100644 --- a/src/main/java/gt/app/domain/BaseEntity.java +++ b/src/main/java/gt/app/domain/BaseEntity.java @@ -2,9 +2,9 @@ import lombok.Data; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @Data @MappedSuperclass diff --git a/src/main/java/gt/app/domain/Note.java b/src/main/java/gt/app/domain/Note.java index 44fa321..48a7411 100644 --- a/src/main/java/gt/app/domain/Note.java +++ b/src/main/java/gt/app/domain/Note.java @@ -2,7 +2,7 @@ import lombok.Data; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/gt/app/domain/ReceivedFile.java b/src/main/java/gt/app/domain/ReceivedFile.java index 778a086..0ccb2b8 100644 --- a/src/main/java/gt/app/domain/ReceivedFile.java +++ b/src/main/java/gt/app/domain/ReceivedFile.java @@ -2,12 +2,11 @@ import lombok.Data; import lombok.NoArgsConstructor; -import org.hibernate.annotations.Type; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import java.time.Instant; import java.util.UUID; @@ -17,7 +16,6 @@ public class ReceivedFile { @Id - @Type(type = "uuid-char") UUID id; Instant receivedDate; diff --git a/src/main/java/gt/app/domain/User.java b/src/main/java/gt/app/domain/User.java index 6b9ce21..837f75f 100644 --- a/src/main/java/gt/app/domain/User.java +++ b/src/main/java/gt/app/domain/User.java @@ -3,8 +3,8 @@ import lombok.Data; import org.springframework.security.core.userdetails.UserDetails; -import javax.persistence.*; -import javax.validation.constraints.Size; +import jakarta.persistence.*; +import jakarta.validation.constraints.Size; import java.time.LocalDate; import java.util.Collection; import java.util.HashSet; @@ -12,6 +12,7 @@ @Entity @Data +@Table(name="APP_USER") public class User extends BaseEntity implements UserDetails { @Basic(fetch = FetchType.LAZY) @Lob @@ -45,7 +46,7 @@ public class User extends BaseEntity implements UserDetails { * TODO: BLOGIT http://stackoverflow.com/questions/3383169/hibernate-jpa-mysql-and- tinyint1-for-boolean-instead-of-bit-or-char */ @Column(nullable = false, columnDefinition = "TINYINT", length = 1) - private boolean active = false; + private boolean active; @Column(nullable = false, columnDefinition = "TINYINT", length = 1) private boolean accountNonExpired; diff --git a/src/main/java/gt/app/exception/RecordNotFoundException.java b/src/main/java/gt/app/exception/RecordNotFoundException.java index 5b36860..8718604 100644 --- a/src/main/java/gt/app/exception/RecordNotFoundException.java +++ b/src/main/java/gt/app/exception/RecordNotFoundException.java @@ -11,6 +11,6 @@ public RecordNotFoundException(String description) { } public RecordNotFoundException(String requestedObjectName, String requestedByField, Object requestedByParam) { - super(String.format("%s not found with %s = '%s'", requestedObjectName, requestedByField, requestedByParam)); + super("%s not found with %s = '%s'".formatted(requestedObjectName, requestedByField, requestedByParam)); } } diff --git a/src/main/java/gt/app/modules/email/EmailService.java b/src/main/java/gt/app/modules/email/EmailService.java index 9350616..6d5e230 100755 --- a/src/main/java/gt/app/modules/email/EmailService.java +++ b/src/main/java/gt/app/modules/email/EmailService.java @@ -8,8 +8,8 @@ import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/gt/app/modules/email/EmailUtil.java b/src/main/java/gt/app/modules/email/EmailUtil.java index b89859b..1e22dfc 100755 --- a/src/main/java/gt/app/modules/email/EmailUtil.java +++ b/src/main/java/gt/app/modules/email/EmailUtil.java @@ -3,8 +3,8 @@ import gt.app.exception.InvalidDataException; import lombok.experimental.UtilityClass; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; import java.util.Collection; import java.util.function.Function; diff --git a/src/main/java/gt/app/modules/file/FileDownloadUtil.java b/src/main/java/gt/app/modules/file/FileDownloadUtil.java index 8609542..564518a 100644 --- a/src/main/java/gt/app/modules/file/FileDownloadUtil.java +++ b/src/main/java/gt/app/modules/file/FileDownloadUtil.java @@ -3,7 +3,7 @@ import org.apache.tomcat.util.http.fileupload.IOUtils; import org.springframework.util.MimeTypeUtils; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/src/main/java/gt/app/modules/file/FileService.java b/src/main/java/gt/app/modules/file/FileService.java index 5320212..e7a0d22 100644 --- a/src/main/java/gt/app/modules/file/FileService.java +++ b/src/main/java/gt/app/modules/file/FileService.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/src/main/java/gt/app/modules/note/NoteCreateDto.java b/src/main/java/gt/app/modules/note/NoteCreateDto.java index bf31771..742d32e 100644 --- a/src/main/java/gt/app/modules/note/NoteCreateDto.java +++ b/src/main/java/gt/app/modules/note/NoteCreateDto.java @@ -3,7 +3,7 @@ import lombok.Data; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Data public class NoteCreateDto { diff --git a/src/main/java/gt/app/modules/user/UserSignUpDTO.java b/src/main/java/gt/app/modules/user/UserSignUpDTO.java index 804b019..0c484b5 100644 --- a/src/main/java/gt/app/modules/user/UserSignUpDTO.java +++ b/src/main/java/gt/app/modules/user/UserSignUpDTO.java @@ -2,7 +2,7 @@ import lombok.Data; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.time.LocalDate; @Data diff --git a/src/main/java/gt/app/web/mvc/DownloadController.java b/src/main/java/gt/app/web/mvc/DownloadController.java index d77b500..674d52c 100644 --- a/src/main/java/gt/app/web/mvc/DownloadController.java +++ b/src/main/java/gt/app/web/mvc/DownloadController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/gt/app/web/mvc/ErrorControllerAdvice.java b/src/main/java/gt/app/web/mvc/ErrorControllerAdvice.java index 7489bdc..2a0744f 100644 --- a/src/main/java/gt/app/web/mvc/ErrorControllerAdvice.java +++ b/src/main/java/gt/app/web/mvc/ErrorControllerAdvice.java @@ -19,7 +19,7 @@ public class ErrorControllerAdvice { public String exception(final Throwable throwable, final Model model) { log.error("Exception during execution of application", throwable); - String errorMessage = (throwable != null ? throwable.getMessage() : "Unknown error"); + String errorMessage = throwable != null ? throwable.getMessage() : "Unknown error"; model.addAttribute("errorMessage", errorMessage); return "error"; } diff --git a/src/main/java/gt/app/web/rest/HelloResource.java b/src/main/java/gt/app/web/rest/HelloResource.java index 9647ad9..516eb7d 100644 --- a/src/main/java/gt/app/web/rest/HelloResource.java +++ b/src/main/java/gt/app/web/rest/HelloResource.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.util.Map; @RestController diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 37ad7c0..bdec80f 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,17 +1,13 @@ spring: - profiles: - active: dev thymeleaf: cache: false - prefix: file:src/main/resources/templates/ #directly serve from src folder instead of target - resources: - static-locations: file:src/main/resources/static/ #directly serve from src folder instead of target - cache: - period: 0 + prefix: file:src/main/resources/templates/ mvc: static-path-pattern: /static/** #Access from http://localhost:8080/h2-console/, db url: jdbc:h2:mem:testdb, username: sa h2: console: - enabled: true + enabled: true #directly serve from src folder instead of target + web.resources.cache.period: 0 #directly serve from src folder instead of target + web.resources.static-locations: file:src/main/resources/static/ diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml index 41bb14d..408ec27 100644 --- a/src/main/resources/application-docker.yml +++ b/src/main/resources/application-docker.yml @@ -1,6 +1,4 @@ spring: - profiles: - active: docker-local #Access from http://localhost:8080/h2-console/, db url: jdbc:h2:mem:testdb, username: sa h2: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 8316e9b..68edf9b 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,3 +1 @@ spring: - profiles: - active: prod diff --git a/src/main/resources/wro.properties b/src/main/resources/wro.properties new file mode 100644 index 0000000..e69de29 diff --git a/src/test/java/gt/app/arch/ArchitectureTest.java b/src/test/java/gt/app/arch/ArchitectureTest.java index e9a1ab7..344211f 100644 --- a/src/test/java/gt/app/arch/ArchitectureTest.java +++ b/src/test/java/gt/app/arch/ArchitectureTest.java @@ -14,7 +14,7 @@ abstract class ArchitectureTest { static JavaClasses classes; @BeforeAll - public static void setUp() { + static void setUp() { classes = new ClassFileImporter() .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS) .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_ARCHIVES) diff --git a/src/test/java/gt/app/arch/SpringCodingRulesTest.java b/src/test/java/gt/app/arch/SpringCodingRulesTest.java index 645a6ef..a8f74e1 100644 --- a/src/test/java/gt/app/arch/SpringCodingRulesTest.java +++ b/src/test/java/gt/app/arch/SpringCodingRulesTest.java @@ -2,6 +2,7 @@ import com.tngtech.archunit.lang.ArchRule; import com.tngtech.archunit.lang.syntax.ArchRuleDefinition; +import jakarta.annotation.PostConstruct; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -12,8 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.*; -import javax.annotation.PostConstruct; -import javax.persistence.Entity; +import jakarta.persistence.Entity; class SpringCodingRulesTest extends ArchitectureTest { diff --git a/src/test/java/gt/app/misc/JPAManyRelationCRUD.java b/src/test/java/gt/app/misc/JPAManyRelationCRUD.java index 7ee9160..d48013d 100644 --- a/src/test/java/gt/app/misc/JPAManyRelationCRUD.java +++ b/src/test/java/gt/app/misc/JPAManyRelationCRUD.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; import org.springframework.test.annotation.DirtiesContext; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/gt/app/misc/SpringTransactionTest.java b/src/test/java/gt/app/misc/SpringTransactionTest.java index 5152aa3..a8742fa 100644 --- a/src/test/java/gt/app/misc/SpringTransactionTest.java +++ b/src/test/java/gt/app/misc/SpringTransactionTest.java @@ -13,7 +13,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows;