squid:S2293 - The diamond operator should be used

Mohammed Ezzat · Mohammed Ezzat · commit 409ff027b8d7 · 2016-01-29T07:33:34.000+02:00
diff --git a/caching/src/main/java/com/iluwatar/caching/DbManager.java b/caching/src/main/java/com/iluwatar/caching/DbManager.java
@@ -37,7 +37,7 @@ private DbManager() {
    */
   public static void createVirtualDb() {
     useMongoDB = false;
-    virtualDB = new HashMap<String, UserAccount>();
+    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
@@ -27,7 +27,7 @@ public Node(String userId, UserAccount userAccount) {
   }
 
   int capacity;
-  HashMap<String, Node> cache = new HashMap<String, Node>();
+  HashMap<String, Node> cache = new HashMap<>();
   Node head = null;
   Node end = null;
 
@@ -140,7 +140,7 @@ public void clear() {
    * Returns cache data in list form.
    */
   public ArrayList<UserAccount> getCacheDataInListForm() {
-    ArrayList<UserAccount> listOfCacheData = new ArrayList<UserAccount>();
+    ArrayList<UserAccount> 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
@@ -10,7 +10,7 @@
  */
 public abstract class LetterComposite {
 
-  private List<LetterComposite> children = new ArrayList<LetterComposite>();
+  private List<LetterComposite> 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
@@ -13,7 +13,7 @@ public class Messenger {
 
   LetterComposite messageFromOrcs() {
 
-    List<Word> words = new ArrayList<Word>();
+    List<Word> 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 @@ LetterComposite messageFromOrcs() {
 
   LetterComposite messageFromElves() {
 
-    List<Word> words = new ArrayList<Word>();
+    List<Word> 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
@@ -52,7 +52,7 @@ public static List<Customer> generateSampleCustomers() {
     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<Customer> customers = new ArrayList<Customer>();
+    final List<Customer> 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
@@ -18,7 +18,7 @@ public class CustomerDaoImplTest {
 
   @Before
   public void setUp() {
-    customers = new ArrayList<Customer>();
+    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
@@ -141,7 +141,7 @@ public List<CakeInfo> getAllCakes() {
       CakeToppingInfo cakeToppingInfo =
           new CakeToppingInfo(cake.getTopping().getId(), cake.getTopping().getName(), cake
               .getTopping().getCalories());
-      ArrayList<CakeLayerInfo> cakeLayerInfos = new ArrayList<CakeLayerInfo>();
+      ArrayList<CakeLayerInfo> 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
@@ -11,7 +11,7 @@ public class SimpleMessageQueue implements MessageQueue {
   private final BlockingQueue<Message> queue;
 
   public SimpleMessageQueue(int bound) {
-    queue = new ArrayBlockingQueue<Message>(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
@@ -11,7 +11,7 @@ public class ItemQueue {
 
   public ItemQueue() {
 
-    queue = new LinkedBlockingQueue<Item>(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
@@ -48,13 +48,13 @@ public List<Spell> findAllSpells() {
   @Override
   public List<Wizard> findWizardsWithSpellbook(String name) {
     Spellbook spellbook = spellbookDao.findByName(name);
-    return new ArrayList<Wizard>(spellbook.getWizards());
+    return new ArrayList<>(spellbook.getWizards());
   }
 
   @Override
   public List<Wizard> findWizardsWithSpell(String name) {
     Spell spell = spellDao.findByName(name);
     Spellbook spellbook = spell.getSpellbook();
-    return new ArrayList<Wizard>(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
@@ -27,8 +27,8 @@
 public class Spellbook extends BaseEntity {
 
   public Spellbook() {
-    spells = new HashSet<Spell>();
-    wizards = new HashSet<Wizard>();
+    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
@@ -24,7 +24,7 @@
 public class Wizard extends BaseEntity {
 
   public Wizard() {
-    spellbooks = new HashSet<Spellbook>();
+    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
@@ -16,7 +16,7 @@ public class ServiceCache {
   private final Map<String, Service> serviceCache;
 
   public ServiceCache() {
-    serviceCache = new HashMap<String, Service>();
+    serviceCache = new HashMap<>();
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ private DbManager() {`
`37`	`37`	`*/`
`38`	`38`	`public static void createVirtualDb() {`
`39`	`39`	`useMongoDB = false;`
`40`		`- virtualDB = new HashMap<String, UserAccount>();`
	`40`	`+ virtualDB = new HashMap<>();`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class CustomerDaoImplTest {`
`18`	`18`
`19`	`19`	`@Before`
`20`	`20`	`public void setUp() {`
`21`		`- customers = new ArrayList<Customer>();`
	`21`	`+ customers = new ArrayList<>();`
`22`	`22`	`customers.add(CUSTOMER);`
`23`	`23`	`impl = new CustomerDaoImpl(customers);`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public List<CakeInfo> getAllCakes() {`
`141`	`141`	`CakeToppingInfo cakeToppingInfo =`
`142`	`142`	`new CakeToppingInfo(cake.getTopping().getId(), cake.getTopping().getName(), cake`
`143`	`143`	`.getTopping().getCalories());`
`144`		`- ArrayList<CakeLayerInfo> cakeLayerInfos = new ArrayList<CakeLayerInfo>();`
	`144`	`+ ArrayList<CakeLayerInfo> cakeLayerInfos = new ArrayList<>();`
`145`	`145`	`for (CakeLayer layer : cake.getLayers()) {`
`146`	`146`	`cakeLayerInfos.add(new CakeLayerInfo(layer.getId(), layer.getName(), layer.getCalories()));`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class SimpleMessageQueue implements MessageQueue {`
`11`	`11`	`private final BlockingQueue<Message> queue;`
`12`	`12`
`13`	`13`	`public SimpleMessageQueue(int bound) {`
`14`		`- queue = new ArrayBlockingQueue<Message>(bound);`
	`14`	`+ queue = new ArrayBlockingQueue<>(bound);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class ItemQueue {`
`11`	`11`
`12`	`12`	`public ItemQueue() {`
`13`	`13`
`14`		`- queue = new LinkedBlockingQueue<Item>(5);`
	`14`	`+ queue = new LinkedBlockingQueue<>(5);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public void put(Item item) throws InterruptedException {`
Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,13 @@ public List<Spell> findAllSpells() {`
`48`	`48`	`@Override`
`49`	`49`	`public List<Wizard> findWizardsWithSpellbook(String name) {`
`50`	`50`	`Spellbook spellbook = spellbookDao.findByName(name);`
`51`		`- return new ArrayList<Wizard>(spellbook.getWizards());`
	`51`	`+ return new ArrayList<>(spellbook.getWizards());`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`
`55`	`55`	`public List<Wizard> findWizardsWithSpell(String name) {`
`56`	`56`	`Spell spell = spellDao.findByName(name);`
`57`	`57`	`Spellbook spellbook = spell.getSpellbook();`
`58`		`- return new ArrayList<Wizard>(spellbook.getWizards());`
	`58`	`+ return new ArrayList<>(spellbook.getWizards());`
`59`	`59`	`}`
`60`	`60`	`}`