Merge pull request iluwatar#364 from DevFactory/release/The-diamond-operator-should-be-used-fix-1

iluwatar · iluwatar · commit f08af145552f · 2016-02-01T22:26:43.000+02:00
squid:S2293 - The diamond operator should be used
diff --git a/caching/src/main/java/com/iluwatar/caching/DbManager.java b/caching/src/main/java/com/iluwatar/caching/DbManager.java
@@ -59,7 +59,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
@@ -49,7 +49,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;
 
@@ -162,7 +162,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
@@ -32,7 +32,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
@@ -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 @@ 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
@@ -74,7 +74,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
@@ -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
@@ -163,7 +163,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
@@ -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
@@ -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
@@ -70,13 +70,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
@@ -49,8 +49,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
@@ -46,7 +46,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
@@ -38,7 +38,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
`@@ -59,7 +59,7 @@ private DbManager() {`
`59`	`59`	`*/`
`60`	`60`	`public static void createVirtualDb() {`
`61`	`61`	`useMongoDB = false;`
`62`		`- virtualDB = new HashMap<String, UserAccount>();`
	`62`	`+ virtualDB = new HashMap<>();`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public class CustomerDaoImplTest {`
`40`	`40`
`41`	`41`	`@Before`
`42`	`42`	`public void setUp() {`
`43`		`- customers = new ArrayList<Customer>();`
	`43`	`+ customers = new ArrayList<>();`
`44`	`44`	`customers.add(CUSTOMER);`
`45`	`45`	`impl = new CustomerDaoImpl(customers);`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public List<CakeInfo> getAllCakes() {`
`163`	`163`	`CakeToppingInfo cakeToppingInfo =`
`164`	`164`	`new CakeToppingInfo(cake.getTopping().getId(), cake.getTopping().getName(), cake`
`165`	`165`	`.getTopping().getCalories());`
`166`		`- ArrayList<CakeLayerInfo> cakeLayerInfos = new ArrayList<CakeLayerInfo>();`
	`166`	`+ ArrayList<CakeLayerInfo> cakeLayerInfos = new ArrayList<>();`
`167`	`167`	`for (CakeLayer layer : cake.getLayers()) {`
`168`	`168`	`cakeLayerInfos.add(new CakeLayerInfo(layer.getId(), layer.getName(), layer.getCalories()));`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class SimpleMessageQueue implements MessageQueue {`
`33`	`33`	`private final BlockingQueue<Message> queue;`
`34`	`34`
`35`	`35`	`public SimpleMessageQueue(int bound) {`
`36`		`- queue = new ArrayBlockingQueue<Message>(bound);`
	`36`	`+ queue = new ArrayBlockingQueue<>(bound);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class ItemQueue {`
`33`	`33`
`34`	`34`	`public ItemQueue() {`
`35`	`35`
`36`		`- queue = new LinkedBlockingQueue<Item>(5);`
	`36`	`+ queue = new LinkedBlockingQueue<>(5);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public void put(Item item) throws InterruptedException {`
Original file line number	Diff line number	Diff line change
`@@ -70,13 +70,13 @@ public List<Spell> findAllSpells() {`
`70`	`70`	`@Override`
`71`	`71`	`public List<Wizard> findWizardsWithSpellbook(String name) {`
`72`	`72`	`Spellbook spellbook = spellbookDao.findByName(name);`
`73`		`- return new ArrayList<Wizard>(spellbook.getWizards());`
	`73`	`+ return new ArrayList<>(spellbook.getWizards());`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Override`
`77`	`77`	`public List<Wizard> findWizardsWithSpell(String name) {`
`78`	`78`	`Spell spell = spellDao.findByName(name);`
`79`	`79`	`Spellbook spellbook = spell.getSpellbook();`
`80`		`- return new ArrayList<Wizard>(spellbook.getWizards());`
	`80`	`+ return new ArrayList<>(spellbook.getWizards());`
`81`	`81`	`}`
`82`	`82`	`}`