lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed stream usage from PrivateStoreHistoryManager.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-08 20:56:52 +00:00
parent a9908e13cc
commit 889075b9b2
3 changed files with 51 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PrivateStoreHistoryManager.java
View File

@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
@@ -107,18 +106,28 @@ public class PrivateStoreHistoryManager
public List<ItemHistoryTransaction> getHistory(boolean full) public List<ItemHistoryTransaction> getHistory(boolean full)
{ {
final List<ItemHistoryTransaction> tempList = new ArrayList<>(_items);
if (!full) if (!full)
{ {
final List<ItemHistoryTransaction> list = new ArrayList<>(_items); final Map<Integer, Integer> uniqueItemIds = new HashMap<>();
final Map<Integer, Integer> uniqueItemIds = list.stream().map(transaction -> transaction.getItemId()).collect(Collectors.toSet()).stream().collect(Collectors.toMap(Integer::intValue, e -> 0)); for (ItemHistoryTransaction transaction : tempList)
list.sort(new SortByDate());
final List<ItemHistoryTransaction> finalList = new ArrayList<>();
for (ItemHistoryTransaction transaction : list)
{ {
if (uniqueItemIds.get(transaction.getItemId()) < Config.STORE_REVIEW_LIMIT) final int itemId = transaction.getItemId();
if (!uniqueItemIds.containsKey(itemId))
{
uniqueItemIds.put(itemId, 0);
}
}
tempList.sort(new SortByDate());
final List<ItemHistoryTransaction> finalList = new ArrayList<>();
for (ItemHistoryTransaction transaction : tempList)
{
final int itemId = transaction.getItemId();
if (uniqueItemIds.get(itemId) < Config.STORE_REVIEW_LIMIT)
{ {
finalList.add(transaction); finalList.add(transaction);
uniqueItemIds.put(transaction.getItemId(), uniqueItemIds.get(transaction.getItemId()) + 1); uniqueItemIds.put(itemId, uniqueItemIds.get(itemId) + 1);
} }
} }
return finalList; return finalList;

25
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PrivateStoreHistoryManager.java
View File

@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
@@ -107,18 +106,28 @@ public class PrivateStoreHistoryManager
public List<ItemHistoryTransaction> getHistory(boolean full) public List<ItemHistoryTransaction> getHistory(boolean full)
{ {
final List<ItemHistoryTransaction> tempList = new ArrayList<>(_items);
if (!full) if (!full)
{ {
final List<ItemHistoryTransaction> list = new ArrayList<>(_items); final Map<Integer, Integer> uniqueItemIds = new HashMap<>();
final Map<Integer, Integer> uniqueItemIds = list.stream().map(transaction -> transaction.getItemId()).collect(Collectors.toSet()).stream().collect(Collectors.toMap(Integer::intValue, e -> 0)); for (ItemHistoryTransaction transaction : tempList)
list.sort(new SortByDate());
final List<ItemHistoryTransaction> finalList = new ArrayList<>();
for (ItemHistoryTransaction transaction : list)
{ {
if (uniqueItemIds.get(transaction.getItemId()) < Config.STORE_REVIEW_LIMIT) final int itemId = transaction.getItemId();
if (!uniqueItemIds.containsKey(itemId))
{
uniqueItemIds.put(itemId, 0);
}
}
tempList.sort(new SortByDate());
final List<ItemHistoryTransaction> finalList = new ArrayList<>();
for (ItemHistoryTransaction transaction : tempList)
{
final int itemId = transaction.getItemId();
if (uniqueItemIds.get(itemId) < Config.STORE_REVIEW_LIMIT)
{ {
finalList.add(transaction); finalList.add(transaction);
uniqueItemIds.put(transaction.getItemId(), uniqueItemIds.get(transaction.getItemId()) + 1); uniqueItemIds.put(itemId, uniqueItemIds.get(itemId) + 1);
} }
} }
return finalList; return finalList;

25
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/PrivateStoreHistoryManager.java
View File

@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
@@ -107,18 +106,28 @@ public class PrivateStoreHistoryManager
public List<ItemHistoryTransaction> getHistory(boolean full) public List<ItemHistoryTransaction> getHistory(boolean full)
{ {
final List<ItemHistoryTransaction> tempList = new ArrayList<>(_items);
if (!full) if (!full)
{ {
final List<ItemHistoryTransaction> list = new ArrayList<>(_items); final Map<Integer, Integer> uniqueItemIds = new HashMap<>();
final Map<Integer, Integer> uniqueItemIds = list.stream().map(transaction -> transaction.getItemId()).collect(Collectors.toSet()).stream().collect(Collectors.toMap(Integer::intValue, e -> 0)); for (ItemHistoryTransaction transaction : tempList)
list.sort(new SortByDate());
final List<ItemHistoryTransaction> finalList = new ArrayList<>();
for (ItemHistoryTransaction transaction : list)
{ {
if (uniqueItemIds.get(transaction.getItemId()) < Config.STORE_REVIEW_LIMIT) final int itemId = transaction.getItemId();
if (!uniqueItemIds.containsKey(itemId))
{
uniqueItemIds.put(itemId, 0);
}
}
tempList.sort(new SortByDate());
final List<ItemHistoryTransaction> finalList = new ArrayList<>();
for (ItemHistoryTransaction transaction : tempList)
{
final int itemId = transaction.getItemId();
if (uniqueItemIds.get(itemId) < Config.STORE_REVIEW_LIMIT)
{ {
finalList.add(transaction); finalList.add(transaction);
uniqueItemIds.put(transaction.getItemId(), uniqueItemIds.get(transaction.getItemId()) + 1); uniqueItemIds.put(itemId, uniqueItemIds.get(itemId) + 1);
} }
} }
return finalList; return finalList;