Changeset 2269653

Timestamp:

02/04/23 01:47:15 (22 months ago)

Author:

DenicaKj <dkorvezir@…>

Branches:

master

Children:

adf250d

Parents:

eb226b2

Message:

First Run No error

Files:

• pom.xml (modified) (4 diffs)
• src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) (2 diffs)
• src/main/java/com/example/moviezone/model/Category.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/Cinema.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/Customer.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/Discount.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/Event.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/Film.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/Projection.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/Projection_Room.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/Salary.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/Seat.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/Ticket.java (modified) (2 diffs)
• src/main/java/com/example/moviezone/model/User.java (modified) (2 diffs)
• src/main/java/com/example/moviezone/model/Work_Hours_Weekly.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/Worker.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/manytomany/CinemaOrganizesEvent.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEvent.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/manytomany/CustomerRatesFilm.java (modified) (1 diff)
• src/main/java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoom.java (modified) (1 diff)

pom.xml

@@ -6 +6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.2</version>
+        <version>2.7.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
@@ -15 +15 @@
     <description>MovieZone</description>
     <properties>
-        <java.version>17</java.version>
+        <java.version>17.0.5</java.version>
+        <spring-security.version>5.6.1</spring-security.version>
     </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
         </dependency>
         <dependency>
@@ -37 +41 @@
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
-            <version>3.0.4.RELEASE</version>
-        </dependency>
+
 
         <dependency>
@@ -63 +63 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>3.2.0.RELEASE</version>
         </dependency>
     </dependencies>

src/main/java/com/example/moviezone/config/WebSecurityConfig.java

@@ -9 +9 @@
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 
 @Configuration
 @EnableWebSecurity
+@EnableWebMvc
 @EnableGlobalMethodSecurity(securedEnabled = true, prePostEnabled = true)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@@ -42 +44 @@
                 .logout()
                 .logoutUrl("/logout")
+                .clearAuthentication(true)
                 .invalidateHttpSession(true)
                 .deleteCookies("JSESSIONID")

src/main/java/com/example/moviezone/model/Category.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import javax.management.relation.Role;
+import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Collection;
+
 
 import java.util.Objects;

src/main/java/com/example/moviezone/model/Cinema.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+
+import javax.persistence.*;
+
 
 @Entity

src/main/java/com/example/moviezone/model/Customer.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.PrimaryKeyJoinColumn;
-import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.Hibernate;
 import org.springframework.security.core.GrantedAuthority;
 
+import javax.persistence.Entity;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.Table;
+import java.time.LocalDate;
 import java.util.Collection;
 import java.util.Collections;
-
+import java.util.Objects;
 @Entity
 @Getter

src/main/java/com/example/moviezone/model/Discount.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
 
+import javax.management.relation.Role;
+import javax.persistence.*;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Collection;
+
 
 @Entity

src/main/java/com/example/moviezone/model/Event.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+
+import javax.persistence.*;
+
 
 import java.time.LocalDate;

src/main/java/com/example/moviezone/model/Film.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+
+import javax.persistence.*;
+
 
 import java.time.LocalDate;

src/main/java/com/example/moviezone/model/Projection.java

@@ -2 +2 @@
 
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/example/moviezone/model/Projection_Room.java

@@ -2 +2 @@
 
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/example/moviezone/model/Salary.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/example/moviezone/model/Seat.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/example/moviezone/model/Ticket.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -18 +19 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    Integer id_ticket;
+    int id_ticket;
 
-    Integer price;
+    long price;
     LocalDate date_reserved;
 

src/main/java/com/example/moviezone/model/User.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.*;
+
 import lombok.Getter;
 import lombok.Setter;
@@ -9 +9 @@
 
 import javax.management.relation.Role;
+import javax.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;

src/main/java/com/example/moviezone/model/Work_Hours_Weekly.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/example/moviezone/model/Worker.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.*;
+import javax.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/example/moviezone/model/manytomany/CinemaOrganizesEvent.java

@@ -1 +1 @@
 package com.example.moviezone.model.manytomany;
-
-import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import javax.management.relation.Role;
+import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Collection;
+
 
 @Entity

src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java

@@ -1 +1 @@
 package com.example.moviezone.model.manytomany;
 
-import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import javax.management.relation.Role;
+import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Collection;
 
 @Entity

src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEvent.java

@@ -1 +1 @@
 package com.example.moviezone.model.manytomany;
 
-import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import javax.management.relation.Role;
+import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Collection;
+
 
 @Entity

src/main/java/com/example/moviezone/model/manytomany/CustomerRatesFilm.java

@@ -1 +1 @@
 package com.example.moviezone.model.manytomany;
-
-import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import javax.management.relation.Role;
+import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Collection;
 
 @Entity

src/main/java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoom.java

@@ -1 +1 @@
 package com.example.moviezone.model.manytomany;
 
-import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import javax.management.relation.Role;
+import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Collection;
 
 @Entity