Please cherry-pick:

[jjobs-war.git] / src / java / org / mxchange / jjobs / beans / phone / JobsPhoneWebRequestBean.java

diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java
index b29046de6949619e13a0f6dcd14a607fc16180d1..5ee30477ff2bea02d2f9e695de17d856c57be174 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java
@@ -18,7 +18,6 @@ package org.mxchange.jjobs.beans.phone;
 
 import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
@@ -487,16 +486,10 @@ public class JobsPhoneWebRequestBean extends BaseJobsBean implements JobsPhoneWe
                // Init list
                final List<DialableFaxNumber> list = new LinkedList<>();
 
-               // Get iterator
-               final Iterator<Cache.Entry<Long, DialableFaxNumber>> iterator = this.faxNumberCache.iterator();
-
                // Loop over all
-               while (iterator.hasNext()) {
-                       // Get next entry
-                       final Cache.Entry<Long, DialableFaxNumber> next = iterator.next();
-
+               for (final Cache.Entry<Long, DialableFaxNumber> currentEntry : this.faxNumberCache) {
                        // Add value to list
-                       list.add(next.getValue());
+                       list.add(currentEntry.getValue());
                }
 
                // Return it
@@ -509,16 +502,10 @@ public class JobsPhoneWebRequestBean extends BaseJobsBean implements JobsPhoneWe
                // Init list
                final List<DialableLandLineNumber> list = new LinkedList<>();
 
-               // Get iterator
-               final Iterator<Cache.Entry<Long, DialableLandLineNumber>> iterator = this.landLineNumberCache.iterator();
-
                // Loop over all
-               while (iterator.hasNext()) {
-                       // Get next entry
-                       final Cache.Entry<Long, DialableLandLineNumber> next = iterator.next();
-
+               for (final Cache.Entry<Long, DialableLandLineNumber> currentEntry : this.landLineNumberCache) {
                        // Add value to list
-                       list.add(next.getValue());
+                       list.add(currentEntry.getValue());
                }
 
                // Return it
@@ -531,16 +518,10 @@ public class JobsPhoneWebRequestBean extends BaseJobsBean implements JobsPhoneWe
                // Init list
                final List<DialableMobileNumber> list = new LinkedList<>();
 
-               // Get iterator
-               final Iterator<Cache.Entry<Long, DialableMobileNumber>> iterator = this.mobileNumberCache.iterator();
-
                // Loop over all
-               while (iterator.hasNext()) {
-                       // Get next entry
-                       final Cache.Entry<Long, DialableMobileNumber> next = iterator.next();
-
+               for (final Cache.Entry<Long, DialableMobileNumber> currentEntry : this.mobileNumberCache) {
                        // Add value to list
-                       list.add(next.getValue());
+                       list.add(currentEntry.getValue());
                }
 
                // Return it
@@ -617,7 +598,7 @@ public class JobsPhoneWebRequestBean extends BaseJobsBean implements JobsPhoneWe
        public void init () {
                // Is cache there?
                if (!this.faxNumberCache.iterator().hasNext()) {
-                       // Get whole list
+                       // Get whole list from EJB
                        final List<DialableFaxNumber> faxNumbers = this.phoneBean.allFaxNumbers();
 
                        // Add all
@@ -629,7 +610,7 @@ public class JobsPhoneWebRequestBean extends BaseJobsBean implements JobsPhoneWe
 
                // Is cache there?
                if (!this.landLineNumberCache.iterator().hasNext()) {
-                       // Get whole list
+                       // Get whole list from EJB
                        final List<DialableLandLineNumber> lineNumbers = this.phoneBean.allLandLineNumbers();
 
                        // Add all
@@ -641,7 +622,7 @@ public class JobsPhoneWebRequestBean extends BaseJobsBean implements JobsPhoneWe
 
                // Is cache there?
                if (!this.mobileNumberCache.iterator().hasNext()) {
-                       // Get whole list
+                       // Get whole list from EJB
                        final List<DialableMobileNumber> mobileNumbers = this.phoneBean.allMobileNumbers();
 
                        // Add all