time variable update

Author: AstinCHOI

README.md

@@ -14,7 +14,7 @@ EdgeAuth-Token-Java supports Java 1.6+.
 
 
 ## Build
-[Click Here](http://search.maven.org/#artifactdetails%7Ccom.akamai%7Cedgeauth%7C0.1.0%7C)
+[Click Here](http://search.maven.org/#artifactdetails%7Ccom.akamai%7Cedgeauth%7C0.2.0%7C)
 
 
 ## Example
@@ -115,30 +115,30 @@ try {
 ## Usage
 
 #### EdgeAuth, EdgeAuthBuilder Class
+
 | Parameter | Description |
 |-----------|-------------|
 | tokenType | Select a preset. (Not Supported Yet) |
 | tokenName | Parameter name for the new token. [ Default: \_\_token\_\_ ] |
 | key | Secret required to generate the token. It must be hexadecimal digit string with even-length. |
-| algorithm  | Algorithm to use to generate the token. (sha1, sha256, or md5) [ Default:sha256 ] |
+| algorithm  | Algorithm to use to generate the token. ("sha1", "sha256", or "md5") [ Default: "sha256" ] |
 | salt | Additional data validated by the token but NOT included in the token body. (It will be deprecated) |
 | ip | IP Address to restrict this token to. (Troublesome in many cases (roaming, NAT, etc) so not often used) |
 | payload | Additional text added to the calculated digest. |
 | sessionId | The session identifier for single use tokens or other advanced cases. |
-| starTime | What is the start time? (Use 'EdgeAuth.NOW' for the current time) |
-| endTime | When does this token expire? 'endTime' overrides 'windowSeconds' |
+| startTime | What is the start time? (Use EdgeAuth.NOW for the current time) |
+| endTime | When does this token expire? endTime overrides windowSeconds |
 | windowSeconds | How long is this token valid for? |
 | fieldDelimiter | Character used to delimit token body fields. [ Default: ~ ] |
 | aclDelimiter | Character used to delimit acl. [ Default: ! ] |
-| escapeEarly | Causes strings to be 'url' encoded before being used. |
+| escapeEarly | Causes strings to be url encoded before being used. |
 | verbose | Print all parameters. |
 
 #### EdgeAuth Static Variable
 ```java
 public static final Long NOW = 0L; // When using startTime, 0L means "from NOW".
 ```
 
-
 #### EdgeAuth's Method
 | Method | Description |
 |--------|-------------|

build.gradle.production

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "com.akamai"
-version = "0.1.0"
+version = "0.2.0"
 
 repositories {
   mavenCentral()

src/main/java/com/akamai/edgeauth/EdgeAuth.java

@@ -180,28 +180,31 @@ private String escapeEarly(final String text) throws EdgeAuthException {
      * @throws EdgeAuthException EdgeAuthException
      */
     private String generateToken(String path, boolean isUrl) throws EdgeAuthException {
-        if (this.startTime == EdgeAuth.NOW) {
-            this.startTime = Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis() / 1000L;
-        } else if(this.startTime != null && this.startTime < 0) {
+        Long startTime = this.startTime;
+        Long endTime = this.endTime;
+
+        if (startTime == EdgeAuth.NOW) {
+            startTime = Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis() / 1000L;
+        } else if(startTime != null && startTime < 0) {
             throw new EdgeAuthException("startTime must be ( > 0 )");
         }
 
-        if (this.endTime == null) {
+        if (endTime == null) {
             if (this.windowSeconds != null && this.windowSeconds > 0) {
-                if (this.startTime == null) {
-                    this.endTime = (Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis() / 1000L) +
+                if (startTime == null) {
+                    endTime = (Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis() / 1000L) +
                             this.windowSeconds;
                 } else {
-                    this.endTime = this.startTime + this.windowSeconds;
+                    endTime = startTime + this.windowSeconds;
                 }
             } else {
                 throw new EdgeAuthException("You must provide an expiration time or a duration window ( > 0 )");
             }
-        } else if(this.endTime <= 0) {
+        } else if(endTime <= 0) {
             throw new EdgeAuthException("endTime must be ( > 0 )");
         }
 
-        if (this.startTime != null && (this.endTime <= this.startTime)) {
+        if (startTime != null && (endTime <= startTime)) {
             throw new EdgeAuthException("Token will have already expired.");
         }
 
@@ -236,11 +239,11 @@ private String generateToken(String path, boolean isUrl) throws EdgeAuthExceptio
         }
         if (this.startTime != null) {
             newToken.append("st=");
-            newToken.append(Long.toString(this.startTime));
+            newToken.append(startTime.toString());
             newToken.append(this.fieldDelimiter);
         }
         newToken.append("exp=");
-        newToken.append(Long.toString(this.endTime));
+        newToken.append(endTime.toString());
         newToken.append(this.fieldDelimiter);
 
         if (!isUrl) {
@@ -513,21 +516,21 @@ public String getSessionId() {
     /**
      * @return startTime
      */
-    public long getStartTime() {
+    public Long getStartTime() {
         return this.startTime;
     }
 
     /**
      * @return endTime
      */
-    public long getEndTime() {
+    public Long getEndTime() {
         return this.endTime;
     }
 
     /**
      * @return windowSeconds
      */
-    public long getwindowSeconds() {
+    public Long getwindowSeconds() {
         return this.windowSeconds;
     }
 

src/test/java/com/akamai/edgeauth/EdgeAuthTest.java

@@ -324,6 +324,9 @@ public void test_acl_deli_escape_on__ignoreQuery_yes() throws UnknownHostExcepti
 
         statusCode = EdgeAuthTest.requests(this.eaHostname, "/q_escape_ignore/world/", qs, null);
         assertEquals("404", statusCode);
+
+        assertEquals(null, ead.getStartTime());
+        assertEquals(null, ead.getEndTime());
     }
 
     @Test