From 10a01f25295bde69d7cbcc0b70e09feac40497c5 Mon Sep 17 00:00:00 2001 From: smriti Date: Sat, 11 Sep 2021 22:01:59 +0530 Subject: [PATCH 1/4] Initial commit --- src/main/java/com/uditagarwal/controller/LockerController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/uditagarwal/controller/LockerController.java b/src/main/java/com/uditagarwal/controller/LockerController.java index dfce2ea..27635c2 100644 --- a/src/main/java/com/uditagarwal/controller/LockerController.java +++ b/src/main/java/com/uditagarwal/controller/LockerController.java @@ -20,6 +20,8 @@ public LockerController(@NonNull final LockerService lockerService, this.otpService = otpService; } + //testing + public Locker createLocker(@NonNull final String lockerId) { return lockerService.createLocker(lockerId); } From 64c1d6350602fac2f4caf6d11666e580d77f1caa Mon Sep 17 00:00:00 2001 From: smriti Date: Sat, 11 Sep 2021 22:08:36 +0530 Subject: [PATCH 2/4] second commit --- src/main/java/com/uditagarwal/controller/LockerController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/uditagarwal/controller/LockerController.java b/src/main/java/com/uditagarwal/controller/LockerController.java index 27635c2..2c1ea86 100644 --- a/src/main/java/com/uditagarwal/controller/LockerController.java +++ b/src/main/java/com/uditagarwal/controller/LockerController.java @@ -22,6 +22,8 @@ public LockerController(@NonNull final LockerService lockerService, //testing + //testing 2 + public Locker createLocker(@NonNull final String lockerId) { return lockerService.createLocker(lockerId); } From 37dbb1f8db0b98e19768330b6b3295b200d30141 Mon Sep 17 00:00:00 2001 From: smriti1194 <88584913+smriti1194@users.noreply.github.com> Date: Sat, 11 Sep 2021 22:24:49 +0530 Subject: [PATCH 3/4] tedegwfj --- src/main/java/com/uditagarwal/controller/LockerController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/uditagarwal/controller/LockerController.java b/src/main/java/com/uditagarwal/controller/LockerController.java index 2c1ea86..ea2c98e 100644 --- a/src/main/java/com/uditagarwal/controller/LockerController.java +++ b/src/main/java/com/uditagarwal/controller/LockerController.java @@ -29,6 +29,7 @@ public Locker createLocker(@NonNull final String lockerId) { } public Slot createSlot(@NonNull final Locker locker, @NonNull final Size slotSize) { + //12132142 return lockerService.createSlot(locker, slotSize); } From 241dd482b28ea672491956e652838afbd227d562 Mon Sep 17 00:00:00 2001 From: smriti Date: Sat, 11 Sep 2021 22:25:51 +0530 Subject: [PATCH 4/4] checking conflict --- src/main/java/com/uditagarwal/controller/LockerController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/uditagarwal/controller/LockerController.java b/src/main/java/com/uditagarwal/controller/LockerController.java index 2c1ea86..8de9b39 100644 --- a/src/main/java/com/uditagarwal/controller/LockerController.java +++ b/src/main/java/com/uditagarwal/controller/LockerController.java @@ -29,6 +29,7 @@ public Locker createLocker(@NonNull final String lockerId) { } public Slot createSlot(@NonNull final Locker locker, @NonNull final Size slotSize) { + //ldjlewlfjew return lockerService.createSlot(locker, slotSize); }