Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/co/jp/app/common/ApiResponse.java
#	src/main/java/co/jp/app/controller/UserController.java

src/main/java/co/jp/app/controller/DownloadController.java

@@ -14,10 +14,10 @@ public class DownloadController {
 	@Autowired
 	private PetService service;
 
-	@GetMapping("/api/dogs/pet")
+	@GetMapping("/api/dogs/download")
 	public String downloadById(@RequestParam List<Integer> id) {
 	service.getPetByID(id);
-		return "pet";
+		return "download";
 	}
 }
 

src/main/java/co/jp/app/repository/UserRepository.java

@@ -1,13 +1,12 @@
 package co.jp.app.repository;
 
 
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.query.Param;
+import java.util.Optional;
 
-import co.jp.app.entity.UserEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import java.util.Optional;
+import co.jp.app.entity.UserEntity;
 
 @Repository
 public interface UserRepository extends JpaRepository<UserEntity, Integer> {

src/main/java/co/jp/app/service/UserService.java

@@ -3,9 +3,6 @@ package co.jp.app.service;
 import java.util.Collection;
 import java.util.Collections;
 
-import co.jp.app.dto.RegistrationDto;
-import co.jp.app.entity.UserEntity;
-import co.jp.app.repository.UserRepository;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -15,9 +12,12 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
-
 import org.springframework.transaction.annotation.Transactional;
 
+import co.jp.app.dto.RegistrationDto;
+import co.jp.app.entity.UserEntity;
+import co.jp.app.repository.UserRepository;
+
 @Service
 public class UserService implements UserDetailsService {
 
@@ -50,16 +50,17 @@ public class UserService implements UserDetailsService {
 		UserEntity userEntity = userRepository.findByEmail(email)
 				.orElseThrow(() -> new UsernameNotFoundException(email + " not found"));
 
-		Collection<? extends GrantedAuthority> authorities = Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER"));
+		Collection<? extends GrantedAuthority> authorities = Collections
+				.singletonList(new SimpleGrantedAuthority("ROLE_USER"));
 
 		return new User(
 				userEntity.getEmail(),
 				userEntity.getPassword(),
-				true,                // enabled
-				true,                       // accountNonExpired
-				true,                       // credentialsNonExpired
-				true,                       // accountNonLocked
-				authorities                 // role
+				true, // enabled
+				true, // accountNonExpired
+				true, // credentialsNonExpired
+				true, // accountNonLocked
+				authorities // role
 		);
 	}
-}
+}