From 409ff027b8d7161b2a724a68bd1dc69343c2ac68 Mon Sep 17 00:00:00 2001 From: Mohammed Ezzat Date: Fri, 29 Jan 2016 07:33:34 +0200 Subject: [PATCH] squid:S2293 - The diamond operator should be used --- caching/src/main/java/com/iluwatar/caching/DbManager.java | 2 +- caching/src/main/java/com/iluwatar/caching/LruCache.java | 4 ++-- .../src/main/java/com/iluwatar/composite/LetterComposite.java | 2 +- composite/src/main/java/com/iluwatar/composite/Messenger.java | 4 ++-- dao/src/main/java/com/iluwatar/dao/App.java | 2 +- dao/src/test/java/com/iluwatar/dao/CustomerDaoImplTest.java | 2 +- .../main/java/com/iluwatar/layers/CakeBakingServiceImpl.java | 2 +- .../java/com/iluwatar/poison/pill/SimpleMessageQueue.java | 2 +- .../main/java/com/iluwatar/producer/consumer/ItemQueue.java | 2 +- .../com/iluwatar/servicelayer/magic/MagicServiceImpl.java | 4 ++-- .../java/com/iluwatar/servicelayer/spellbook/Spellbook.java | 4 ++-- .../main/java/com/iluwatar/servicelayer/wizard/Wizard.java | 2 +- .../main/java/com/iluwatar/servicelocator/ServiceCache.java | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/caching/src/main/java/com/iluwatar/caching/DbManager.java b/caching/src/main/java/com/iluwatar/caching/DbManager.java index bfde07103..b259b5b33 100644 --- a/caching/src/main/java/com/iluwatar/caching/DbManager.java +++ b/caching/src/main/java/com/iluwatar/caching/DbManager.java @@ -37,7 +37,7 @@ public class DbManager { */ public static void createVirtualDb() { useMongoDB = false; - virtualDB = new HashMap(); + virtualDB = new HashMap<>(); } /** diff --git a/caching/src/main/java/com/iluwatar/caching/LruCache.java b/caching/src/main/java/com/iluwatar/caching/LruCache.java index e20275a40..b9454744b 100644 --- a/caching/src/main/java/com/iluwatar/caching/LruCache.java +++ b/caching/src/main/java/com/iluwatar/caching/LruCache.java @@ -27,7 +27,7 @@ public class LruCache { } int capacity; - HashMap cache = new HashMap(); + HashMap cache = new HashMap<>(); Node head = null; Node end = null; @@ -140,7 +140,7 @@ public class LruCache { * Returns cache data in list form. */ public ArrayList getCacheDataInListForm() { - ArrayList listOfCacheData = new ArrayList(); + ArrayList listOfCacheData = new ArrayList<>(); Node temp = head; while (temp != null) { listOfCacheData.add(temp.userAccount); diff --git a/composite/src/main/java/com/iluwatar/composite/LetterComposite.java b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java index 39655fa37..e0a406337 100644 --- a/composite/src/main/java/com/iluwatar/composite/LetterComposite.java +++ b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java @@ -10,7 +10,7 @@ import java.util.List; */ public abstract class LetterComposite { - private List children = new ArrayList(); + private List children = new ArrayList<>(); public void add(LetterComposite letter) { children.add(letter); diff --git a/composite/src/main/java/com/iluwatar/composite/Messenger.java b/composite/src/main/java/com/iluwatar/composite/Messenger.java index 37fa84bc2..e0efcc63d 100644 --- a/composite/src/main/java/com/iluwatar/composite/Messenger.java +++ b/composite/src/main/java/com/iluwatar/composite/Messenger.java @@ -13,7 +13,7 @@ public class Messenger { LetterComposite messageFromOrcs() { - List words = new ArrayList(); + List words = new ArrayList<>(); words.add(new Word(Arrays.asList(new Letter('W'), new Letter('h'), new Letter('e'), new Letter( 'r'), new Letter('e')))); @@ -35,7 +35,7 @@ public class Messenger { LetterComposite messageFromElves() { - List words = new ArrayList(); + List words = new ArrayList<>(); words.add(new Word(Arrays.asList(new Letter('M'), new Letter('u'), new Letter('c'), new Letter( 'h')))); diff --git a/dao/src/main/java/com/iluwatar/dao/App.java b/dao/src/main/java/com/iluwatar/dao/App.java index a9351689d..5fe9a52d7 100644 --- a/dao/src/main/java/com/iluwatar/dao/App.java +++ b/dao/src/main/java/com/iluwatar/dao/App.java @@ -52,7 +52,7 @@ public class App { final Customer customer1 = new Customer(1, "Adam", "Adamson"); final Customer customer2 = new Customer(2, "Bob", "Bobson"); final Customer customer3 = new Customer(3, "Carl", "Carlson"); - final List customers = new ArrayList(); + final List customers = new ArrayList<>(); customers.add(customer1); customers.add(customer2); customers.add(customer3); diff --git a/dao/src/test/java/com/iluwatar/dao/CustomerDaoImplTest.java b/dao/src/test/java/com/iluwatar/dao/CustomerDaoImplTest.java index 245efb505..652bae3e3 100644 --- a/dao/src/test/java/com/iluwatar/dao/CustomerDaoImplTest.java +++ b/dao/src/test/java/com/iluwatar/dao/CustomerDaoImplTest.java @@ -18,7 +18,7 @@ public class CustomerDaoImplTest { @Before public void setUp() { - customers = new ArrayList(); + customers = new ArrayList<>(); customers.add(CUSTOMER); impl = new CustomerDaoImpl(customers); } diff --git a/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java b/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java index 79917842d..ed2aa19f0 100644 --- a/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java +++ b/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java @@ -141,7 +141,7 @@ public class CakeBakingServiceImpl implements CakeBakingService { CakeToppingInfo cakeToppingInfo = new CakeToppingInfo(cake.getTopping().getId(), cake.getTopping().getName(), cake .getTopping().getCalories()); - ArrayList cakeLayerInfos = new ArrayList(); + ArrayList cakeLayerInfos = new ArrayList<>(); for (CakeLayer layer : cake.getLayers()) { cakeLayerInfos.add(new CakeLayerInfo(layer.getId(), layer.getName(), layer.getCalories())); } diff --git a/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessageQueue.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessageQueue.java index dd0b3ed0a..5c8d3a7b0 100644 --- a/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessageQueue.java +++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessageQueue.java @@ -11,7 +11,7 @@ public class SimpleMessageQueue implements MessageQueue { private final BlockingQueue queue; public SimpleMessageQueue(int bound) { - queue = new ArrayBlockingQueue(bound); + queue = new ArrayBlockingQueue<>(bound); } @Override 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 8d41fb456..cd87f049e 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 @@ -11,7 +11,7 @@ public class ItemQueue { public ItemQueue() { - queue = new LinkedBlockingQueue(5); + queue = new LinkedBlockingQueue<>(5); } public void put(Item item) throws InterruptedException { diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java index cda3fe58d..ed24fea9d 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java @@ -48,13 +48,13 @@ public class MagicServiceImpl implements MagicService { @Override public List findWizardsWithSpellbook(String name) { Spellbook spellbook = spellbookDao.findByName(name); - return new ArrayList(spellbook.getWizards()); + return new ArrayList<>(spellbook.getWizards()); } @Override public List findWizardsWithSpell(String name) { Spell spell = spellDao.findByName(name); Spellbook spellbook = spell.getSpellbook(); - return new ArrayList(spellbook.getWizards()); + return new ArrayList<>(spellbook.getWizards()); } } diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java index 165dcdc22..4f910ee40 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java @@ -27,8 +27,8 @@ import com.iluwatar.servicelayer.wizard.Wizard; public class Spellbook extends BaseEntity { public Spellbook() { - spells = new HashSet(); - wizards = new HashSet(); + spells = new HashSet<>(); + wizards = new HashSet<>(); } public Spellbook(String name) { diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java index bfe8e46af..23f2f0aec 100644 --- a/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java @@ -24,7 +24,7 @@ import com.iluwatar.servicelayer.spellbook.Spellbook; public class Wizard extends BaseEntity { public Wizard() { - spellbooks = new HashSet(); + spellbooks = new HashSet<>(); } public Wizard(String name) { diff --git a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java index 0a44a5d7f..57c841a3a 100644 --- a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java +++ b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java @@ -16,7 +16,7 @@ public class ServiceCache { private final Map serviceCache; public ServiceCache() { - serviceCache = new HashMap(); + serviceCache = new HashMap<>(); } /**