From 202f2d8bc52ae40e10e562bd9b4df2ce19598bab Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 8 Apr 2021 17:44:35 +0200 Subject: [PATCH] cleanup: use bulk operation instead of iteration --- src/main/java/net/server/Server.java | 4 +--- src/main/java/net/server/channel/Channel.java | 4 +--- .../handlers/UseOwlOfMinervaHandler.java | 4 +--- .../net/server/services/BaseScheduler.java | 6 ++---- src/main/java/net/server/world/World.java | 16 ++++----------- .../scripting/event/EventInstanceManager.java | 4 +--- src/main/java/server/MakerItemFactory.java | 15 ++++++-------- src/main/java/server/life/MaplePlayerNPC.java | 4 +--- src/main/java/server/life/MobSkill.java | 8 ++------ .../java/server/maps/MapleHiredMerchant.java | 6 ++---- .../java/server/maps/MaplePlayerShop.java | 20 ++++++++----------- .../src/life/MapleMonsterStats.java | 12 +++-------- .../MapleCashCosmeticsChecker.java | 4 +--- .../src/life/MapleMonsterStats.java | 12 +++-------- .../MapleQuestItemFetcher.java | 12 +++-------- .../src/life/MapleMonsterStats.java | 12 +++-------- 16 files changed, 42 insertions(+), 101 deletions(-) diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java index ff17be07c0..726015de1e 100644 --- a/src/main/java/net/server/Server.java +++ b/src/main/java/net/server/Server.java @@ -259,9 +259,7 @@ public class Server { try { List channelz = new ArrayList<>(); for (World world : this.getWorlds()) { - for (Channel ch : world.getChannels()) { - channelz.add(ch); - } + channelz.addAll(world.getChannels()); } return channelz; } catch (NullPointerException npe) { diff --git a/src/main/java/net/server/channel/Channel.java b/src/main/java/net/server/channel/Channel.java index f4f318cc7b..1956daf09e 100644 --- a/src/main/java/net/server/channel/Channel.java +++ b/src/main/java/net/server/channel/Channel.java @@ -130,9 +130,7 @@ public final class Channel { acceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(new MapleCodecFactory())); acceptor.bind(new InetSocketAddress(port)); ((SocketSessionConfig) acceptor.getSessionConfig()).setTcpNoDelay(true); - for (MapleExpeditionType exped : MapleExpeditionType.values()) { - expedType.add(exped); - } + expedType.addAll(Arrays.asList(MapleExpeditionType.values())); if (Server.getInstance().isOnline()) { // postpone event loading to improve boot time... thanks Riizade, daronhudson for noticing slow startup times eventSM = new EventScriptManager(this, getEvents()); diff --git a/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java b/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java index 6825df20f3..5f0729a19a 100644 --- a/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java +++ b/src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java @@ -51,9 +51,7 @@ public final class UseOwlOfMinervaHandler extends AbstractMaplePacketHandler { Comparator> comparator = (p1, p2) -> p2.getRight().compareTo(p1.getRight()); PriorityQueue> queue = new PriorityQueue<>(Math.max(1, owlSearched.size()), comparator); - for(Pair p : owlSearched) { - queue.add(p); - } + queue.addAll(owlSearched); owlLeaderboards = new LinkedList<>(); for(int i = 0; i < Math.min(owlSearched.size(), 10); i++) { diff --git a/src/main/java/net/server/services/BaseScheduler.java b/src/main/java/net/server/services/BaseScheduler.java index 5cd862404b..2a48bd36a8 100644 --- a/src/main/java/net/server/services/BaseScheduler.java +++ b/src/main/java/net/server/services/BaseScheduler.java @@ -53,10 +53,8 @@ public abstract class BaseScheduler { // NOTE: practice EXTREME caution when adding external locks to the scheduler system, if you don't know what you're doing DON'T USE THIS. protected BaseScheduler(MonitoredLockType lockType, List extLocks) { schedulerLock = MonitoredReentrantLockFactory.createLock(lockType, true); - - for(MonitoredReentrantLock lock : extLocks) { - externalLocks.add(lock); - } + + externalLocks.addAll(extLocks); } protected void addListener(SchedulerListener listener) { diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index 9cafe04b51..bc9e974f05 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -457,9 +457,7 @@ public class World { private static List>> getSortedAccountCharacterView(Map> map) { List>> list = new ArrayList<>(map.size()); - for(Entry> e : map.entrySet()) { - list.add(e); - } + list.addAll(map.entrySet()); list.sort((o1, o2) -> o1.getKey() - o2.getKey()); @@ -483,9 +481,7 @@ public class World { } for (Entry> e : getSortedAccountCharacterView(accChars)) { - for (MapleCharacter chr : e.getValue().values()) { - chrList.add(chr); - } + chrList.addAll(e.getValue().values()); } return chrList; @@ -1359,9 +1355,7 @@ public class World { Comparator> comparator = (p1, p2) -> p2.getRight().compareTo(p1.getRight()); PriorityQueue> queue = new PriorityQueue<>(Math.max(1, tabSellers.size()), comparator); - for(Pair p : tabSellers) { - queue.add(p); - } + queue.addAll(tabSellers); tabLeaderboards = new LinkedList<>(); for(int i = 0; i < Math.min(tabSellers.size(), 5); i++) { @@ -1548,9 +1542,7 @@ public class World { List psList = new ArrayList<>(); activePlayerShopsLock.lock(); try { - for(MaplePlayerShop mps : activePlayerShops.values()) { - psList.add(mps); - } + psList.addAll(activePlayerShops.values()); return psList; } finally { diff --git a/src/main/java/scripting/event/EventInstanceManager.java b/src/main/java/scripting/event/EventInstanceManager.java index 81527c83b6..237713d2b3 100644 --- a/src/main/java/scripting/event/EventInstanceManager.java +++ b/src/main/java/scripting/event/EventInstanceManager.java @@ -944,9 +944,7 @@ public class EventInstanceManager { wL.lock(); try { - for(Integer item: exclusive) { - exclusiveItems.add(item); - } + exclusiveItems.addAll(exclusive); } finally { wL.unlock(); } diff --git a/src/main/java/server/MakerItemFactory.java b/src/main/java/server/MakerItemFactory.java index 200b0eebe0..9d2886d257 100644 --- a/src/main/java/server/MakerItemFactory.java +++ b/src/main/java/server/MakerItemFactory.java @@ -23,11 +23,12 @@ package server; import config.YamlConfig; import constants.inventory.EquipType; +import tools.Pair; + import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import tools.Pair; /** * @@ -160,14 +161,10 @@ public class MakerItemFactory { this.cost = mi.cost; this.reqLevel = mi.reqLevel; this.reqMakerLevel = mi.reqMakerLevel; - - for(Pair p : mi.reqItems) { - reqItems.add(p); - } - - for(Pair p : mi.gainItems) { - gainItems.add(p); - } + + reqItems.addAll(mi.reqItems); + + gainItems.addAll(mi.gainItems); } public List> getReqItems() { diff --git a/src/main/java/server/life/MaplePlayerNPC.java b/src/main/java/server/life/MaplePlayerNPC.java index c37b0efa37..5c801fccf7 100644 --- a/src/main/java/server/life/MaplePlayerNPC.java +++ b/src/main/java/server/life/MaplePlayerNPC.java @@ -514,9 +514,7 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { e.printStackTrace(); } - for (Integer i : updateMapids) { - mapids.add(i); - } + mapids.addAll(updateMapids); return mapids; } diff --git a/src/main/java/server/life/MobSkill.java b/src/main/java/server/life/MobSkill.java index ede0341b2c..a8ddcfb56b 100644 --- a/src/main/java/server/life/MobSkill.java +++ b/src/main/java/server/life/MobSkill.java @@ -62,9 +62,7 @@ public class MobSkill { } public void addSummons(List toSummon) { - for (Integer summon : toSummon) { - this.toSummon.add(summon); - } + this.toSummon.addAll(toSummon); } public void setSpawnEffect(int spawnEffect) { @@ -186,9 +184,7 @@ public class MobSkill { break; case 129: // Banish if (lt != null && rb != null && skill) { - for (MapleCharacter chr : getPlayersInRange(monster)) { - banishPlayers.add(chr); - } + banishPlayers.addAll(getPlayersInRange(monster)); } else { banishPlayers.add(player); } diff --git a/src/main/java/server/maps/MapleHiredMerchant.java b/src/main/java/server/maps/MapleHiredMerchant.java index 0e1337753b..845e593fd3 100644 --- a/src/main/java/server/maps/MapleHiredMerchant.java +++ b/src/main/java/server/maps/MapleHiredMerchant.java @@ -609,7 +609,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { if(!open.get()) return list; synchronized (items) { - for(MaplePlayerShopItem mpsi : items) all.add(mpsi); + all.addAll(items); } for(MaplePlayerShopItem mpsi : all) { @@ -679,9 +679,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { public List> getMessages() { synchronized (messages) { List> msgList = new LinkedList<>(); - for(Pair m : messages) { - msgList.add(m); - } + msgList.addAll(messages); return msgList; } diff --git a/src/main/java/server/maps/MaplePlayerShop.java b/src/main/java/server/maps/MaplePlayerShop.java index f541c3a758..2550bdf114 100644 --- a/src/main/java/server/maps/MaplePlayerShop.java +++ b/src/main/java/server/maps/MaplePlayerShop.java @@ -28,21 +28,17 @@ import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.locks.Lock; import net.opcodes.SendOpcode; -import tools.MaplePacketCreator; -import tools.Pair; -import tools.data.output.MaplePacketLittleEndianWriter; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import server.MapleTrade; +import tools.MaplePacketCreator; +import tools.Pair; +import tools.data.output.MaplePacketLittleEndianWriter; + +import java.util.*; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.locks.Lock; /** * @@ -556,7 +552,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { List all = new ArrayList<>(); synchronized (items) { - for(MaplePlayerShopItem mpsi : items) all.add(mpsi); + all.addAll(items); } for(MaplePlayerShopItem mpsi : all) { diff --git a/tools/MapleArrowFetcher/src/life/MapleMonsterStats.java b/tools/MapleArrowFetcher/src/life/MapleMonsterStats.java index 42b091545d..ce2cacf6b3 100644 --- a/tools/MapleArrowFetcher/src/life/MapleMonsterStats.java +++ b/tools/MapleArrowFetcher/src/life/MapleMonsterStats.java @@ -21,17 +21,13 @@ */ package life; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import life.MapleLifeFactory.BanishInfo; import life.MapleLifeFactory.loseItem; import life.MapleLifeFactory.selfDestruction; import tools.Pair; +import java.util.*; + /** * @author Frz */ @@ -193,9 +189,7 @@ public class MapleMonsterStats { } public void setSkills(List> skills) { - for (Pair skill : skills) { - this.skills.add(skill); - } + this.skills.addAll(skills); } public List> getSkills() { diff --git a/tools/MapleCashCosmeticsChecker/src/maplecashcosmeticschecker/MapleCashCosmeticsChecker.java b/tools/MapleCashCosmeticsChecker/src/maplecashcosmeticschecker/MapleCashCosmeticsChecker.java index e94b068515..bec5033721 100644 --- a/tools/MapleCashCosmeticsChecker/src/maplecashcosmeticschecker/MapleCashCosmeticsChecker.java +++ b/tools/MapleCashCosmeticsChecker/src/maplecashcosmeticschecker/MapleCashCosmeticsChecker.java @@ -578,9 +578,7 @@ public class MapleCashCosmeticsChecker { List, List>> list = new ArrayList<>(map.size()); for(Entry, Set> e : map.entrySet()) { List il = new ArrayList<>(2); - for(Integer i : e.getValue()) { - il.add(i); - } + il.addAll(e.getValue()); Collections.sort(il, (o1, o2) -> o1 - o2); diff --git a/tools/MapleMesoFetcher/src/life/MapleMonsterStats.java b/tools/MapleMesoFetcher/src/life/MapleMonsterStats.java index 42b091545d..ce2cacf6b3 100644 --- a/tools/MapleMesoFetcher/src/life/MapleMonsterStats.java +++ b/tools/MapleMesoFetcher/src/life/MapleMonsterStats.java @@ -21,17 +21,13 @@ */ package life; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import life.MapleLifeFactory.BanishInfo; import life.MapleLifeFactory.loseItem; import life.MapleLifeFactory.selfDestruction; import tools.Pair; +import java.util.*; + /** * @author Frz */ @@ -193,9 +189,7 @@ public class MapleMonsterStats { } public void setSkills(List> skills) { - for (Pair skill : skills) { - this.skills.add(skill); - } + this.skills.addAll(skills); } public List> getSkills() { diff --git a/tools/MapleQuestItemFetcher/src/maplequestitemfetcher/MapleQuestItemFetcher.java b/tools/MapleQuestItemFetcher/src/maplequestitemfetcher/MapleQuestItemFetcher.java index a07b65fd66..5f32706f02 100644 --- a/tools/MapleQuestItemFetcher/src/maplequestitemfetcher/MapleQuestItemFetcher.java +++ b/tools/MapleQuestItemFetcher/src/maplequestitemfetcher/MapleQuestItemFetcher.java @@ -411,9 +411,7 @@ public class MapleQuestItemFetcher { private static List> getSortedMapEntries0(Map map) { List> list = new ArrayList<>(map.size()); - for(Entry e : map.entrySet()) { - list.add(e); - } + list.addAll(map.entrySet()); Collections.sort(list, (o1, o2) -> o1.getKey() - o2.getKey()); @@ -422,9 +420,7 @@ public class MapleQuestItemFetcher { private static List> getSortedMapEntries1(Map map) { List> list = new ArrayList<>(map.size()); - for(Entry e : map.entrySet()) { - list.add(e); - } + list.addAll(map.entrySet()); Collections.sort(list, (o1, o2) -> o1.getKey() - o2.getKey()); @@ -435,9 +431,7 @@ public class MapleQuestItemFetcher { List>> list = new ArrayList<>(map.size()); for(Entry> e : map.entrySet()) { List il = new ArrayList<>(2); - for(Integer i : e.getValue()) { - il.add(i); - } + il.addAll(e.getValue()); Collections.sort(il, (o1, o2) -> o1 - o2); diff --git a/tools/MapleSkillbookChanceFetcher/src/life/MapleMonsterStats.java b/tools/MapleSkillbookChanceFetcher/src/life/MapleMonsterStats.java index 42b091545d..ce2cacf6b3 100644 --- a/tools/MapleSkillbookChanceFetcher/src/life/MapleMonsterStats.java +++ b/tools/MapleSkillbookChanceFetcher/src/life/MapleMonsterStats.java @@ -21,17 +21,13 @@ */ package life; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import life.MapleLifeFactory.BanishInfo; import life.MapleLifeFactory.loseItem; import life.MapleLifeFactory.selfDestruction; import tools.Pair; +import java.util.*; + /** * @author Frz */ @@ -193,9 +189,7 @@ public class MapleMonsterStats { } public void setSkills(List> skills) { - for (Pair skill : skills) { - this.skills.add(skill); - } + this.skills.addAll(skills); } public List> getSkills() {