diff --git a/pom.xml b/pom.xml index 990fa1b..2477574 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ edu.tamu.weaver webservice-parent - 2.1.1-RC15 + 2.3.0 diff --git a/src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java b/src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java index 7f8f2f7..1e9462d 100644 --- a/src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java +++ b/src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java @@ -1,6 +1,6 @@ package edu.tamu.app.config; -import org.h2.server.web.WebServlet; +import org.h2.server.web.JakartaWebServlet; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -11,8 +11,8 @@ public class AppH2ConsoleConfig { @Bean - public ServletRegistrationBean h2servletRegistration() { - ServletRegistrationBean registrationBean = new ServletRegistrationBean<>(new WebServlet()); + public ServletRegistrationBean h2servletRegistration() { + ServletRegistrationBean registrationBean = new ServletRegistrationBean<>(new JakartaWebServlet()); registrationBean.addUrlMappings("/admin/h2console/*"); registrationBean.addInitParameter("-webAllowOthers", "true"); return registrationBean; diff --git a/src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java b/src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java index fbc66be..d33ead6 100644 --- a/src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java +++ b/src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java @@ -1,11 +1,15 @@ package edu.tamu.app.config; -import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS; - +import org.springframework.security.authentication.AuthenticationManager; import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.Customizer; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; 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.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer.FrameOptionsConfig; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.SecurityFilterChain; import edu.tamu.app.auth.service.AppUserDetailsService; import edu.tamu.app.enums.Role; @@ -15,30 +19,29 @@ @Configuration @EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) +@EnableMethodSecurity(prePostEnabled = true, securedEnabled = true) public class AppWebSecurityConfig extends AuthWebSecurityConfig { + private AuthenticationManager authenticationManager; + @Override - protected void configure(HttpSecurity http) throws Exception { + public SecurityFilterChain configure(HttpSecurity http) throws Exception { // @formatter:off http - .sessionManagement() - .sessionCreationPolicy(STATELESS) - .and() - .authorizeRequests() - .expressionHandler(webExpressionHandler()) - .antMatchers("/**/*") - .permitAll() - .and() - .headers() - .frameOptions() - .disable() - .and() - .cors() - .and() - .csrf() - .disable() - .addFilter(tokenAuthorizationFilter()); + .sessionManagement(sessionManagement -> + sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS) + ) + .authorizeHttpRequests(authorizeRequests -> + authorizeRequests.requestMatchers("/**").permitAll() + ) + .headers(headers -> + headers.frameOptions(FrameOptionsConfig::disable) + ) + .cors(Customizer.withDefaults()) + .csrf(AbstractHttpConfigurer::disable) + .addFilter(tokenAuthorizationFilter(authenticationManager)); + + return http.build(); // @formatter:on } diff --git a/src/main/java/edu/tamu/app/controller/IdeaController.java b/src/main/java/edu/tamu/app/controller/IdeaController.java index cdfb328..80c88e5 100644 --- a/src/main/java/edu/tamu/app/controller/IdeaController.java +++ b/src/main/java/edu/tamu/app/controller/IdeaController.java @@ -44,7 +44,7 @@ public ApiResponse page(@RequestBody FilteredPageRequest filteredPageRequest) { @RequestMapping("/{id}") @PreAuthorize("hasRole('SERVICE_MANAGER')") public ApiResponse getById(@PathVariable Long id) { - return new ApiResponse(SUCCESS, ideaRepo.getById(id)); + return new ApiResponse(SUCCESS, ideaRepo.getReferenceById(id)); } @RequestMapping("/create") diff --git a/src/main/java/edu/tamu/app/mock/products/MockProducts.java b/src/main/java/edu/tamu/app/mock/products/MockProducts.java index 5a38ec9..17cf295 100644 --- a/src/main/java/edu/tamu/app/mock/products/MockProducts.java +++ b/src/main/java/edu/tamu/app/mock/products/MockProducts.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Optional; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/edu/tamu/app/model/AbstractIdea.java b/src/main/java/edu/tamu/app/model/AbstractIdea.java index f22de0c..a082972 100644 --- a/src/main/java/edu/tamu/app/model/AbstractIdea.java +++ b/src/main/java/edu/tamu/app/model/AbstractIdea.java @@ -1,15 +1,15 @@ package edu.tamu.app.model; -import static javax.persistence.CascadeType.REFRESH; -import static javax.persistence.FetchType.EAGER; +import static jakarta.persistence.CascadeType.REFRESH; +import static jakarta.persistence.FetchType.EAGER; import java.util.Calendar; -import javax.persistence.Column; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.UpdateTimestamp; diff --git a/src/main/java/edu/tamu/app/model/AbstractScheduler.java b/src/main/java/edu/tamu/app/model/AbstractScheduler.java index 0dd6f91..d2d3152 100644 --- a/src/main/java/edu/tamu/app/model/AbstractScheduler.java +++ b/src/main/java/edu/tamu/app/model/AbstractScheduler.java @@ -1,17 +1,17 @@ package edu.tamu.app.model; -import static javax.persistence.FetchType.EAGER; -import static javax.persistence.InheritanceType.JOINED; +import static jakarta.persistence.FetchType.EAGER; +import static jakarta.persistence.InheritanceType.JOINED; import static org.hibernate.annotations.FetchMode.SELECT; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; diff --git a/src/main/java/edu/tamu/app/model/FeatureProposal.java b/src/main/java/edu/tamu/app/model/FeatureProposal.java index 00d6d20..086e22c 100644 --- a/src/main/java/edu/tamu/app/model/FeatureProposal.java +++ b/src/main/java/edu/tamu/app/model/FeatureProposal.java @@ -1,21 +1,21 @@ package edu.tamu.app.model; -import static javax.persistence.FetchType.EAGER; +import static jakarta.persistence.FetchType.EAGER; import static org.hibernate.annotations.FetchMode.SELECT; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.Fetch; diff --git a/src/main/java/edu/tamu/app/model/Idea.java b/src/main/java/edu/tamu/app/model/Idea.java index 71326f7..f3c2b2b 100644 --- a/src/main/java/edu/tamu/app/model/Idea.java +++ b/src/main/java/edu/tamu/app/model/Idea.java @@ -1,15 +1,15 @@ package edu.tamu.app.model; -import static javax.persistence.FetchType.EAGER; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import static jakarta.persistence.FetchType.EAGER; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIdentityReference; diff --git a/src/main/java/edu/tamu/app/model/Note.java b/src/main/java/edu/tamu/app/model/Note.java index f1e8e9b..69274f9 100644 --- a/src/main/java/edu/tamu/app/model/Note.java +++ b/src/main/java/edu/tamu/app/model/Note.java @@ -1,19 +1,19 @@ package edu.tamu.app.model; -import static javax.persistence.CascadeType.MERGE; -import static javax.persistence.CascadeType.REFRESH; -import static javax.persistence.FetchType.EAGER; +import static jakarta.persistence.CascadeType.MERGE; +import static jakarta.persistence.CascadeType.REFRESH; +import static jakarta.persistence.FetchType.EAGER; import java.util.Calendar; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.UpdateTimestamp; diff --git a/src/main/java/edu/tamu/app/model/Notification.java b/src/main/java/edu/tamu/app/model/Notification.java index 7619eb5..8aefcfa 100644 --- a/src/main/java/edu/tamu/app/model/Notification.java +++ b/src/main/java/edu/tamu/app/model/Notification.java @@ -1,15 +1,15 @@ package edu.tamu.app.model; -import static javax.persistence.FetchType.EAGER; +import static jakarta.persistence.FetchType.EAGER; import static org.hibernate.annotations.FetchMode.SELECT; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; import org.hibernate.annotations.Fetch; diff --git a/src/main/java/edu/tamu/app/model/Schedule.java b/src/main/java/edu/tamu/app/model/Schedule.java index 2886978..23eae28 100644 --- a/src/main/java/edu/tamu/app/model/Schedule.java +++ b/src/main/java/edu/tamu/app/model/Schedule.java @@ -3,14 +3,14 @@ import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -32,8 +32,8 @@ public class Schedule extends BaseEntity { private AbstractScheduler scheduler; @ElementCollection(fetch = FetchType.EAGER) - @MapKeyColumn(name = "key") - @Column(name = "value") + @MapKeyColumn(name = "schedule_key") + @Column(name = "schedule_value") @CollectionTable(name = "schedule_data", joinColumns = @JoinColumn(name = "schedule_id")) private Map scheduleData; diff --git a/src/main/java/edu/tamu/app/model/Service.java b/src/main/java/edu/tamu/app/model/Service.java index 204dc7b..7a7f3ff 100644 --- a/src/main/java/edu/tamu/app/model/Service.java +++ b/src/main/java/edu/tamu/app/model/Service.java @@ -1,14 +1,14 @@ package edu.tamu.app.model; -import static javax.persistence.FetchType.EAGER; +import static jakarta.persistence.FetchType.EAGER; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/src/main/java/edu/tamu/app/model/User.java b/src/main/java/edu/tamu/app/model/User.java index 55ca0e4..32c7e43 100644 --- a/src/main/java/edu/tamu/app/model/User.java +++ b/src/main/java/edu/tamu/app/model/User.java @@ -4,10 +4,10 @@ import java.util.Collection; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/src/main/java/edu/tamu/app/model/repo/impl/IdeaRepoImpl.java b/src/main/java/edu/tamu/app/model/repo/impl/IdeaRepoImpl.java index 604c20a..9afc043 100644 --- a/src/main/java/edu/tamu/app/model/repo/impl/IdeaRepoImpl.java +++ b/src/main/java/edu/tamu/app/model/repo/impl/IdeaRepoImpl.java @@ -4,7 +4,7 @@ import java.util.Optional; -import javax.mail.MessagingException; +import jakarta.mail.MessagingException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.simp.SimpMessagingTemplate; diff --git a/src/main/java/edu/tamu/app/model/repo/specification/AbstractSpecification.java b/src/main/java/edu/tamu/app/model/repo/specification/AbstractSpecification.java index b219928..b97209e 100644 --- a/src/main/java/edu/tamu/app/model/repo/specification/AbstractSpecification.java +++ b/src/main/java/edu/tamu/app/model/repo/specification/AbstractSpecification.java @@ -6,10 +6,10 @@ import java.util.Map; import java.util.Optional; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.springframework.data.jpa.domain.Specification; diff --git a/src/main/java/edu/tamu/app/model/repo/specification/ServiceSpecification.java b/src/main/java/edu/tamu/app/model/repo/specification/ServiceSpecification.java index 17b6d3a..524bfa4 100644 --- a/src/main/java/edu/tamu/app/model/repo/specification/ServiceSpecification.java +++ b/src/main/java/edu/tamu/app/model/repo/specification/ServiceSpecification.java @@ -2,9 +2,9 @@ import java.util.Map; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; public class ServiceSpecification extends AbstractSpecification { diff --git a/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java b/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java index de45a0a..e4d04a6 100644 --- a/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java +++ b/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java @@ -3,6 +3,7 @@ import static edu.tamu.weaver.response.ApiStatus.INVALID; import static edu.tamu.weaver.response.ApiStatus.SUCCESS; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.when; @@ -112,11 +113,11 @@ public void setup() throws UserNotFoundException { when(userRepo.findByUsername(any(String.class))).thenReturn(Optional.of(user)); when(ideaRepo.findAll()).thenReturn(mockIdeaList); when(ideaRepo.findAll(any(IdeaSpecification.class), any(Pageable.class))).thenReturn(mockPageableIdeaList); - when(ideaRepo.getById(any(Long.class))).thenReturn(TEST_IDEA1); + when(ideaRepo.getReferenceById(any(Long.class))).thenReturn(TEST_IDEA1); when(ideaRepo.create(any(Idea.class), any(Credentials.class))).thenReturn(TEST_IDEA1); when(ideaRepo.update(any(Idea.class))).thenReturn(TEST_MODIFIED_IDEA); when(ideaRepo.reject(ideaWithFeedback)).thenReturn(rejectedIdea); - when(serviceRepo.getById(any(Long.class))).thenReturn(TEST_SERVICE); + when(serviceRepo.getReferenceById(any(Long.class))).thenReturn(TEST_SERVICE); when(productService.submitIssueRequest(any(IssueRequest.class))).thenReturn(new ApiResponse(SUCCESS, TEST_ISSUE_REQUEST)); doNothing().when(ideaRepo).delete(any(Idea.class)); doNothing().when(ideaRepo).delete(any(Idea.class)); @@ -134,9 +135,11 @@ public void testPage() { } @Test - public void testIdea() { + public void testIdea() throws Exception { TEST_IDEA1.setId(1L); + response = ideaController.getById(TEST_IDEA1.getId()); + assertNotNull(response, "The response from getById was null"); assertEquals(SUCCESS, response.getMeta().getStatus(), "Not successful at getting requested Idea"); Idea idea = (Idea) response.getPayload().get("Idea"); assertEquals(TEST_IDEA1.getId(), idea.getId(), "Did not get the expected service"); diff --git a/src/test/java/edu/tamu/app/service/ProductServiceTest.java b/src/test/java/edu/tamu/app/service/ProductServiceTest.java index ace7f8e..71507e7 100644 --- a/src/test/java/edu/tamu/app/service/ProductServiceTest.java +++ b/src/test/java/edu/tamu/app/service/ProductServiceTest.java @@ -39,7 +39,6 @@ import edu.tamu.weaver.response.ApiResponse; import edu.tamu.weaver.response.ApiStatus; -@ExtendWith(SpringExtension.class) @SpringBootTest(classes = { StatusApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT) public class ProductServiceTest {