[fit] solve review comments

Author: Mai-icy

framework/fit/java/fit-builtin/services/fit-http-classic/definition/src/main/java/modelengine/fit/http/client/support/DefaultHttpClassicClientRequest.java

@@ -21,7 +21,6 @@
 import modelengine.fit.http.entity.ReadableBinaryEntity;
 import modelengine.fit.http.entity.support.DefaultMultiValueEntity;
 import modelengine.fit.http.entity.support.DefaultObjectEntity;
-import modelengine.fit.http.header.ConfigurableCookieCollection;
 import modelengine.fit.http.header.ContentType;
 import modelengine.fit.http.protocol.ClientRequest;
 import modelengine.fit.http.protocol.ClientResponse;
@@ -171,9 +170,4 @@ private void close() {
             // Ignore
         }
     }
-
-    @Override
-    public ConfigurableCookieCollection cookies() {
-        return (ConfigurableCookieCollection) super.cookies();
-    }
 }

framework/fit/java/fit-builtin/services/fit-http-classic/definition/src/main/java/modelengine/fit/http/server/support/DefaultHttpClassicServerResponse.java

@@ -26,7 +26,6 @@
 import modelengine.fit.http.entity.TextEventStreamEntity;
 import modelengine.fit.http.entity.WritableBinaryEntity;
 import modelengine.fit.http.entity.support.DefaultWritableBinaryEntity;
-import modelengine.fit.http.header.ConfigurableCookieCollection;
 import modelengine.fit.http.header.ContentDisposition;
 import modelengine.fit.http.header.ContentType;
 import modelengine.fit.http.header.HeaderValue;
@@ -281,9 +280,4 @@ private void close0() throws IOException {
             this.entity = null;
         }
     }
-
-    @Override
-    public ConfigurableCookieCollection cookies() {
-        return (ConfigurableCookieCollection) super.cookies();
-    }
 }

framework/fit/java/fit-builtin/services/fit-http-classic/definition/src/main/java/modelengine/fit/http/support/AbstractHttpClassicRequest.java

@@ -13,7 +13,6 @@
 import modelengine.fit.http.HttpClassicRequest;
 import modelengine.fit.http.HttpResource;
 import modelengine.fit.http.header.ConfigurableCookieCollection;
-import modelengine.fit.http.header.CookieCollection;
 import modelengine.fit.http.header.HeaderValue;
 import modelengine.fit.http.protocol.HttpRequestMethod;
 import modelengine.fit.http.protocol.MessageHeaderNames;
@@ -77,7 +76,7 @@ public QueryCollection queries() {
     }
 
     @Override
-    public CookieCollection cookies() {
+    public ConfigurableCookieCollection cookies() {
         return this.cookies;
     }
 }

framework/fit/java/fit-builtin/services/fit-http-classic/definition/src/main/java/modelengine/fit/http/support/AbstractHttpClassicResponse.java

@@ -12,7 +12,6 @@
 import modelengine.fit.http.HttpClassicResponse;
 import modelengine.fit.http.HttpResource;
 import modelengine.fit.http.header.ConfigurableCookieCollection;
-import modelengine.fit.http.header.CookieCollection;
 import modelengine.fit.http.protocol.MessageHeaders;
 import modelengine.fit.http.protocol.RequestLine;
 import modelengine.fit.http.protocol.StatusLine;
@@ -57,7 +56,7 @@ public String reasonPhrase() {
     }
 
     @Override
-    public CookieCollection cookies() {
+    public ConfigurableCookieCollection cookies() {
         return this.cookies;
     }
 }

framework/fit/java/fit-builtin/services/fit-http-classic/definition/src/main/java/modelengine/fit/http/support/DefaultCookieCollection.java

@@ -6,6 +6,8 @@
 
 package modelengine.fit.http.support;
 
+import static modelengine.fit.http.util.HttpUtils.COOKIES_FORMAT_SEPARATOR;
+import static modelengine.fit.http.util.HttpUtils.COOKIE_PAIR_SEPARATOR;
 import static modelengine.fitframework.inspection.Validation.notNull;
 
 import modelengine.fit.http.Cookie;
@@ -103,8 +105,8 @@ public void add(Cookie cookie) {
     @Override
     public String toRequestHeaderValue() {
         return all().stream()
-                .map(c -> c.name() + "=" + c.value())
-                .collect(Collectors.joining("; "));
+                .map(c -> c.name() + COOKIE_PAIR_SEPARATOR + c.value())
+                .collect(Collectors.joining(COOKIES_FORMAT_SEPARATOR));
     }
 
     @Override

framework/fit/java/fit-builtin/services/fit-http-classic/definition/src/main/java/modelengine/fit/http/util/HttpUtils.java

@@ -51,8 +51,8 @@
 public class HttpUtils {
     private static final char STRING_VALUE_SURROUNDED = '\"';
     private static final String COOKIES_PARSE_SEPARATOR = ";";
-    private static final String COOKIES_FORMAT_SEPARATOR = COOKIES_PARSE_SEPARATOR + " ";
-    private static final String COOKIE_PAIR_SEPARATOR = "=";
+    public static final String COOKIES_FORMAT_SEPARATOR = COOKIES_PARSE_SEPARATOR + " ";
+    public static final String COOKIE_PAIR_SEPARATOR = "=";
 
     private static final Pattern TOKEN_PATTERN = Pattern.compile("^[!#$%&'*+\\-.^_`|~0-9a-zA-Z]+$");