mirror of
https://github.com/spring-projects/spring-petclinic.git
synced 2025-07-18 05:25:50 +00:00
Auto-merged using Claude
This commit is contained in:
commit
d5b73b42fa
1 changed files with 7 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
||||||
public class UserService {
|
public class UserService {
|
||||||
public String getUserName(int userId) {
|
public String getUserName(int userId) {
|
||||||
return "Feature: User#" + userId;
|
return "User_" + userId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isUserActive(int userId) {
|
public boolean isUserActive(int userId) {
|
||||||
|
@ -17,6 +17,10 @@ public class UserService {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void deleteUser(int userId) {
|
public void deleteUser(int userId) {
|
||||||
System.out.println("Feature branch: deleting user " + userId);
|
logDeletion(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void logDeletion(int userId) {
|
||||||
|
System.out.println("Main: user " + userId + " deleted");
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue