From 297c5f474d8b14b056ea1c946022bc0a6f8a7153 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 00:45:06 +0530 Subject: [PATCH 1/6] Create UserService.java Signed-off-by: jeet041 --- .../samples/petclinic/UserService.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/main/java/org/springframework/samples/petclinic/UserService.java diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java new file mode 100644 index 000000000..f526238e2 --- /dev/null +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -0,0 +1,14 @@ +// File: UserService.java +public class UserService { + public String getUserName(int userId) { + return "User" + userId; + } + + public boolean isUserActive(int userId) { + return true; + } + + public void updateUserStatus(int userId, boolean isActive) { + // update logic here + } +} From 809c26334fbba0f7f5f0d17de871c06da4374424 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 00:47:49 +0530 Subject: [PATCH 2/6] Update UserService.java Signed-off-by: jeet041 --- .../samples/petclinic/UserService.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index f526238e2..a834ae849 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -1,14 +1,23 @@ // File: UserService.java public class UserService { public String getUserName(int userId) { - return "User" + userId; + return "MainBranchUser#" + userId; // Different logic } public boolean isUserActive(int userId) { - return true; + return checkUserStatusFromDB(userId); // Pull from DB now } public void updateUserStatus(int userId, boolean isActive) { - // update logic here + logStatusUpdate(userId, isActive); + // Update in DB + } + + private boolean checkUserStatusFromDB(int userId) { + return true; // stub + } + + private void logStatusUpdate(int userId, boolean isActive) { + System.out.println("Main Branch: Logging status update for user " + userId); } } From 88533188348fa22d09019d7d21542cb18a5a8c78 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 01:07:09 +0530 Subject: [PATCH 3/6] Update UserService.java Signed-off-by: jeet041 --- .../samples/petclinic/UserService.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index a834ae849..c834c3762 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -1,23 +1,21 @@ -// File: UserService.java public class UserService { public String getUserName(int userId) { - return "MainBranchUser#" + userId; // Different logic + return "User" + userId; } public boolean isUserActive(int userId) { - return checkUserStatusFromDB(userId); // Pull from DB now + return true; } public void updateUserStatus(int userId, boolean isActive) { - logStatusUpdate(userId, isActive); - // Update in DB + // update logic here } - private boolean checkUserStatusFromDB(int userId) { - return true; // stub + public void deleteUser(int userId) { + // deletion logic } - private void logStatusUpdate(int userId, boolean isActive) { - System.out.println("Main Branch: Logging status update for user " + userId); + public void notifyUser(int userId, String message) { + System.out.println("Sending message: " + message); } } From 5a82ae3a41e2ceb1f724aff8cf07e8a5cc55cc3b Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 01:08:36 +0530 Subject: [PATCH 4/6] Update UserService.java Signed-off-by: jeet041 --- .../samples/petclinic/UserService.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index c834c3762..9e57d5d1d 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -1,21 +1,28 @@ public class UserService { public String getUserName(int userId) { - return "User" + userId; + return "[Main] User#" + userId; } public boolean isUserActive(int userId) { + System.out.println("Main branch: checking DB for user activity"); return true; } public void updateUserStatus(int userId, boolean isActive) { - // update logic here + System.out.println("Main branch: logging status update"); + // update logic to DB } public void deleteUser(int userId) { + logDeletion(userId); // deletion logic } public void notifyUser(int userId, String message) { - System.out.println("Sending message: " + message); + System.out.println("[Main] Sending message to user: " + message); + } + + private void logDeletion(int userId) { + System.out.println("Logging deletion of user " + userId); } } From 962375a7fe1eda36a3b002476539b2ab34baab7a Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 01:11:38 +0530 Subject: [PATCH 5/6] Update UserService.java Signed-off-by: jeet041 --- .../samples/petclinic/UserService.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index 9e57d5d1d..cd89d5424 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -1,28 +1,21 @@ public class UserService { public String getUserName(int userId) { - return "[Main] User#" + userId; + return "User" + userId; } public boolean isUserActive(int userId) { - System.out.println("Main branch: checking DB for user activity"); return true; } public void updateUserStatus(int userId, boolean isActive) { - System.out.println("Main branch: logging status update"); - // update logic to DB + // Update user status in DB + } + + public void notifyUser(int userId) { + // Send notification } public void deleteUser(int userId) { - logDeletion(userId); - // deletion logic - } - - public void notifyUser(int userId, String message) { - System.out.println("[Main] Sending message to user: " + message); - } - - private void logDeletion(int userId) { - System.out.println("Logging deletion of user " + userId); + // Delete user logic } } From 7c693ec2dfbae251aba1b084206953d2d5d5981a Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 01:13:05 +0530 Subject: [PATCH 6/6] Update UserService.java Signed-off-by: jeet041 --- .../samples/petclinic/UserService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index cd89d5424..fc1cf6a57 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -1,21 +1,26 @@ public class UserService { public String getUserName(int userId) { - return "User" + userId; + return "Main: User_" + userId; } public boolean isUserActive(int userId) { + System.out.println("Checking DB for active user"); return true; } public void updateUserStatus(int userId, boolean isActive) { - // Update user status in DB + System.out.println("Main branch: status set to " + isActive); } public void notifyUser(int userId) { - // Send notification + System.out.println("Main: sending notification to user " + userId); } public void deleteUser(int userId) { - // Delete user logic + logDeletion(userId); + } + + private void logDeletion(int userId) { + System.out.println("Main: user " + userId + " deleted"); } }