From 07d5f556aa3feab7e168d7cb71632c2745e74fdd Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Thu, 12 Nov 2026 14:08:51 -0600 Subject: [PATCH 1/5] WIP - upgrade to jdk-17 and weaver to 2.3.0 --- Dockerfile | 5 +- pom.xml | 6 +-- .../tamu/app/config/AppH2ConsoleConfig.java | 6 +-- .../tamu/app/config/AppWebSecurityConfig.java | 48 +++++++++++-------- .../tamu/app/mock/products/MockProducts.java | 2 +- .../java/edu/tamu/app/model/AbstractIdea.java | 14 +++--- .../edu/tamu/app/model/AbstractScheduler.java | 14 +++--- .../edu/tamu/app/model/FeatureProposal.java | 20 ++++---- src/main/java/edu/tamu/app/model/Idea.java | 20 ++++---- src/main/java/edu/tamu/app/model/Note.java | 20 ++++---- .../java/edu/tamu/app/model/Notification.java | 8 ++-- .../java/edu/tamu/app/model/Schedule.java | 16 +++---- src/main/java/edu/tamu/app/model/Service.java | 8 ++-- src/main/java/edu/tamu/app/model/User.java | 8 ++-- .../app/model/repo/impl/IdeaRepoImpl.java | 2 +- .../specification/AbstractSpecification.java | 8 ++-- .../specification/ServiceSpecification.java | 6 +-- 17 files changed, 109 insertions(+), 102 deletions(-) diff --git a/Dockerfile b/Dockerfile index c790ccb..955203a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ # Settings. +ARG JAVA_VERSION=17 ARG USER_ID=3001 ARG USER_NAME=lsss ARG SOURCE_DIR=/$USER_NAME/source # Maven stage. -FROM maven:3-openjdk-11-slim as maven +FROM maven:3-eclipse-temurin-$JAVA_VERSION AS maven ARG USER_ID ARG USER_NAME ARG SOURCE_DIR @@ -40,7 +41,7 @@ USER $USER_NAME RUN mvn package -Pjar -DskipTests=true # Switch to Normal JRE Stage. -FROM eclipse-temurin:11-jre-noble +FROM eclipse-temurin:$JAVA_VERSION ARG USER_ID ARG USER_NAME ARG SOURCE_DIR diff --git a/pom.xml b/pom.xml index 990fa1b..9857656 100644 --- a/pom.xml +++ b/pom.xml @@ -14,11 +14,11 @@ edu.tamu.weaver webservice-parent - 2.1.1-RC15 + 2.3.0 - 11 + 17 2.16.0 war 2.22.2 @@ -154,7 +154,7 @@ - javax.xml.bind + jakarta.xml.bind jaxb-api 2.3.1 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..4808fb2 100644 --- a/src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java +++ b/src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java @@ -1,11 +1,18 @@ package edu.tamu.app.config; -import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS; +import org.springframework.security.config.Customizer; + +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.authentication.AuthenticationManager; +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 +22,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/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..2750b1d 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; 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 { From 9cb5867bcaec24cb60f931f44e9391260b4ebffb Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Thu, 12 Nov 2026 14:28:24 -0600 Subject: [PATCH 2/5] WIP - upgrade to jdk-17 and weaver upgrade to 2.3.0 - build yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dafaf03..d18e7c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - name: "Setup Java" uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: "Maven Test" run: mvn clean test jacoco:report coveralls:report -DdryRun=true From 3f0cc6c21269eb920190442aa5dbd986ec615c87 Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Thu, 12 Nov 2026 14:50:02 -0600 Subject: [PATCH 3/5] WIP - replace deprecated repo.getById() by getReferenceById and resolved dataintegrity vuilation --- .../edu/tamu/app/controller/FeatureProposalController.java | 4 ++-- src/main/java/edu/tamu/app/controller/IdeaController.java | 2 +- src/main/java/edu/tamu/app/controller/NoteController.java | 2 +- .../edu/tamu/app/controller/NotificationController.java | 2 +- .../java/edu/tamu/app/controller/ServiceController.java | 6 +++--- src/main/java/edu/tamu/app/model/Schedule.java | 4 ++-- .../tamu/app/model/repo/impl/FeatureProposalRepoImpl.java | 2 +- .../tamu/app/controller/FeatureProposalControllerTest.java | 4 ++-- .../java/edu/tamu/app/controller/IdeaControllerTest.java | 4 ++-- .../java/edu/tamu/app/controller/NoteControllerTest.java | 4 ++-- .../edu/tamu/app/controller/NotificationControllerTest.java | 2 +- .../java/edu/tamu/app/controller/ServiceControllerTest.java | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/edu/tamu/app/controller/FeatureProposalController.java b/src/main/java/edu/tamu/app/controller/FeatureProposalController.java index 4891b03..20372cd 100644 --- a/src/main/java/edu/tamu/app/controller/FeatureProposalController.java +++ b/src/main/java/edu/tamu/app/controller/FeatureProposalController.java @@ -41,7 +41,7 @@ public ApiResponse getAllFeatureProposalsByService(@RequestBody FilteredPageRequ @RequestMapping("/{id}") @PreAuthorize("hasRole('SERVICE_MANAGER')") public ApiResponse getFeatureProposal(@PathVariable Long id) { - return new ApiResponse(SUCCESS, featureProposalRepo.getById(id)); + return new ApiResponse(SUCCESS, featureProposalRepo.getReferenceById(id)); } @RequestMapping("/create") @@ -86,7 +86,7 @@ public ApiResponse remove(@WeaverValidatedModel FeatureProposal featureProposal) @RequestMapping("/{id}/vote") @PreAuthorize("hasRole('USER')") public ApiResponse vote(@PathVariable Long id, @WeaverUser User voter) { - FeatureProposal featureProposal = featureProposalRepo.getById(id); + FeatureProposal featureProposal = featureProposalRepo.getReferenceById(id); featureProposal.addVoter(voter); return new ApiResponse(SUCCESS, featureProposalRepo.update(featureProposal)); } 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/controller/NoteController.java b/src/main/java/edu/tamu/app/controller/NoteController.java index aeb511d..3709795 100644 --- a/src/main/java/edu/tamu/app/controller/NoteController.java +++ b/src/main/java/edu/tamu/app/controller/NoteController.java @@ -37,7 +37,7 @@ public ApiResponse page(@RequestBody FilteredPageRequest filteredPageRequest) { @RequestMapping("/{id}") @PreAuthorize("hasRole('ANONYMOUS')") public ApiResponse getById(@PathVariable Long id) { - return new ApiResponse(SUCCESS, noteRepo.getById(id)); + return new ApiResponse(SUCCESS, noteRepo.getReferenceById(id)); } @RequestMapping("/create") diff --git a/src/main/java/edu/tamu/app/controller/NotificationController.java b/src/main/java/edu/tamu/app/controller/NotificationController.java index 971236b..3d6141a 100644 --- a/src/main/java/edu/tamu/app/controller/NotificationController.java +++ b/src/main/java/edu/tamu/app/controller/NotificationController.java @@ -36,7 +36,7 @@ public ApiResponse getAllNotifications() { @RequestMapping("/{id}") @PreAuthorize("hasRole('STAFF')") public ApiResponse getById(@PathVariable Long id) { - return new ApiResponse(SUCCESS, notificationRepo.getById(id)); + return new ApiResponse(SUCCESS, notificationRepo.getReferenceById(id)); } @RequestMapping("/create") diff --git a/src/main/java/edu/tamu/app/controller/ServiceController.java b/src/main/java/edu/tamu/app/controller/ServiceController.java index 91af9fb..aaf4b96 100644 --- a/src/main/java/edu/tamu/app/controller/ServiceController.java +++ b/src/main/java/edu/tamu/app/controller/ServiceController.java @@ -62,7 +62,7 @@ public ApiResponse page(@RequestBody FilteredPageRequest filteredPageRequest) { @RequestMapping("/{id}") @PreAuthorize("hasRole('ANONYMOUS')") public ApiResponse getService(@PathVariable Long id) { - return new ApiResponse(SUCCESS, serviceRepo.getById(id)); + return new ApiResponse(SUCCESS, serviceRepo.getReferenceById(id)); } @RequestMapping("/create") @@ -91,7 +91,7 @@ public ApiResponse removeService(@WeaverValidatedModel Service service) { @PreAuthorize("hasRole('USER')") public ApiResponse submitIssueRequest(@RequestBody ServiceRequest request, @WeaverCredentials Credentials credentials) { IssueRequest issueRequest = new IssueRequest(request); - Service service = serviceRepo.getById(request.getService()); + Service service = serviceRepo.getReferenceById(request.getService()); issueRequest.setService(service.getName()); issueRequest.setCredentials(credentials); ApiResponse response = productService.submitIssueRequest(issueRequest); @@ -104,7 +104,7 @@ public ApiResponse submitIssueRequest(@RequestBody ServiceRequest request, @Weav @RequestMapping("/feature") @PreAuthorize("hasRole('USER')") public ApiResponse submitFeatureRequest(@RequestBody ServiceRequest request, @WeaverCredentials Credentials credentials) throws UserNotFoundException { - Service service = serviceRepo.getById(request.getService()); + Service service = serviceRepo.getReferenceById(request.getService()); Idea idea = new Idea(request); idea.setService(service); ideaRepo.create(idea, credentials); diff --git a/src/main/java/edu/tamu/app/model/Schedule.java b/src/main/java/edu/tamu/app/model/Schedule.java index 2750b1d..23eae28 100644 --- a/src/main/java/edu/tamu/app/model/Schedule.java +++ b/src/main/java/edu/tamu/app/model/Schedule.java @@ -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/repo/impl/FeatureProposalRepoImpl.java b/src/main/java/edu/tamu/app/model/repo/impl/FeatureProposalRepoImpl.java index 0c1e667..06d52c6 100644 --- a/src/main/java/edu/tamu/app/model/repo/impl/FeatureProposalRepoImpl.java +++ b/src/main/java/edu/tamu/app/model/repo/impl/FeatureProposalRepoImpl.java @@ -67,7 +67,7 @@ public FeatureProposal create(Idea idea) { @Override public FeatureProposal update(FeatureProposal featureProposalToUpdate) { - FeatureProposal persistedFeatureProposal = featureProposalRepo.getById(featureProposalToUpdate.getId()); + FeatureProposal persistedFeatureProposal = featureProposalRepo.getReferenceById(featureProposalToUpdate.getId()); // NOTE: ignore voters on update to avoid concurrency issue of save after votes occur BeanUtils.copyProperties(featureProposalToUpdate, persistedFeatureProposal, "voters"); for (Idea idea : persistedFeatureProposal.getIdeas()) { diff --git a/src/test/java/edu/tamu/app/controller/FeatureProposalControllerTest.java b/src/test/java/edu/tamu/app/controller/FeatureProposalControllerTest.java index 88261b8..2d159f2 100644 --- a/src/test/java/edu/tamu/app/controller/FeatureProposalControllerTest.java +++ b/src/test/java/edu/tamu/app/controller/FeatureProposalControllerTest.java @@ -99,12 +99,12 @@ public void setup() throws UserNotFoundException { when(userRepo.findByUsername(any(String.class))).thenReturn(Optional.of(user)); when(featureProposalRepo.findAll()).thenReturn(mockFeatureProposalList); when(featureProposalRepo.findAll(any(FeatureProposalSpecification.class), any(Pageable.class))).thenReturn(mockPageableFeatureProposalList); - when(featureProposalRepo.getById(any(Long.class))).thenReturn(TEST_FEATURE_PROPOSAL1); + when(featureProposalRepo.getReferenceById(any(Long.class))).thenReturn(TEST_FEATURE_PROPOSAL1); when(featureProposalRepo.create(any(FeatureProposal.class), any(Credentials.class))).thenReturn(TEST_FEATURE_PROPOSAL1); when(featureProposalRepo.create(any(Idea.class))).thenReturn(TEST_FEATURE_PROPOSAL1); when(featureProposalRepo.update(any(FeatureProposal.class))).thenReturn(TEST_MODIFIED_FEATURE_PROPOSAL); when(featureProposalRepo.reject(featureProposalWithFeedback)).thenReturn(rejectedFeatureProposal); - when(serviceRepo.getById(any(Long.class))).thenReturn(TEST_SERVICE); + when(serviceRepo.getReferenceById(any(Long.class))).thenReturn(TEST_SERVICE); doNothing().when(featureProposalRepo).delete(any(FeatureProposal.class)); doNothing().when(featureProposalRepo).delete(any(FeatureProposal.class)); } diff --git a/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java b/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java index de45a0a..fe13af5 100644 --- a/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java +++ b/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java @@ -112,11 +112,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)); diff --git a/src/test/java/edu/tamu/app/controller/NoteControllerTest.java b/src/test/java/edu/tamu/app/controller/NoteControllerTest.java index 57f911a..489295a 100644 --- a/src/test/java/edu/tamu/app/controller/NoteControllerTest.java +++ b/src/test/java/edu/tamu/app/controller/NoteControllerTest.java @@ -88,10 +88,10 @@ public void setup() throws UserNotFoundException { when(userRepo.findByUsername(any(String.class))).thenReturn(Optional.of(user)); when(noteRepo.findAll()).thenReturn(mockNoteList); when(noteRepo.findAll(any(NoteSpecification.class), any(Pageable.class))).thenReturn(mockPageableNoteList); - when(noteRepo.getById(any(Long.class))).thenReturn(TEST_NOTE1); + when(noteRepo.getReferenceById(any(Long.class))).thenReturn(TEST_NOTE1); when(noteRepo.create(any(Note.class), any(Credentials.class))).thenReturn(TEST_NOTE1); when(noteRepo.update(any(Note.class))).thenReturn(TEST_MODIFIED_NOTE); - when(serviceRepo.getById(any(Long.class))).thenReturn(TEST_SERVICE); + when(serviceRepo.getReferenceById(any(Long.class))).thenReturn(TEST_SERVICE); doNothing().when(noteRepo).delete(any(Note.class)); doNothing().when(noteRepo).delete(any(Note.class)); } diff --git a/src/test/java/edu/tamu/app/controller/NotificationControllerTest.java b/src/test/java/edu/tamu/app/controller/NotificationControllerTest.java index 5cf1d5d..c7380c3 100644 --- a/src/test/java/edu/tamu/app/controller/NotificationControllerTest.java +++ b/src/test/java/edu/tamu/app/controller/NotificationControllerTest.java @@ -63,7 +63,7 @@ public class NotificationControllerTest { public void setup() { MockitoAnnotations.openMocks(this); when(notificationRepo.findAllByOrderByIdDesc()).thenReturn(mockNotificationList); - when(notificationRepo.getById(any(Long.class))).thenReturn(TEST_NOTIFICATION1); + when(notificationRepo.getReferenceById(any(Long.class))).thenReturn(TEST_NOTIFICATION1); when(notificationRepo.create(any(Notification.class))).thenReturn(TEST_NOTIFICATION1); when(notificationRepo.update(any(Notification.class))).thenReturn(TEST_MODIFIED_NOTIFICATION); when(notificationRepo.activeNotificationsByLocation(any(String.class))).thenReturn(mockNotificationList); diff --git a/src/test/java/edu/tamu/app/controller/ServiceControllerTest.java b/src/test/java/edu/tamu/app/controller/ServiceControllerTest.java index c3ee193..eb14b3d 100644 --- a/src/test/java/edu/tamu/app/controller/ServiceControllerTest.java +++ b/src/test/java/edu/tamu/app/controller/ServiceControllerTest.java @@ -106,7 +106,7 @@ public void setup() throws UserNotFoundException { when(serviceRepo.findAll(any(ServiceSpecification.class), any(Pageable.class))).thenReturn(mockPageableServiceList); when(serviceRepo.findAllByOrderByStatusDescNameAsc()).thenReturn(mockServiceList); when(serviceRepo.findByIsPublicOrderByStatusDescNameAsc(true)).thenReturn(mockPublicServiceList); - when(serviceRepo.getById(any(Long.class))).thenReturn(TEST_SERVICE1); + when(serviceRepo.getReferenceById(any(Long.class))).thenReturn(TEST_SERVICE1); when(serviceRepo.create(any(Service.class))).thenReturn(TEST_SERVICE1); when(serviceRepo.update(any(Service.class))).thenReturn(TEST_MODIFIED_SERVICE1); when(ideaRepo.create(any(Idea.class), any(Credentials.class))).thenReturn(TEST_IDEA); From 810b6e4fb81a5b51ef4d424f9d2f50c7ee9659ea Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Fri, 13 Nov 2026 16:43:24 -0600 Subject: [PATCH 4/5] WIP-edited thesecurity filter chain --- src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java b/src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java index 4808fb2..bed1ea1 100644 --- a/src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java +++ b/src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java @@ -3,7 +3,7 @@ import org.springframework.security.config.Customizer; import org.springframework.beans.factory.annotation.Autowired; - +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; @@ -25,8 +25,10 @@ @EnableMethodSecurity(prePostEnabled = true, securedEnabled = true) public class AppWebSecurityConfig extends AuthWebSecurityConfig { + @Autowired private AuthenticationManager authenticationManager; + @Bean @Override public SecurityFilterChain configure(HttpSecurity http) throws Exception { // @formatter:off From 63e384695f3e350d72f5f5a0303c03f455707dad Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Mon, 16 Nov 2026 15:51:11 -0600 Subject: [PATCH 5/5] WIP - disable H2 console when test profile is active --- src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java b/src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java index 1e9462d..d0102b5 100644 --- a/src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java +++ b/src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Profile; @Configuration -@Profile("!production") +@Profile({"!production & !test"}) public class AppH2ConsoleConfig { @Bean