Merge branch 'merge'

server/src/main/java/com/vpr/server/ServerApplication.java

@@ -1,4 +1,5 @@
- package com.vpr.server;
+//Marc Beyer//
+package com.vpr.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

server/src/main/java/com/vpr/server/controller/AuthController.java

@@ -1,10 +1,8 @@
+//Marco Kühn//
 package com.vpr.server.controller;
 
 import com.vpr.server.data.User;
 import com.vpr.server.repository.UserRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 public class AuthController {
 

server/src/main/java/com/vpr/server/controller/EventController.java

@@ -1,9 +1,10 @@
+//Marc Beyer//
 package com.vpr.server.controller;
 
+import com.vpr.server.dao.interfaces.EventDAO;
 import com.vpr.server.data.Event;
 import com.vpr.server.data.User;
 import com.vpr.server.data.UserEvent;
-import com.vpr.server.dao.interfaces.EventDAO;
 import com.vpr.server.json.JSONMapper;
 import com.vpr.server.json.Validator;
 import com.vpr.server.repository.EventRepository;

server/src/main/java/com/vpr/server/controller/MainController.java

@@ -1,8 +1,6 @@
+//Marc Beyer//
 package com.vpr.server.controller;
 
-import com.vpr.server.data.Event;
-import com.vpr.server.data.User;
-import com.vpr.server.data.UserEvent;
 import com.vpr.server.repository.EventRepository;
 import com.vpr.server.repository.UserEventRepository;
 import com.vpr.server.repository.UserRepository;
@@ -10,25 +8,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.sql.Time;
-import java.text.SimpleDateFormat;
-
 @Controller // This means that this class is a Controller
 @RequestMapping(path = "/vpr") // This means URL's start with /demo (after Application path)
 public class MainController {
 
-    // This means to get the bean called userRepository
-    // Which is auto-generated by Spring, we will use it to handle the data
-    @Autowired
-    private UserRepository userRepository;
-    @Autowired
-    private EventRepository eventRepository;
-    @Autowired
-    private UserEventRepository userEventRepository;
-
     @GetMapping(path = "/status-test")
     public String statusTest(){
         throw new ResponseStatusException(HttpStatus.I_AM_A_TEAPOT, "TestTestTest");

server/src/main/java/com/vpr/server/controller/UserController.java

@@ -1,7 +1,7 @@
+//Marc Beyer//
 package com.vpr.server.controller;
 
 import com.vpr.server.dao.interfaces.UserDAO;
-import com.vpr.server.data.Event;
 import com.vpr.server.data.User;
 import com.vpr.server.json.JSONMapper;
 import com.vpr.server.repository.UserRepository;

server/src/main/java/com/vpr/server/dao/implementation/EventDAOImplementation.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.dao.implementation;
 
 import com.vpr.server.dao.interfaces.EventDAO;

server/src/main/java/com/vpr/server/dao/implementation/UserDAOImplementation.java

@@ -1,7 +1,7 @@
+//Marc Beyer//
 package com.vpr.server.dao.implementation;
 
 import com.vpr.server.dao.interfaces.UserDAO;
-import com.vpr.server.data.Event;
 import com.vpr.server.data.User;
 import org.springframework.stereotype.Repository;
 

server/src/main/java/com/vpr/server/dao/interfaces/EventDAO.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.dao.interfaces;
 
 import com.vpr.server.data.Event;

server/src/main/java/com/vpr/server/dao/interfaces/UserDAO.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.dao.interfaces;
 
 import com.vpr.server.data.User;

server/src/main/java/com/vpr/server/data/DateEvent.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.data;
 
 import java.sql.Date;

server/src/main/java/com/vpr/server/data/Event.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.data;
 
 import javax.persistence.*;

server/src/main/java/com/vpr/server/data/User.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.data;
 
 import javax.persistence.*;

server/src/main/java/com/vpr/server/data/UserEvent.java

@@ -1,8 +1,8 @@
+//Marc Beyer//
 package com.vpr.server.data;
 
 import javax.persistence.*;
 import java.sql.Date;
-import java.util.Calendar;
 
 // @Entity creates a table out of this class with Hibernate
 // @Table defines the table-name

server/src/main/java/com/vpr/server/data/UserEventId.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.data;
 
 import java.io.Serializable;

server/src/main/java/com/vpr/server/json/JSONMapper.java

@@ -1,3 +1,4 @@
+//Marco Kühn//
 package com.vpr.server.json;
 
 import com.vpr.server.data.Event;
@@ -5,7 +6,6 @@ import com.vpr.server.data.User;
 import com.vpr.server.data.UserEvent;
 
 import java.sql.Time;
-
 import java.util.ArrayList;
 import java.util.List;
 

server/src/main/java/com/vpr/server/json/Validator.java

@@ -1,9 +1,6 @@
+//Marc Beyer//
 package com.vpr.server.json;
 
-import com.vpr.server.data.UserEvent;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
 import java.sql.Date;
 import java.sql.Time;
 import java.text.SimpleDateFormat;

server/src/main/java/com/vpr/server/repository/EventRepository.java

@@ -1,18 +1,12 @@
+//Marc Beyer//
 package com.vpr.server.repository;
 
 import com.vpr.server.data.Event;
-import com.vpr.server.data.UserEvent;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
-import javax.persistence.ColumnResult;
-import javax.persistence.ConstructorResult;
-import javax.persistence.NamedNativeQuery;
-import javax.persistence.SqlResultSetMapping;
 import javax.transaction.Transactional;
-import java.util.List;
-import java.util.Optional;
 
 // This will be AUTO IMPLEMENTED by Spring into a Bean called eventRepository
 // CRUD refers Create, Read, Update, Delete

server/src/main/java/com/vpr/server/repository/UserEventRepository.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.repository;
 
 import com.vpr.server.data.UserEvent;

server/src/main/java/com/vpr/server/repository/UserRepository.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.repository;
 
 import com.vpr.server.data.User;

server/src/main/java/com/vpr/server/security/Hasher.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package com.vpr.server.security;
 
 import javax.crypto.SecretKeyFactory;

server/src/main/java/com/vpr/server/security/Token.java

@@ -1,14 +1,16 @@
+//Marc Beyer//
 package com.vpr.server.security;
 
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.security.Keys;
+
 import java.security.Key;
 
 public class Token {
 
-    private static Key KEY = Keys.secretKeyFor(SignatureAlgorithm.HS256);
+    private static final Key KEY = Keys.secretKeyFor(SignatureAlgorithm.HS256);
 
     public static String Generate(String subject){
         return Jwts.builder().setSubject(subject).signWith(KEY).compact();