Blazej 3 роки тому
батько
коміт
d0de9d9321

+ 4 - 1
src/main/java/com/example/plantsforyou/appuser/AppUserController.java

@@ -14,7 +14,10 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
 import static org.springframework.http.HttpStatus.FORBIDDEN;

+ 1 - 5
src/main/java/com/example/plantsforyou/cart/CartController.java

@@ -3,12 +3,11 @@ package com.example.plantsforyou.cart;
 import com.example.plantsforyou.appuser.AppUser;
 import com.example.plantsforyou.appuser.AppUserService;
 import com.example.plantsforyou.dto.AddAllToCartDto;
-import com.example.plantsforyou.dto.CartDto;
 import com.example.plantsforyou.dto.AddToCartDto;
+import com.example.plantsforyou.dto.CartDto;
 import com.example.plantsforyou.exceptions.RejectedRequestException;
 import com.example.plantsforyou.plant.Plant;
 import com.example.plantsforyou.plant.PlantService;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -16,9 +15,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @RestController
 @RequestMapping("api/v1/cart")
 public class CartController {

+ 1 - 1
src/main/java/com/example/plantsforyou/cart/CartService.java

@@ -1,8 +1,8 @@
 package com.example.plantsforyou.cart;
 
 import com.example.plantsforyou.appuser.AppUser;
-import com.example.plantsforyou.dto.CartDto;
 import com.example.plantsforyou.dto.AddToCartDto;
+import com.example.plantsforyou.dto.CartDto;
 import com.example.plantsforyou.dto.ItemCartDto;
 import com.example.plantsforyou.exceptions.RejectedRequestException;
 import com.example.plantsforyou.plant.Plant;

+ 0 - 1
src/main/java/com/example/plantsforyou/dto/AddAllToCartDto.java

@@ -1,7 +1,6 @@
 package com.example.plantsforyou.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.thoughtworks.qdox.model.expression.Add;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 0 - 2
src/main/java/com/example/plantsforyou/dto/AddToCartDto.java

@@ -1,7 +1,5 @@
 package com.example.plantsforyou.dto;
 
-import com.example.plantsforyou.cart.Cart;
-import com.example.plantsforyou.plant.Plant;
 import com.sun.istack.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 0 - 1
src/main/java/com/example/plantsforyou/dto/CartDto.java

@@ -1,6 +1,5 @@
 package com.example.plantsforyou.dto;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

+ 0 - 7
src/main/java/com/example/plantsforyou/filter/CustomAuthenticationFilter.java

@@ -5,23 +5,17 @@ import com.auth0.jwt.algorithms.Algorithm;
 import com.example.plantsforyou.appuser.AppUser;
 import com.example.plantsforyou.appuser.LoginCredentials;
 import com.example.plantsforyou.oAuth.oAuthService;
-import com.example.plantsforyou.registration.RegistrationService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.stereotype.Component;
 import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.SpringBeanAutowiringSupport;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 import javax.servlet.FilterChain;
@@ -34,7 +28,6 @@ import java.security.GeneralSecurityException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;

+ 0 - 10
src/main/java/com/example/plantsforyou/oAuth/oAuthService.java

@@ -1,25 +1,15 @@
 package com.example.plantsforyou.oAuth;
 
 import com.example.plantsforyou.appuser.AppUser;
-import com.example.plantsforyou.appuser.AppUserRepository;
 import com.example.plantsforyou.appuser.AppUserRole;
-import com.example.plantsforyou.filter.CustomAuthenticationFilter;
 import com.example.plantsforyou.appuser.AppUserService;
 import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken;
 import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier;
-import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.gson.GsonFactory;
-import lombok.AllArgsConstructor;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.Collections;

+ 0 - 1
src/main/java/com/example/plantsforyou/order/Order.java

@@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import lombok.ToString;
 
 import javax.persistence.*;
 import java.util.Date;

+ 4 - 1
src/main/java/com/example/plantsforyou/order/OrderController.java

@@ -8,7 +8,10 @@ import com.example.plantsforyou.exceptions.RejectedRequestException;
 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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 

+ 0 - 2
src/main/java/com/example/plantsforyou/plant/PlantService.java

@@ -1,10 +1,8 @@
 package com.example.plantsforyou.plant;
 
 import com.example.plantsforyou.exceptions.RejectedRequestException;
-import org.hibernate.FetchNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.security.web.firewall.RequestRejectedException;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

+ 0 - 1
src/main/java/com/example/plantsforyou/security/config/WebSecurityConfig.java

@@ -20,7 +20,6 @@ import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
-
 import java.util.Arrays;
 
 import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS;