Merge branch 'master' into BAEL-8421

Author: oscarramadhan

algorithms-modules/algorithms-miscellaneous-1/README.md

@@ -35,6 +35,16 @@
             <artifactId>combinatoricslib3</artifactId>
             <version>${combinatoricslib3.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${xml-bind-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
     </dependencies>
 
     <reporting>
@@ -59,6 +69,7 @@
 
     <properties>
         <combinatoricslib3.version>3.3.0</combinatoricslib3.version>
+        <xml-bind-api.version>4.0.0</xml-bind-api.version>
     </properties>
 
 </project>

algorithms-modules/algorithms-miscellaneous-1/pom.xml

@@ -1,12 +1,14 @@
 package com.baeldung.algorithms.conversion;
 
-import com.google.common.io.BaseEncoding;
-import jakarta.xml.bind.DatatypeConverter;
+import java.math.BigInteger;
+import java.util.HexFormat;
+
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
 
-import java.math.BigInteger;
-import java.util.HexFormat;
+import com.google.common.io.BaseEncoding;
+
+import jakarta.xml.bind.DatatypeConverter;
 
 public class HexStringConverter {
 

algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/conversion/HexStringConverter.java

@@ -1,4 +1,4 @@
-package com.baeldung.algorithms.ga.dijkstra;
+package com.baeldung.algorithms.dijkstra;
 
 import java.util.HashSet;
 import java.util.LinkedList;

algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Dijkstra.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/dijkstra/Dijkstra.java

@@ -1,4 +1,4 @@
-package com.baeldung.algorithms.ga.dijkstra;
+package com.baeldung.algorithms.dijkstra;
 
 import java.util.HashSet;
 import java.util.Set;

algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Graph.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/dijkstra/Graph.java

@@ -1,4 +1,4 @@
-package com.baeldung.algorithms.ga.dijkstra;
+package com.baeldung.algorithms.dijkstra;
 
 import java.util.HashMap;
 import java.util.LinkedList;

algorithms-modules/algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/ga/dijkstra/Node.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/dijkstra/Node.java

@@ -0,0 +1,46 @@
+package com.baeldung.algorithms.enumstatemachine;
+
+public enum LeaveRequestState {
+
+    Submitted {
+        @Override
+        public LeaveRequestState nextState() {
+            System.out.println("Starting the Leave Request and sending to Team Leader for approval.");
+            return Escalated;
+        }
+
+        @Override
+        public String responsiblePerson() {
+            return "Employee";
+        }
+    },
+    Escalated {
+        @Override
+        public LeaveRequestState nextState() {
+            System.out.println("Reviewing the Leave Request and escalating to Department Manager.");
+            return Approved;
+        }
+
+        @Override
+        public String responsiblePerson() {
+            return "Team Leader";
+        }
+    },
+    Approved {
+        @Override
+        public LeaveRequestState nextState() {
+            System.out.println("Approving the Leave Request.");
+            return this;
+        }
+
+        @Override
+        public String responsiblePerson() {
+            return "Department Manager";
+        }
+    };
+
+    public abstract String responsiblePerson();
+
+    public abstract LeaveRequestState nextState();
+
+}

algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java

@@ -1,14 +1,14 @@
 package com.baeldung.algorithms.conversion;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.apache.commons.codec.DecoderException;
 import org.hamcrest.text.IsEqualIgnoringCase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 class ByteArrayConverterUnitTest {
 
     private HexStringConverter hexStringConverter;

algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/latlondistance/EquirectangularApproximation.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/latlondistance/EquirectangularApproximation.java

@@ -1,16 +1,16 @@
-package com.baeldung.algorithms;
+package com.baeldung.algorithms.dijkstra;
 
-import com.baeldung.algorithms.ga.dijkstra.Dijkstra;
-import com.baeldung.algorithms.ga.dijkstra.Graph;
-import com.baeldung.algorithms.ga.dijkstra.Node;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertTrue;
-
 import org.junit.jupiter.api.Test;
 
+import com.baeldung.algorithms.dijkstra.Dijkstra;
+import com.baeldung.algorithms.dijkstra.Graph;
+import com.baeldung.algorithms.dijkstra.Node;
+
 class DijkstraAlgorithmLongRunningUnitTest {
 
     @Test

algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/latlondistance/HaversineDistance.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/latlondistance/HaversineDistance.java

@@ -0,0 +1,37 @@
+package com.baeldung.algorithms.enumstatemachine;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+class LeaveRequestStateUnitTest {
+
+    @Test
+    void givenLeaveRequest_whenStateEscalated_thenResponsibleIsTeamLeader() {
+        LeaveRequestState state = LeaveRequestState.Escalated;
+
+        assertEquals( "Team Leader", state.responsiblePerson());
+    }
+
+
+    @Test
+    void givenLeaveRequest_whenStateApproved_thenResponsibleIsDepartmentManager() {
+        LeaveRequestState state = LeaveRequestState.Approved;
+
+        assertEquals( "Department Manager" , state.responsiblePerson());
+    }
+
+    @Test
+    void givenLeaveRequest_whenNextStateIsCalled_thenStateIsChanged() {
+        LeaveRequestState state = LeaveRequestState.Submitted;
+
+        state = state.nextState();
+        assertEquals(LeaveRequestState.Escalated, state);
+
+        state = state.nextState();
+        assertEquals(LeaveRequestState.Approved, state);
+
+        state = state.nextState();
+        assertEquals(LeaveRequestState.Approved, state);
+    }
+}

algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/latlondistance/VincentyDistance.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/latlondistance/VincentyDistance.java

@@ -1,9 +1,9 @@
 package com.baeldung.algorithms.latlondistance;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
+
 class GeoDistanceUnitTest {
     @Test
     public void testCalculateDistance() {

algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithm.java

@@ -1,9 +1,9 @@
 package com.baeldung.algorithms.maximumsubarray;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class BruteForceAlgorithmUnitTest {
 
     @Test

algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java

@@ -1,9 +1,9 @@
 package com.baeldung.algorithms.maximumsubarray;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class KadaneAlgorithmUnitTest {
 
     @Test

algorithms-modules/algorithms-miscellaneous-4/src/main/java/com/baeldung/algorithms/permutation/Permutation.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/permutation/Permutation.java

@@ -1,12 +1,10 @@
-package com.baeldung.algorithms;
+package com.baeldung.algorithms.automata;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
-import com.baeldung.algorithms.automata.*;
-
 class RtFiniteStateMachineLongRunningUnitTest {
 
     @Test

algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/conversion/ByteArrayConverterUnitTest.java

@@ -1,19 +1,15 @@
-package com.baeldung.algorithms;
+package com.baeldung.algorithms.hillclimbing;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import com.baeldung.algorithms.hillclimbing.HillClimbing;
-import com.baeldung.algorithms.hillclimbing.State;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 class HillClimbingAlgorithmUnitTest {
     private Stack<String> initStack;

algorithms-modules/algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/DijkstraAlgorithmLongRunningUnitTest.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/dijkstra/DijkstraAlgorithmLongRunningUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.algorithms;
+package com.baeldung.algorithms.middleelementlookup;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestStateUnitTest.java

@@ -31,12 +31,6 @@
             <version>${tradukisto.version}</version>
         </dependency>
 
-        <!-- API, java.xml.bind module -->
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>${xml-bind-api.version}</version>
-        </dependency>
         <!-- Runtime, com.sun.xml.bind module -->
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
@@ -59,7 +53,6 @@
     </build>
 
     <properties>
-        <xml-bind-api.version>4.0.0</xml-bind-api.version>
         <jaxb-runtime.version>4.0.0</jaxb-runtime.version>
     </properties>
 

algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/latlondistance/GeoDistanceUnitTest.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/latlondistance/GeoDistanceUnitTest.java

@@ -1,4 +1,4 @@
-package com.baledung.algorithms.countoccurence;
+package com.baeldung.algorithms.countoccurence;
 
 import java.util.Arrays;
 import java.util.HashMap;

algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/maximumsubarray/BruteForceAlgorithmUnitTest.java

@@ -1,4 +1,4 @@
-package com.baledung.algorithms.successivepairs;
+package com.baeldung.algorithms.successivepairs;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;

algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java renamed to algorithms-modules/algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java

@@ -1,8 +1,8 @@
 package com.baeldung.algorithms.countoccurence;
 
-import static com.baledung.algorithms.countoccurence.CountOccurrence.countOccurrencesWithCounter;
-import static com.baledung.algorithms.countoccurence.CountOccurrence.countOccurrencesWithMap;
-import static com.baledung.algorithms.countoccurence.CountOccurrence.countOccurrencesWithStream;
+import static com.baeldung.algorithms.countoccurence.CountOccurrence.countOccurrencesWithCounter;
+import static com.baeldung.algorithms.countoccurence.CountOccurrence.countOccurrencesWithMap;
+import static com.baeldung.algorithms.countoccurence.CountOccurrence.countOccurrencesWithStream;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Map;