Merge remote-tracking branch 'upstream/master'

algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java

@@ -1,22 +1,15 @@
 package com.baeldung.algorithms.editdistance;
 
+import java.util.Arrays;
+
 public class EditDistanceBase {
 
-    public static int costOfSubstitution(char a, char b) {
-        if (a == b) {
-            return 0;
-        }
-        return 1;
+    static int costOfSubstitution(char a, char b) {
+        return a == b ? 0 : 1;
     }
 
-    public static int min(int... numbers) {
-        int min = Integer.MAX_VALUE;
-
-        for (int x : numbers) {
-            if (x < min)
-                min = x;
-        }
-
-        return min;
+    static int min(int... numbers) {
+        return Arrays.stream(numbers)
+          .min().orElse(Integer.MAX_VALUE);
     }
 }

algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java

@@ -2,7 +2,7 @@ package com.baeldung.algorithms.editdistance;
 
 public class EditDistanceDynamicProgramming extends EditDistanceBase {
 
-    public static int calculate(String x, String y) {
+    static int calculate(String x, String y) {
         int[][] dp = new int[x.length() + 1][y.length() + 1];
 
         for (int i = 0; i <= x.length(); i++) {
@@ -14,12 +14,13 @@ public class EditDistanceDynamicProgramming extends EditDistanceBase {
                     dp[i][j] = i;
 
                 else {
-                    dp[i][j] = min(dp[i - 1][j - 1] + costOfSubstitution(x.charAt(i - 1), y.charAt(j - 1)), dp[i - 1][j] + 1, dp[i][j - 1] + 1);
+                    dp[i][j] = min(dp[i - 1][j - 1]
+                        + costOfSubstitution(x.charAt(i - 1), y.charAt(j - 1)),
+                      dp[i - 1][j] + 1, dp[i][j - 1] + 1);
                 }
             }
         }
 
         return dp[x.length()][y.length()];
     }
-
 }

algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java

@@ -2,13 +2,15 @@ package com.baeldung.algorithms.editdistance;
 
 public class EditDistanceRecursive extends EditDistanceBase {
 
-    public static int calculate(String x, String y) {
+    static int calculate(String x, String y) {
 
-        if (x.isEmpty())
+        if (x.isEmpty()) {
             return y.length();
+        }
 
-        if (y.isEmpty())
+        if (y.isEmpty()) {
             return x.length();
+        }
 
         int substitution = calculate(x.substring(1), y.substring(1)) + costOfSubstitution(x.charAt(0), y.charAt(0));
         int insertion = calculate(x, y.substring(1)) + 1;
@@ -16,5 +18,4 @@ public class EditDistanceRecursive extends EditDistanceBase {
 
         return min(substitution, insertion, deletion);
     }
-
 }

algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java

@@ -1,16 +1,17 @@
 package com.baeldung.algorithms.editdistance;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import static org.junit.Assert.assertEquals;
+
 @RunWith(Parameterized.class)
 public class EditDistanceTest extends EditDistanceDataProvider {
 
-    String x;
-    String y;
-    int result;
+    private String x;
+    private String y;
+    private int result;
 
     public EditDistanceTest(String a, String b, int res) {
         super();
@@ -21,11 +22,11 @@ public class EditDistanceTest extends EditDistanceDataProvider {
 
     @Test
     public void testEditDistance_RecursiveImplementation() {
-        Assert.assertEquals(result, EditDistanceRecursive.calculate(x, y));
+        assertEquals(result, EditDistanceRecursive.calculate(x, y));
     }
 
     @Test
     public void testEditDistance_givenDynamicProgrammingImplementation() {
-        Assert.assertEquals(result, EditDistanceDynamicProgramming.calculate(x, y));
+        assertEquals(result, EditDistanceDynamicProgramming.calculate(x, y));
     }
 }

apache-spark/src/main/java/com/baeldung/WordCount.java

@@ -17,37 +17,24 @@ import scala.Tuple2;
 public class WordCount {
 
     private static final Pattern SPACE = Pattern.compile(" ");
-    
+
     public static void main(String[] args) throws Exception {
-    if (args.length < 1) {
-        System.err.println("Usage: JavaWordCount <file>");
-        System.exit(1);
+        if (args.length < 1) {
+            System.err.println("Usage: JavaWordCount <file>");
+            System.exit(1);
+        }
+        SparkConf sparkConf = new SparkConf().setAppName("JavaWordCount")
+            .setMaster("local");
+        JavaSparkContext ctx = new JavaSparkContext(sparkConf);
+        JavaRDD<String> lines = ctx.textFile(args[0], 1);
+
+        JavaRDD<String> words = lines.flatMap(s -> Arrays.asList(SPACE.split(s)).iterator());
+        JavaPairRDD<String, Integer> wordAsTuple = words.mapToPair(word -> new Tuple2<>(word, 1));
+        JavaPairRDD<String, Integer> wordWithCount = wordAsTuple.reduceByKey((Integer i1, Integer i2)->i1 + i2);
+        List<Tuple2<String, Integer>> output = wordWithCount.collect();
+        for (Tuple2<?, ?> tuple : output) {
+             System.out.println(tuple._1() + ": " + tuple._2());
+        }
+        ctx.stop();
     }
-    SparkConf sparkConf = new SparkConf().setAppName("JavaWordCount").setMaster("local");
-    JavaSparkContext ctx = new JavaSparkContext(sparkConf);
-    JavaRDD<String> lines = ctx.textFile(args[0], 1);
-
-    JavaRDD<String> words = lines.flatMap(s -> Arrays.asList(SPACE.split(s)).iterator());
-    JavaPairRDD<String, Integer> ones = words.mapToPair(
-      new PairFunction<String, String, Integer>() {
-          @Override
-          public Tuple2<String, Integer> call(String s) {
-              return new Tuple2<>(s, 1);
-          }
-      });
-
-    JavaPairRDD<String, Integer> counts = ones.reduceByKey(
-      new Function2<Integer, Integer, Integer>() {
-          @Override
-          public Integer call(Integer i1, Integer i2) {
-              return i1 + i2;
-          }
-      });
-
-    List<Tuple2<String, Integer>> output = counts.collect();
-    for (Tuple2<?, ?> tuple : output) {
-        System.out.println(tuple._1() + ": " + tuple._2());
-    }
-    ctx.stop();
-}
 }

cas-secured-app/README.md

@@ -1 +0,0 @@
-## Relevant articles:

cas/cas-secured-app/.gitignore

@@ -0,0 +1,27 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+/.mvn/
+/mvnw
+/mvnw.cmd