Merge pull request iluwatar#389 from DevFactory/release/Declarations-should-use-Java-collection-interfaces-such-as-List-rather-than-specific-implementation-classes-such-as-LinkedList-fix-1

iluwatar · iluwatar · commit f135ef6ec8c8 · 2016-02-29T07:42:04.000+02:00
squid:S1319 - Declarations should use Java collection interfaces such…
diff --git 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 static void flushCache() {
     if (null == cache) {
       return;
     }
-    ArrayList<UserAccount> listOfUserAccounts = cache.getCacheDataInListForm();
+    List<UserAccount> listOfUserAccounts = cache.getCacheDataInListForm();
     for (UserAccount userAccount : listOfUserAccounts) {
       DbManager.upsertDb(userAccount);
     }
@@ -144,7 +144,7 @@ public static void flushCache() {
    * Print user accounts
    */
   public static String print() {
-    ArrayList<UserAccount> listOfUserAccounts = cache.getCacheDataInListForm();
+    List<UserAccount> 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
@@ -24,6 +24,7 @@
 
 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<String, UserAccount> virtualDB;
+  private static Map<String, UserAccount> 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
@@ -24,6 +24,8 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -49,7 +51,7 @@ public Node(String userId, UserAccount userAccount) {
   }
 
   int capacity;
-  HashMap<String, Node> cache = new HashMap<>();
+  Map<String, Node> cache = new HashMap<>();
   Node head;
   Node end;
 
@@ -161,7 +163,7 @@ public void clear() {
    *
    * Returns cache data in list form.
    */
-  public ArrayList<UserAccount> getCacheDataInListForm() {
+  public List<UserAccount> getCacheDataInListForm() {
     ArrayList<UserAccount> 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
@@ -101,7 +101,7 @@ public interface FluentIterable<E> extends Iterable<E> {
    * @return a list with all objects of the given iterator
    */
   static <E> List<E> copyToList(Iterable<E> iterable) {
-    ArrayList<E> copy = new ArrayList<>();
+    List<E> copy = new ArrayList<>();
     Iterator<E> 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
@@ -59,7 +59,7 @@ ItemIterator iterator(ItemType itemType) {
    * Get all items
    */
   public List<Item> getItems() {
-    ArrayList<Item> list = new ArrayList<>();
+    List<Item> 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
@@ -27,6 +27,7 @@
 
 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<Hobbits> {
 
   @Parameterized.Parameters
   public static Collection<Object[]> data() {
-    final ArrayList<Object[]> testData = new ArrayList<>();
+    final List<Object[]> 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
@@ -27,6 +27,7 @@
 
 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<Orcs> {
 
   @Parameterized.Parameters
   public static Collection<Object[]> data() {
-    final ArrayList<Object[]> testData = new ArrayList<>();
+    final List<Object[]> 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
@@ -31,6 +31,7 @@
 
 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<GHobbits> {
 
   @Parameterized.Parameters
   public static Collection<Object[]> data() {
-    final ArrayList<Object[]> testData = new ArrayList<>();
+    final List<Object[]> 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
@@ -29,6 +29,7 @@
 
 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<GOrcs> {
 
   @Parameterized.Parameters
   public static Collection<Object[]> data() {
-    final ArrayList<Object[]> testData = new ArrayList<>();
+    final List<Object[]> 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
@@ -22,14 +22,15 @@
  */
 package com.iluwatar.producer.consumer;
 
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
 /**
  * Class as a channel for {@link Producer}-{@link Consumer} exchange.
  */
 public class ItemQueue {
 
-  private LinkedBlockingQueue<Item> queue;
+  private BlockingQueue<Item> 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
@@ -22,7 +22,7 @@
  */
 package com.iluwatar.servant;
 
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 
@@ -55,7 +55,7 @@ public void giveCompliments(Royalty r) {
   /**
    * Check if we will be hanged
    */
-  public boolean checkIfYouWillBeHanged(ArrayList<Royalty> tableGuests) {
+  public boolean checkIfYouWillBeHanged(List<Royalty> tableGuests) {
     boolean anotherDay = true;
     for (Royalty r : tableGuests) {
       if (!r.getMood()) {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ ItemIterator iterator(ItemType itemType) {`
`59`	`59`	`* Get all items`
`60`	`60`	`*/`
`61`	`61`	`public List<Item> getItems() {`
`62`		`- ArrayList<Item> list = new ArrayList<>();`
	`62`	`+ List<Item> list = new ArrayList<>();`
`63`	`63`	`list.addAll(items);`
`64`	`64`	`return list;`
`65`	`65`	`}`