Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.1.1-RC15</version>
<version>2.3.0</version>
</parent>

<properties>
<java.version>11</java.version>
<java.version>17</java.version>
<log4j2.version>2.16.0</log4j2.version>
<maven.packaging>war</maven.packaging>
<maven-plugins.version>2.22.2</maven-plugins.version>
Expand Down Expand Up @@ -154,7 +154,7 @@
</configuration>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
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;
import org.springframework.context.annotation.Profile;

@Configuration
@Profile("!production")
@Profile({"!production & !test"})
public class AppH2ConsoleConfig {

@Bean
public ServletRegistrationBean<WebServlet> h2servletRegistration() {
ServletRegistrationBean<WebServlet> registrationBean = new ServletRegistrationBean<>(new WebServlet());
public ServletRegistrationBean<JakartaWebServlet> h2servletRegistration() {
ServletRegistrationBean<JakartaWebServlet> registrationBean = new ServletRegistrationBean<>(new JakartaWebServlet());
registrationBean.addUrlMappings("/admin/h2console/*");
registrationBean.addInitParameter("-webAllowOthers", "true");
return registrationBean;
Expand Down
50 changes: 29 additions & 21 deletions src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java
Original file line number Diff line number Diff line change
@@ -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.Bean;
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;
Expand All @@ -15,30 +22,31 @@

@Configuration
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
@EnableMethodSecurity(prePostEnabled = true, securedEnabled = true)
public class AppWebSecurityConfig extends AuthWebSecurityConfig<User, UserRepo, AppUserDetailsService> {

@Autowired
private AuthenticationManager authenticationManager;

@Bean
@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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/tamu/app/controller/IdeaController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/tamu/app/controller/NoteController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/edu/tamu/app/controller/ServiceController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/tamu/app/mock/products/MockProducts.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/edu/tamu/app/model/AbstractIdea.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
14 changes: 7 additions & 7 deletions src/main/java/edu/tamu/app/model/AbstractScheduler.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
20 changes: 10 additions & 10 deletions src/main/java/edu/tamu/app/model/FeatureProposal.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
20 changes: 10 additions & 10 deletions src/main/java/edu/tamu/app/model/Idea.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/edu/tamu/app/model/Note.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/edu/tamu/app/model/Notification.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Loading
Loading