Skip to content

Commit

Permalink
optimized imports
Browse files Browse the repository at this point in the history
  • Loading branch information
Max Handke committed Jan 8, 2024
1 parent b94b013 commit 6c34dad
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 37 deletions.
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
package com.example.kickevent.controller;

import com.example.kickevent.model.Comment;
import com.example.kickevent.repositories.CommentRepository;
import com.example.kickevent.repositories.EventRepository;
import com.example.kickevent.services.CommentService;
import com.example.kickevent.services.EventService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestWrapper;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;


@CrossOrigin(origins = "*", allowedHeaders = "*")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;


import java.util.List;

import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.example.kickevent.controller;

import com.example.kickevent.model.*;
import com.example.kickevent.exceptions.TokenRefreshException;
import com.example.kickevent.security.*;
import com.example.kickevent.model.*;
import com.example.kickevent.security.JwtTokenUtil;
import com.example.kickevent.services.RefreshTokenService;
import com.example.kickevent.services.UserService;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -11,13 +11,11 @@
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.DisabledException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.List;
import java.util.logging.Logger;

@RestController
@CrossOrigin(origins = "*", allowedHeaders = "*")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.kickevent.controller;

import com.example.kickevent.model.User;
import com.example.kickevent.exceptions.UserNotFoundException;
import com.example.kickevent.model.User;
import com.example.kickevent.services.UserService;
import org.springframework.hateoas.EntityModel;
import org.springframework.hateoas.server.mvc.WebMvcLinkBuilder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package com.example.kickevent.exceptions;

import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestControllerAdvice;

@RestControllerAdvice
public class EventNotFoundAdvice {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.example.kickevent.exceptions;

import org.apache.coyote.Response;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package com.example.kickevent.exceptions;

import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestControllerAdvice;

@RestControllerAdvice
public class UserNotFoundAdvice {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package com.example.kickevent.exceptions;

import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestControllerAdvice;

@RestControllerAdvice
public class UsernameAlreadyTakenAdvice {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/example/kickevent/model/Comment.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.example.kickevent.model;

import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.*;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/example/kickevent/model/Event.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@

package com.example.kickevent.model;

import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.*;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;

import javax.persistence.*;
import java.util.Date;
import java.util.List;

@Entity
@Data
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/example/kickevent/model/User.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.example.kickevent.model;



import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;

import javax.persistence.*;
import java.util.ArrayList;

import java.util.List;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.example.kickevent.model.Event;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;
import java.util.Optional;

public interface EventRepository extends JpaRepository<Event,Long> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.example.kickevent.model.User;
import org.springframework.data.jpa.repository.JpaRepository;


import java.util.List;
import java.util.Optional;
/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.example.kickevent.exceptions.JwtTokenExpiredException;
import com.example.kickevent.services.UserService;
import io.jsonwebtoken.ExpiredJwtException;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@

import com.example.kickevent.model.Comment;
import com.example.kickevent.repositories.CommentRepository;
import com.example.kickevent.repositories.EventRepository;
import com.example.kickevent.repositories.UserRepository;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.*;

import java.time.Instant;
import java.util.Date;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.example.kickevent.services;

import com.example.kickevent.model.Event;
import com.example.kickevent.model.User;
import com.example.kickevent.repositories.EventRepository;
import com.example.kickevent.repositories.UserRepository;
import org.slf4j.Logger;
Expand All @@ -11,11 +10,9 @@
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Service;

import java.security.Principal;
import java.time.Instant;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Optional;

@Service
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.example.kickevent.services;


import com.example.kickevent.exceptions.TokenRefreshException;
import com.example.kickevent.model.RefreshToken;
import com.example.kickevent.repositories.RefreshTokenRepository;
import com.example.kickevent.repositories.UserRepository;
import com.example.kickevent.exceptions.TokenRefreshException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/example/kickevent/services/UserService.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.example.kickevent.services;

import com.example.kickevent.exceptions.UsernameAlreadyTakenException;
import com.example.kickevent.model.Role;
import com.example.kickevent.model.User;
import com.example.kickevent.exceptions.UsernameAlreadyTakenException;
import com.example.kickevent.repositories.RefreshTokenRepository;
import com.example.kickevent.repositories.RoleRepository;
import com.example.kickevent.repositories.UserRepository;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -19,10 +18,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

;
import java.util.*;
import java.util.stream.Collectors;

;

@Service
public class UserService implements UserDetailsService {

Expand Down

0 comments on commit 6c34dad

Please sign in to comment.