Refactored code

Author: DivyaDua

src/main/java/DoubleOfEvenNumberAfter3.java

@@ -7,8 +7,8 @@ private static Integer computeImperative(List<Integer> numbers) {
         Integer result = null;
 
         for(int e : numbers) {
-            if(UtilityMethods.findNumberGreaterThan3(e) && UtilityMethods.findEvenNumber(e)) {
-                result = UtilityMethods.doubleTheValue(e);
+            if(Utility.findNumberGreaterThan3(e) && Utility.findEvenNumber(e)) {
+                result = Utility.doubleTheValue(e);
                 break;
             }
         }

src/main/scala/PlayingWithNumbers.scala

@@ -12,8 +12,8 @@ object PlayingWithNumbers extends App {
     var result = 0
     breakable {
       for(num <- numbers){
-        if (UtilityMethods.findNumberGreaterThan3(num) && UtilityMethods.findEvenNumber(num)) {
-          result = num * 2
+        if (Utility.findNumberGreaterThan3(num) && Utility.findEvenNumber(num)) {
+          result = Utility.doubleTheValue(num)
           break
         }
       }

src/main/scala/PlayingWithNumbersFunctionally.scala

@@ -10,9 +10,9 @@ object PlayingWithNumbersFunctionally extends App {
 
   def computeFunctionally(numbers: List[Int]): Int = {
     numbers
-      .filter(UtilityMethods.findNumberGreaterThan3)
-      .filter(UtilityMethods.findEvenNumber)
-      .map(UtilityMethods.doubleTheValue)
+      .filter(Utility.findNumberGreaterThan3)
+      .filter(Utility.findEvenNumber)
+      .map(Utility.doubleTheValue)
       .head
   }
 

src/main/scala/PlayingWithNumbersLazily.scala

@@ -10,9 +10,9 @@ object PlayingWithNumbersLazily extends App {
   def computeUsingLazyEvaluation(numbers: List[Int]): Int = {
     numbers
       .toStream
-      .filter(UtilityMethods.findNumberGreaterThan3)
-      .filter(UtilityMethods.findEvenNumber)
-      .map(UtilityMethods.doubleTheValue)
+      .filter(Utility.findNumberGreaterThan3)
+      .filter(Utility.findEvenNumber)
+      .map(Utility.doubleTheValue)
       .head
   }
 

src/main/scala/Prices.scala

@@ -17,8 +17,8 @@ object Prices extends App{
   println(s"total of discounted prices $totalDiscountPrices")
 
   val totalDiscountPricesUsingFP = prices
-    .filter(_ > 20)
-    .map(_ * 0.9)
+    .filter(e => e > 20)
+    .map(e => e * 0.9)
     .sum
 
   println(s"total of discounted prices using Functional Composition " +

src/main/scala/UtilityMethods.scala renamed to src/main/scala/Utility.scala

@@ -2,20 +2,20 @@
 /**
   * Commonly used methods
   */
-object UtilityMethods {
+object Utility {
 
   def findNumberGreaterThan3(number: Int): Boolean = {
-    println("Inside findNumberGreaterThan3")
+    println(s"Inside findNumberGreaterThan3 with number $number")
     number > 3
   }
 
   def findEvenNumber(number: Int): Boolean = {
-    println("Inside findEvenNumber")
+    println(s"Inside findEvenNumber with number $number")
     number % 2 == 0
   }
 
   def doubleTheValue(number: Int): Int = {
-    println("Inside doubleTheValue")
+    println(s"Inside doubleTheValue with number $number")
     number * 2
   }
 }