From cfab86b94a30113049976d6d62e163a6da3c6e62 Mon Sep 17 00:00:00 2001 From: ScarletRedMan Date: Thu, 11 Jan 2024 18:27:11 +0700 Subject: [PATCH] Moved package for pickers --- .../impl/collection/QueuedLinkedList.java | 8 +++++++- .../{service => repository}/impl/picker/ItemWrapper.java | 4 ++-- .../{service => repository}/impl/picker/Picker.java | 2 +- .../{service => repository}/impl/picker/RoomWrapper.java | 7 ++++--- .../impl/picker/SequentialFillingPicker.java | 2 +- .../picker/collection/QueuedLinkedListTests.java | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) rename app/src/main/java/ru/dragonestia/picker/{service => repository}/impl/collection/QueuedLinkedList.java (93%) rename app/src/main/java/ru/dragonestia/picker/{service => repository}/impl/picker/ItemWrapper.java (86%) rename app/src/main/java/ru/dragonestia/picker/{service => repository}/impl/picker/Picker.java (75%) rename app/src/main/java/ru/dragonestia/picker/{service => repository}/impl/picker/RoomWrapper.java (76%) rename app/src/main/java/ru/dragonestia/picker/{service => repository}/impl/picker/SequentialFillingPicker.java (95%) diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/collection/QueuedLinkedList.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/collection/QueuedLinkedList.java similarity index 93% rename from app/src/main/java/ru/dragonestia/picker/service/impl/collection/QueuedLinkedList.java rename to app/src/main/java/ru/dragonestia/picker/repository/impl/collection/QueuedLinkedList.java index eac544e..f77b8e5 100644 --- a/app/src/main/java/ru/dragonestia/picker/service/impl/collection/QueuedLinkedList.java +++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/collection/QueuedLinkedList.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.service.impl.collection; +package ru.dragonestia.picker.repository.impl.collection; import java.util.HashMap; import java.util.Map; @@ -26,6 +26,12 @@ public class QueuedLinkedList { itemMap.put(item.getId(), node); } + public void removeById(String id) { + if (!itemMap.containsKey(id)) return; + + remove(itemMap.get(id).object); + } + public void remove(ITEM item) { if (!itemMap.containsKey(item.getId())) return; diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/ItemWrapper.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java similarity index 86% rename from app/src/main/java/ru/dragonestia/picker/service/impl/picker/ItemWrapper.java rename to app/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java index 029de6a..1fb8ef7 100644 --- a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/ItemWrapper.java +++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java @@ -1,10 +1,10 @@ -package ru.dragonestia.picker.service.impl.picker; +package ru.dragonestia.picker.repository.impl.picker; import ru.dragonestia.picker.model.type.SlotLimit; public interface ItemWrapper { - String getIdentifier(); + String getId(); int countUnits(); diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/Picker.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/Picker.java similarity index 75% rename from app/src/main/java/ru/dragonestia/picker/service/impl/picker/Picker.java rename to app/src/main/java/ru/dragonestia/picker/repository/impl/picker/Picker.java index 273011e..bae3a41 100644 --- a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/Picker.java +++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/Picker.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.service.impl.picker; +package ru.dragonestia.picker.repository.impl.picker; import java.util.Collection; diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/RoomWrapper.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomWrapper.java similarity index 76% rename from app/src/main/java/ru/dragonestia/picker/service/impl/picker/RoomWrapper.java rename to app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomWrapper.java index 28a9f9c..c8093e0 100644 --- a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/RoomWrapper.java +++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomWrapper.java @@ -1,10 +1,11 @@ -package ru.dragonestia.picker.service.impl.picker; +package ru.dragonestia.picker.repository.impl.picker; import ru.dragonestia.picker.model.Room; +import ru.dragonestia.picker.repository.impl.collection.QueuedLinkedList; import java.util.function.Supplier; -public class RoomWrapper implements ItemWrapper { +public class RoomWrapper implements ItemWrapper, QueuedLinkedList.Item { private final Room room; private final Supplier userCountSupplier; @@ -15,7 +16,7 @@ public class RoomWrapper implements ItemWrapper { } @Override - public String getIdentifier() { + public String getId() { return room.getId(); } diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/SequentialFillingPicker.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java similarity index 95% rename from app/src/main/java/ru/dragonestia/picker/service/impl/picker/SequentialFillingPicker.java rename to app/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java index c95b3dd..8d45787 100644 --- a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/SequentialFillingPicker.java +++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.service.impl.picker; +package ru.dragonestia.picker.repository.impl.picker; import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.User; diff --git a/app/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java b/app/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java index dc322eb..baf7a59 100644 --- a/app/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java +++ b/app/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java @@ -2,7 +2,7 @@ package ru.dragonestia.picker.collection; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import ru.dragonestia.picker.service.impl.collection.QueuedLinkedList; +import ru.dragonestia.picker.repository.impl.collection.QueuedLinkedList; import java.util.HashSet;