About to change the Chat class

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Config/AuditingConfig.java

@@ -20,22 +20,23 @@ public class AuditingConfig {
     public AuditorAware<Long> auditorProvider() {
         return new SpringSecurityAuditAwareImpl();
     }
-}
 
-class SpringSecurityAuditAwareImpl implements AuditorAware<Long> {
 
-    @Override
-    public Optional<Long> getCurrentAuditor() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+    class SpringSecurityAuditAwareImpl implements AuditorAware<Long> {
 
-        if (authentication == null ||
-                !authentication.isAuthenticated() ||
-                authentication instanceof AnonymousAuthenticationToken) {
-            return Optional.empty();
-        }
+        @Override
+        public Optional<Long> getCurrentAuditor() {
+            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
-        UserPrincipal userPrincipal = (UserPrincipal) authentication.getPrincipal();
+            if (authentication == null ||
+                    !authentication.isAuthenticated() ||
+                    authentication instanceof AnonymousAuthenticationToken) {
+                return Optional.empty();
+            }
 
-        return Optional.ofNullable(userPrincipal.getId());
+            UserPrincipal userPrincipal = (UserPrincipal) authentication.getPrincipal();
+
+            return Optional.ofNullable(userPrincipal.getId());
+        }
     }
 }

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Model/Chat.java

@@ -1,52 +1,52 @@
-//package ZipTeamOrange.model;
-//
-//import ZipTeamOrange.model.Message;
-//import ZipTeamOrange.model.User;
-//import javax.persistence.*;
-//import java.util.Set;
-//
-//@Entity
-//public class Chat {
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.IDENTITY)
-//    private Long id;
-//    private String name;
-//
-//    @OneToMany(mappedBy = "chat")
-//    private Set<Message> messages;
-//
-//    @ManyToMany(mappedBy = "chat")
-//    private Set<User> users;
-//
-//    public Chat(String name, Set<User> users) {
-//        this.name = name;
-//        this.users = users;
-//    }
-//
-//    public Chat(){}
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getName() {
-//        return name;
-//    }
-//
-//    public void setName(String name) {
-//        this.name = name;
-//    }
-//
-//    public Set<User> getUsers() {
-//        return users;
-//    }
-//
-//    public void setUsers(Set<User> users) {
-//        this.users = users;
-//    }
-//}
+package ZipTeamOrange.model;
+
+import ZipTeamOrange.model.Message;
+import ZipTeamOrange.model.User;
+import javax.persistence.*;
+import java.util.Set;
+
+@Entity
+public class Chat {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String name;
+
+    @OneToMany(mappedBy = "chat")
+    private Set<Message> messages;
+
+    @ManyToMany(mappedBy = "chat")
+    private Set<User> users;
+
+    public Chat(String name, Set<User> users) {
+        this.name = name;
+        this.users = users;
+    }
+
+    public Chat(){}
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Set<User> getUsers() {
+        return users;
+    }
+
+    public void setUsers(Set<User> users) {
+        this.users = users;
+    }
+}