Mysaa/misael
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the depedencies and gradlew and cleaned code

Browse Source
This commit is contained in:
Mysaa
2025-03-03 16:05:30 +01:00
parent ab84002276
commit f220c187c1
14 changed files with 172 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/bernard/misael/CustomUserDetailsService.java
+4 -9
View File
@@ -1,7 +1,9 @@
package com.bernard.misael;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Stream;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -12,13 +14,6 @@ import com.bernard.misael.model.Role;
import com.bernard.misael.model.User;
import com.bernard.misael.repository.UserRepository;
import java.util.Collection;
import java.util.EnumSet;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Service
public class CustomUserDetailsService implements UserDetailsService {
src/main/java/com/bernard/misael/model/Answer.java
-2
View File
@@ -6,13 +6,11 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import jakarta.persistence.Column;
import jakarta.persistence.Convert;
import jakarta.persistence.Converter;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.Lob;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import lombok.AllArgsConstructor;
src/main/java/com/bernard/misael/model/QuizzForm.java
-2
View File
@@ -1,7 +1,5 @@
package com.bernard.misael.model;
import org.hibernate.annotations.GeneratedColumn;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
src/main/java/com/bernard/misael/model/Role.java
+18 -7
View File
@@ -1,18 +1,29 @@
package com.bernard.misael.model;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.util.Collection;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import org.springframework.security.core.GrantedAuthority;
import jakarta.persistence.CollectionTable;
import jakarta.persistence.Column;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
src/main/java/com/bernard/misael/model/User.java
+12 -3
View File
@@ -4,9 +4,18 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import org.hibernate.cache.spi.support.AbstractReadWriteAccess.Item;
import jakarta.persistence.*;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.JoinTable;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
src/main/java/com/bernard/misael/service/UserServiceImpl.java
+3 -9
View File
@@ -1,29 +1,23 @@
package com.bernard.misael.service;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import com.bernard.misael.model.Role;
import com.bernard.misael.model.User;
import com.bernard.misael.repository.RoleRepository;
import com.bernard.misael.repository.UserRepository;
import com.bernard.misael.service.dto.UserDto;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@Service
public class UserServiceImpl implements UserService {
private UserRepository userRepository;
private RoleRepository roleRepository;
private PasswordEncoder passwordEncoder;
public UserServiceImpl(UserRepository userRepository,
RoleRepository roleRepository,
PasswordEncoder passwordEncoder) {
this.userRepository = userRepository;
this.roleRepository = roleRepository;
this.passwordEncoder = passwordEncoder;
}
src/main/java/com/bernard/misael/service/dto/UserDto.java
-1
View File
@@ -1,6 +1,5 @@
package com.bernard.misael.service.dto;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.Getter;
src/main/java/com/bernard/misael/web/QuestionsController.java
+2 -8
View File
@@ -45,8 +45,6 @@ public class QuestionsController {
User u = null;
if (p!=null)
u = ur.findByName(p.getName());
System.out.println("Loaded as user "+u);
if(u!=null) {
model.addAttribute("quizz",u.getMyQuizzs());
}
@@ -63,14 +61,10 @@ public class QuestionsController {
@GetMapping("/form/{q}")
public String formpage(@PathVariable("q") long quizzId, Principal p, Model m) {
User u = null;
if (p!=null)
u = ur.findByName(p.getName());
else
if (p==null)
return "redirect:/login?restricted";
//XXX test that user can answer quizz
m.addAttribute("formid", quizzId);
Quizz q = qrepo.getById(quizzId);
Quizz q = qrepo.getReferenceById(quizzId);
m.addAttribute("quizzLength",q.getQuestionCount());
return "form";