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 pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>edu.tamu.weaver</groupId>
<artifactId>webservice-parent</artifactId>
<version>2.1.1-RC15</version>
<version>2.3.0</version>
</parent>

<properties>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,8 +11,8 @@
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
47 changes: 25 additions & 22 deletions src/main/java/edu/tamu/app/config/AppWebSecurityConfig.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -15,30 +19,29 @@

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

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
}

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<E> extends AbstractSpecification<E> {

Expand Down
Loading
Loading