Update variable names for Token Connection and Request Timeout (#1957)

* Update Update variable names for Token Connection and Request Timeouts

* Update Update variable names for Token Connection and Request Timeouts

* downgrade to snakeyaml 1.33 until PR #1955 is merged, since PR 1955 has code needed to make light-4j 1.6.x compatible with snakeyaml 2.2

* downgrade to jackson 2.14.0 until PR #1955 is merged, since PR 1955 has code needed to make light-4j 1.6.x compatible with Jackson 2.14.0 (see comments here 0c83580#commitcomment-131731260)

* Update TokenRequest.java

To align to existing code, Add new line at EOF

---------

Co-authored-by: Jaydeep.Parekh@cibc.com <jaydeep.parekh@cibc.com>
Co-authored-by: Michael Christoff <mike.christoff@cibc.com>

client/src/main/java/com/networknt/client/oauth/TokenRequest.java

@@ -122,9 +122,9 @@ public class TokenRequest {
      */
     private String csrf;
 
-    private static final Long DEFAULT_TOKEN_CONNECTION_TIMEOUT = 2000L;
-    private long tokenConnectionTimeout = DEFAULT_TOKEN_CONNECTION_TIMEOUT;
-    protected static final Long DEFAULT_POPULATE_TOKEN_TIMEOUT = 4000L;
+    private static final long DEFAULT_TOKEN_CONNECTION_TIMEOUT = 2000L;
+    private Long connectionTokenTimeout = DEFAULT_TOKEN_CONNECTION_TIMEOUT;
+    protected static final long DEFAULT_POPULATE_TOKEN_TIMEOUT = 4000L;
     private Long populateTokenTimeout = DEFAULT_POPULATE_TOKEN_TIMEOUT;
 
     public TokenRequest() {
@@ -194,25 +194,27 @@ public void setServiceId(String serviceId) {
 
     public void setCsrf(String csrf) { this.csrf = csrf; }
 
-    public long getTokenConnectionTimeout() { return tokenConnectionTimeout; }
-
-    public void setTokenConnectionTimeout(Long tokenConnectionTimeout) {
-        if (tokenConnectionTimeout == null) {
-            this.tokenConnectionTimeout = DEFAULT_TOKEN_CONNECTION_TIMEOUT;
+    public Long getConnectionTokenTimeout() {
+        if (this.connectionTokenTimeout == null) {
+            return DEFAULT_TOKEN_CONNECTION_TIMEOUT;
         } else {
-            this.tokenConnectionTimeout = tokenConnectionTimeout;
+            return this.connectionTokenTimeout;
         }
     }
 
-    public Long getPopulateTokenTimeout() { return populateTokenTimeout; }
+    public void setConnectionTokenTimeout(Long connectionTokenTimeout) {
+        this.connectionTokenTimeout = connectionTokenTimeout;
+    }
 
-    public void setPopulateTokenTimeout(Long populateTokenTimeout) {
-        if (populateTokenTimeout == null) {
-            this.populateTokenTimeout = DEFAULT_POPULATE_TOKEN_TIMEOUT;
+    public long getPopulateTokenTimeout() {
+        if (this.populateTokenTimeout == null) {
+            return DEFAULT_POPULATE_TOKEN_TIMEOUT;
         } else {
-            this.populateTokenTimeout = populateTokenTimeout;
+            return this.populateTokenTimeout;
         }
     }
 
-
-}
+    public void setPopulateTokenTimeout(long populateTokenTimeout) {
+            this.populateTokenTimeout = populateTokenTimeout;
+        }
+    }