♻️ refactoring code

Author: github-actions[bot]

src/main/java/org/rrajesh1979/utils/JWTUtil.java

@@ -20,7 +20,9 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.TreeMap;
 
+import com.sun.source.tree.Tree;
 import lombok.extern.slf4j.Slf4j;
 import org.javatuples.Pair;
 import org.json.JSONObject;
@@ -54,9 +56,10 @@ public static Pair<String, String> createJWT(String typ, String alg, String user
                                                  String iss, String sub, String aud, boolean iat, long exp) {
 
         /* Construct JWT Header */
-        Map<String, Object> header = new HashMap<>();
-        header.put("typ", Objects.requireNonNullElse(typ, "JWT"));
+        Map<String, Object> header = new TreeMap<>();
         header.put("alg", Objects.requireNonNullElse(alg, "HS256"));
+        header.put("typ", Objects.requireNonNullElse(typ, "JWT"));
+        log.debug(header.toString());
 
         /* Construct JWT Payload */
         JSONObject payload = new JSONObject(userInput);

src/test/java/org/rrajesh1979/utils/JWTUtilTest.java

@@ -38,8 +38,8 @@ void encodeDecodeJWTTest() {
         String key = jwtAndKey.getValue1();
 
         Pair<String, String> decodedJwtAndKey = JWTUtil.decodeJWT(jwt, key);
-        assertEquals(decodedJwtAndKey.getValue0(), "{typ=JWT, alg=HS512}");
-        assertEquals(decodedJwtAndKey.getValue1(), "{sub=JWT Encoder, aud=Hello JWT, name=Joe, iss=rrajesh1979, picture=https://example.com/image.png}");
+        assertEquals("{alg=HS512, typ=JWT}", decodedJwtAndKey.getValue0());
+        assertEquals("{sub=JWT Encoder, aud=Hello JWT, name=Joe, iss=rrajesh1979, picture=https://example.com/image.png}", decodedJwtAndKey.getValue1());
     }
 
     @Test