From e4c34b1e22a532dea42b03623eef6f34ff48e864 Mon Sep 17 00:00:00 2001 From: Mohammed Ezzat Date: Mon, 22 Feb 2016 19:39:26 +0200 Subject: [PATCH] squid:S1319 - Declarations should use Java collection interfaces such as List rather than specific implementation classes such as LinkedList --- caching/src/main/java/com/iluwatar/caching/CacheStore.java | 6 +++--- caching/src/main/java/com/iluwatar/caching/DbManager.java | 3 ++- caching/src/main/java/com/iluwatar/caching/LruCache.java | 6 ++++-- .../fluentinterface/fluentiterable/FluentIterable.java | 2 +- .../src/main/java/com/iluwatar/iterator/TreasureChest.java | 2 +- .../src/test/java/com/iluwatar/observer/HobbitsTest.java | 3 ++- observer/src/test/java/com/iluwatar/observer/OrcsTest.java | 3 ++- .../java/com/iluwatar/observer/generic/GHobbitsTest.java | 3 ++- .../test/java/com/iluwatar/observer/generic/OrcsTest.java | 3 ++- .../main/java/com/iluwatar/producer/consumer/ItemQueue.java | 3 ++- servant/src/main/java/com/iluwatar/servant/Servant.java | 4 ++-- 11 files changed, 23 insertions(+), 15 deletions(-) diff --git a/caching/src/main/java/com/iluwatar/caching/CacheStore.java b/caching/src/main/java/com/iluwatar/caching/CacheStore.java index e2e04076a..5903f8219 100644 --- a/caching/src/main/java/com/iluwatar/caching/CacheStore.java +++ b/caching/src/main/java/com/iluwatar/caching/CacheStore.java @@ -22,7 +22,7 @@ */ package com.iluwatar.caching; -import java.util.ArrayList; +import java.util.List; /** * @@ -134,7 +134,7 @@ public class CacheStore { if (null == cache) { return; } - ArrayList listOfUserAccounts = cache.getCacheDataInListForm(); + List listOfUserAccounts = cache.getCacheDataInListForm(); for (UserAccount userAccount : listOfUserAccounts) { DbManager.upsertDb(userAccount); } @@ -144,7 +144,7 @@ public class CacheStore { * Print user accounts */ public static String print() { - ArrayList listOfUserAccounts = cache.getCacheDataInListForm(); + List listOfUserAccounts = cache.getCacheDataInListForm(); StringBuilder sb = new StringBuilder(); sb.append("\n--CACHE CONTENT--\n"); for (UserAccount userAccount : listOfUserAccounts) { diff --git a/caching/src/main/java/com/iluwatar/caching/DbManager.java b/caching/src/main/java/com/iluwatar/caching/DbManager.java index 9aee682a3..c12461d0c 100644 --- a/caching/src/main/java/com/iluwatar/caching/DbManager.java +++ b/caching/src/main/java/com/iluwatar/caching/DbManager.java @@ -24,6 +24,7 @@ package com.iluwatar.caching; import java.text.ParseException; import java.util.HashMap; +import java.util.Map; import org.bson.Document; @@ -49,7 +50,7 @@ public final class DbManager { private static MongoDatabase db; private static boolean useMongoDB; - private static HashMap virtualDB; + private static Map virtualDB; private DbManager() { } diff --git a/caching/src/main/java/com/iluwatar/caching/LruCache.java b/caching/src/main/java/com/iluwatar/caching/LruCache.java index c5e1a9d46..5c5549afd 100644 --- a/caching/src/main/java/com/iluwatar/caching/LruCache.java +++ b/caching/src/main/java/com/iluwatar/caching/LruCache.java @@ -24,6 +24,8 @@ package com.iluwatar.caching; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @@ -49,7 +51,7 @@ public class LruCache { } int capacity; - HashMap cache = new HashMap<>(); + Map cache = new HashMap<>(); Node head; Node end; @@ -161,7 +163,7 @@ public class LruCache { * * Returns cache data in list form. */ - public ArrayList getCacheDataInListForm() { + public List getCacheDataInListForm() { ArrayList listOfCacheData = new ArrayList<>(); Node temp = head; while (temp != null) { diff --git a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java index a134814dd..f6d7e2e2b 100644 --- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java +++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java @@ -101,7 +101,7 @@ public interface FluentIterable extends Iterable { * @return a list with all objects of the given iterator */ static List copyToList(Iterable iterable) { - ArrayList copy = new ArrayList<>(); + List copy = new ArrayList<>(); Iterator iterator = iterable.iterator(); while (iterator.hasNext()) { copy.add(iterator.next()); diff --git a/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java b/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java index 6f375434b..2c5d698e9 100644 --- a/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java +++ b/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java @@ -59,7 +59,7 @@ public class TreasureChest { * Get all items */ public List getItems() { - ArrayList list = new ArrayList<>(); + List list = new ArrayList<>(); list.addAll(items); return list; } diff --git a/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java b/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java index 41f8977db..8b670c56b 100644 --- a/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java +++ b/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java @@ -27,6 +27,7 @@ import org.junit.runners.Parameterized; import java.util.ArrayList; import java.util.Collection; +import java.util.List; /** * Date: 12/27/15 - 12:07 PM @@ -38,7 +39,7 @@ public class HobbitsTest extends WeatherObserverTest { @Parameterized.Parameters public static Collection data() { - final ArrayList testData = new ArrayList<>(); + final List testData = new ArrayList<>(); testData.add(new Object[]{WeatherType.SUNNY, "The happy hobbits bade in the warm sun."}); testData.add(new Object[]{WeatherType.RAINY, "The hobbits look for cover from the rain."}); testData.add(new Object[]{WeatherType.WINDY, "The hobbits hold their hats tightly in the windy weather."}); diff --git a/observer/src/test/java/com/iluwatar/observer/OrcsTest.java b/observer/src/test/java/com/iluwatar/observer/OrcsTest.java index a81ecb03b..a7997eaa7 100644 --- a/observer/src/test/java/com/iluwatar/observer/OrcsTest.java +++ b/observer/src/test/java/com/iluwatar/observer/OrcsTest.java @@ -27,6 +27,7 @@ import org.junit.runners.Parameterized; import java.util.ArrayList; import java.util.Collection; +import java.util.List; /** * Date: 12/27/15 - 12:07 PM @@ -38,7 +39,7 @@ public class OrcsTest extends WeatherObserverTest { @Parameterized.Parameters public static Collection data() { - final ArrayList testData = new ArrayList<>(); + final List testData = new ArrayList<>(); testData.add(new Object[]{WeatherType.SUNNY, "The sun hurts the orcs' eyes."}); testData.add(new Object[]{WeatherType.RAINY, "The orcs are dripping wet."}); testData.add(new Object[]{WeatherType.WINDY, "The orc smell almost vanishes in the wind."}); diff --git a/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java b/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java index bd1afd21b..7668daee6 100644 --- a/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java +++ b/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java @@ -31,6 +31,7 @@ import org.junit.runners.Parameterized; import java.util.ArrayList; import java.util.Collection; +import java.util.List; /** * Date: 12/27/15 - 12:07 PM @@ -42,7 +43,7 @@ public class GHobbitsTest extends ObserverTest { @Parameterized.Parameters public static Collection data() { - final ArrayList testData = new ArrayList<>(); + final List testData = new ArrayList<>(); testData.add(new Object[]{WeatherType.SUNNY, "The happy hobbits bade in the warm sun."}); testData.add(new Object[]{WeatherType.RAINY, "The hobbits look for cover from the rain."}); testData.add(new Object[]{WeatherType.WINDY, "The hobbits hold their hats tightly in the windy weather."}); diff --git a/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java b/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java index 417668607..9ac1bddea 100644 --- a/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java +++ b/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java @@ -29,6 +29,7 @@ import org.junit.runners.Parameterized; import java.util.ArrayList; import java.util.Collection; +import java.util.List; /** * Date: 12/27/15 - 12:07 PM @@ -40,7 +41,7 @@ public class OrcsTest extends ObserverTest { @Parameterized.Parameters public static Collection data() { - final ArrayList testData = new ArrayList<>(); + final List testData = new ArrayList<>(); testData.add(new Object[]{WeatherType.SUNNY, "The sun hurts the orcs' eyes."}); testData.add(new Object[]{WeatherType.RAINY, "The orcs are dripping wet."}); testData.add(new Object[]{WeatherType.WINDY, "The orc smell almost vanishes in the wind."}); diff --git a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/ItemQueue.java b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/ItemQueue.java index 33a723589..ea925152b 100644 --- a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/ItemQueue.java +++ b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/ItemQueue.java @@ -22,6 +22,7 @@ */ package com.iluwatar.producer.consumer; +import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; /** @@ -29,7 +30,7 @@ import java.util.concurrent.LinkedBlockingQueue; */ public class ItemQueue { - private LinkedBlockingQueue queue; + private BlockingQueue queue; public ItemQueue() { diff --git a/servant/src/main/java/com/iluwatar/servant/Servant.java b/servant/src/main/java/com/iluwatar/servant/Servant.java index d24c42ab2..56d65bde2 100644 --- a/servant/src/main/java/com/iluwatar/servant/Servant.java +++ b/servant/src/main/java/com/iluwatar/servant/Servant.java @@ -22,7 +22,7 @@ */ package com.iluwatar.servant; -import java.util.ArrayList; +import java.util.List; /** * @@ -55,7 +55,7 @@ public class Servant { /** * Check if we will be hanged */ - public boolean checkIfYouWillBeHanged(ArrayList tableGuests) { + public boolean checkIfYouWillBeHanged(List tableGuests) { boolean anotherDay = true; for (Royalty r : tableGuests) { if (!r.getMood()) {