From 954cdfbc79557627cbb59b15b4dcad942acb6dac Mon Sep 17 00:00:00 2001
From: Bruno Teixeira <bosih50890@emailhost99.com>
Date: Thu, 4 Jun 2020 12:09:29 +0200
Subject: [PATCH] test
---
.../mobilecomputing/pecunia/controller/TripController.java | 2 +-
.../mobilecomputing/pecunia/controller/UserController.java | 4 ++--
.../mobilecomputing/pecunia/repository/TripRepository.java | 2 +-
.../mobilecomputing/pecunia/repository/UserRepository.java | 2 +-
.../pecunia/security/UserDetailsServiceImpl.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Backend/src/main/java/com/mobilecomputing/pecunia/controller/TripController.java b/Backend/src/main/java/com/mobilecomputing/pecunia/controller/TripController.java
index e573d9a..edf6228 100644
--- a/Backend/src/main/java/com/mobilecomputing/pecunia/controller/TripController.java
+++ b/Backend/src/main/java/com/mobilecomputing/pecunia/controller/TripController.java
@@ -15,7 +15,7 @@ public class TripController {
@GetMapping("/getTripById")
public String getTripById(@RequestParam String id){
- return String.valueOf(tripRepository.findById(new ObjectId(id)));
+ return String.valueOf(tripRepository.findById(id));
}
@GetMapping("/getAllTrips")
diff --git a/Backend/src/main/java/com/mobilecomputing/pecunia/controller/UserController.java b/Backend/src/main/java/com/mobilecomputing/pecunia/controller/UserController.java
index 6e302be..6661b51 100644
--- a/Backend/src/main/java/com/mobilecomputing/pecunia/controller/UserController.java
+++ b/Backend/src/main/java/com/mobilecomputing/pecunia/controller/UserController.java
@@ -17,7 +17,7 @@ public class UserController {
@GetMapping("/getById")
public String getUserById(@RequestParam String id){
- return String.valueOf(userRepository.findById(new ObjectId(id)));
+ return String.valueOf(userRepository.findById(id));
}
@GetMapping("/getAll")
@@ -38,6 +38,6 @@ public class UserController {
@DeleteMapping("/deleteUser")
public void deleteUser(@RequestParam String eMail){
- userRepository.deleteById(new ObjectId(eMail));
+ userRepository.deleteById(eMail);
}
}
diff --git a/Backend/src/main/java/com/mobilecomputing/pecunia/repository/TripRepository.java b/Backend/src/main/java/com/mobilecomputing/pecunia/repository/TripRepository.java
index e540fa0..a79b6d7 100644
--- a/Backend/src/main/java/com/mobilecomputing/pecunia/repository/TripRepository.java
+++ b/Backend/src/main/java/com/mobilecomputing/pecunia/repository/TripRepository.java
@@ -4,6 +4,6 @@ import com.mobilecomputing.pecunia.model.Trip;
import org.bson.types.ObjectId;
import org.springframework.data.repository.CrudRepository;
-public interface TripRepository extends CrudRepository<Trip, ObjectId> {
+public interface TripRepository extends CrudRepository<Trip, String> {
}
diff --git a/Backend/src/main/java/com/mobilecomputing/pecunia/repository/UserRepository.java b/Backend/src/main/java/com/mobilecomputing/pecunia/repository/UserRepository.java
index 1d9dfab..d9a18b6 100644
--- a/Backend/src/main/java/com/mobilecomputing/pecunia/repository/UserRepository.java
+++ b/Backend/src/main/java/com/mobilecomputing/pecunia/repository/UserRepository.java
@@ -4,5 +4,5 @@ import com.mobilecomputing.pecunia.model.ApplicationUser;
import org.bson.types.ObjectId;
import org.springframework.data.repository.CrudRepository;
-public interface UserRepository extends CrudRepository<ApplicationUser, ObjectId> {
+public interface UserRepository extends CrudRepository<ApplicationUser, String> {
}
diff --git a/Backend/src/main/java/com/mobilecomputing/pecunia/security/UserDetailsServiceImpl.java b/Backend/src/main/java/com/mobilecomputing/pecunia/security/UserDetailsServiceImpl.java
index d15055b..dca1b95 100644
--- a/Backend/src/main/java/com/mobilecomputing/pecunia/security/UserDetailsServiceImpl.java
+++ b/Backend/src/main/java/com/mobilecomputing/pecunia/security/UserDetailsServiceImpl.java
@@ -25,7 +25,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
@Override
public UserDetails loadUserByUsername(String userEmail) throws UsernameNotFoundException {
System.out.println("loadbyUsername");
- Optional<ApplicationUser> user = userRepository.findById(new ObjectId(userEmail));
+ Optional<ApplicationUser> user = userRepository.findById(userEmail);
if(user ==null){
throw new UsernameNotFoundException(user.toString());
}
--
GitLab