diff --git a/caching/src/main/java/com/iluwatar/caching/DbManager.java b/caching/src/main/java/com/iluwatar/caching/DbManager.java
index c9f11fec0..841ad6614 100644
--- a/caching/src/main/java/com/iluwatar/caching/DbManager.java
+++ b/caching/src/main/java/com/iluwatar/caching/DbManager.java
@@ -59,7 +59,7 @@ public class 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
index d1a6411f5..6c86c1a53 100644
--- a/caching/src/main/java/com/iluwatar/caching/LruCache.java
+++ b/caching/src/main/java/com/iluwatar/caching/LruCache.java
@@ -49,7 +49,7 @@ public class LruCache {
   }
 
   int capacity;
-  HashMap<String, Node> cache = new HashMap<String, Node>();
+  HashMap<String, Node> cache = new HashMap<>();
   Node head = null;
   Node end = null;
 
@@ -162,7 +162,7 @@ public class LruCache {
    * 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
index d72ffd531..940562969 100644
--- a/composite/src/main/java/com/iluwatar/composite/LetterComposite.java
+++ b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java
@@ -32,7 +32,7 @@ import java.util.List;
  */
 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
index ab62639a6..3b758d680 100644
--- a/composite/src/main/java/com/iluwatar/composite/Messenger.java
+++ b/composite/src/main/java/com/iluwatar/composite/Messenger.java
@@ -35,7 +35,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'))));
@@ -57,7 +57,7 @@ public class Messenger {
 
   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
index 312239dba..9940b19bc 100644
--- a/dao/src/main/java/com/iluwatar/dao/App.java
+++ b/dao/src/main/java/com/iluwatar/dao/App.java
@@ -74,7 +74,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<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
index e4e81444f..f30740629 100644
--- a/dao/src/test/java/com/iluwatar/dao/CustomerDaoImplTest.java
+++ b/dao/src/test/java/com/iluwatar/dao/CustomerDaoImplTest.java
@@ -40,7 +40,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
index c60281542..dd62fa632 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
@@ -163,7 +163,7 @@ public class CakeBakingServiceImpl implements CakeBakingService {
       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
index 92b0214a6..6f45742e9 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
@@ -33,7 +33,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
index 554789db8..33a723589 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
@@ -33,7 +33,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
index c804f44b8..71756d4cf 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
@@ -70,13 +70,13 @@ public class MagicServiceImpl implements MagicService {
   @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
index 4c7870c4f..7b84d12b5 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
@@ -49,8 +49,8 @@ import com.iluwatar.servicelayer.wizard.Wizard;
 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
index 3fe1872dd..15298b648 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
@@ -46,7 +46,7 @@ import com.iluwatar.servicelayer.spellbook.Spellbook;
 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
index 268b01bd6..7e2169fcb 100644
--- a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java
+++ b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java
@@ -38,7 +38,7 @@ public class ServiceCache {
   private final Map<String, Service> serviceCache;
 
   public ServiceCache() {
-    serviceCache = new HashMap<String, Service>();
+    serviceCache = new HashMap<>();
   }
 
   /**