Revert "Do not serialize version of Cookie for RFC 6265."

This reverts commit b37c986 for TCK compatibility

Signed-off-by: Maxim Nesen <[email protected]>

Author: senivam

core-common/src/main/java/org/glassfish/jersey/http/JerseyCookie.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2025 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,7 +21,6 @@
 import jakarta.inject.Singleton;
 
 import org.glassfish.jersey.internal.LocalizationMessages;
-import org.glassfish.jersey.http.VersionOptional;
 import org.glassfish.jersey.spi.HeaderDelegateProvider;
 
 import static org.glassfish.jersey.message.internal.Utils.throwIllegalArgumentExceptionIfNull;
@@ -47,15 +46,7 @@ public String toString(Cookie cookie) {
 
         StringBuilder b = new StringBuilder();
 
-        boolean printVersion = false;
-        if (cookie instanceof VersionOptional) {
-            printVersion = ((VersionOptional) cookie).hasVersion();
-        } else if (cookie.getVersion() == Cookie.DEFAULT_VERSION || cookie.getVersion() == VersionOptional.NETSCAPE_VERSION) {
-            printVersion = true;
-        }
-        if (printVersion) {
-            b.append("$Version=").append(cookie.getVersion()).append(';');
-        }
+        b.append("$Version=").append(cookie.getVersion()).append(';');
 
         b.append(cookie.getName()).append('=');
         StringBuilderUtils.appendQuotedIfWhitespace(b, cookie.getValue());

core-common/src/main/java/org/glassfish/jersey/http/JerseyNewCookie.java

@@ -28,8 +28,6 @@
 import jakarta.ws.rs.core.NewCookie;
 
 import org.glassfish.jersey.internal.LocalizationMessages;
-import org.glassfish.jersey.http.JerseyCookie;
-import org.glassfish.jersey.http.JerseyNewCookie;
 
 /**
  * Cookies parser.
@@ -45,7 +43,7 @@ private static class MutableCookie {
 
         String name;
         String value;
-        Integer version = null;
+        int version = Cookie.DEFAULT_VERSION;
         String path = null;
         String domain = null;
 
@@ -55,14 +53,14 @@ public MutableCookie(String name, String value) {
         }
 
         public Cookie getImmutableCookie() {
-            return new JerseyCookie.Builder(name).version(version).value(value).path(path).domain(domain).build();
+            return new Cookie(name, value, path, domain, version);
         }
     }
 
     public static Map<String, Cookie> parseCookies(String header) {
         String bites[] = header.split("[;,]");
         Map<String, Cookie> cookies = new LinkedHashMap<String, Cookie>();
-        Integer version = null;
+        int version = 0;
         MutableCookie cookie = null;
         for (String bite : bites) {
             String crumbs[] = bite.split("=", 2);
@@ -125,7 +123,7 @@ private static class MutableNewCookie {
         String value = null;
         String path = null;
         String domain = null;
-        Integer version = null;
+        int version = Cookie.DEFAULT_VERSION;
         String comment = null;
         int maxAge = NewCookie.DEFAULT_MAX_AGE;
         boolean secure = false;
@@ -139,8 +137,7 @@ public MutableNewCookie(String name, String value) {
         }
 
         public NewCookie getImmutableNewCookie() {
-            return new JerseyNewCookie.Builder(name).version(version).value(value).path(path).domain(domain).comment(comment)
-                    .maxAge(maxAge).expiry(expiry).secure(secure).httpOnly(httpOnly).sameSite(sameSite).build();
+            return new NewCookie(name, value, path, domain, version, comment, maxAge, expiry, secure, httpOnly, sameSite);
         }
     }
 

core-common/src/main/java/org/glassfish/jersey/http/VersionOptional.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2025 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,13 +16,11 @@
 
 package org.glassfish.jersey.message.internal;
 
-import jakarta.ws.rs.core.Cookie;
 import jakarta.ws.rs.core.NewCookie;
 
 import jakarta.inject.Singleton;
 
 import org.glassfish.jersey.internal.LocalizationMessages;
-import org.glassfish.jersey.http.VersionOptional;
 import org.glassfish.jersey.spi.HeaderDelegateProvider;
 
 import java.util.Locale;
@@ -53,15 +51,7 @@ public String toString(final NewCookie cookie) {
         b.append(cookie.getName()).append('=');
         StringBuilderUtils.appendQuotedIfWhitespace(b, cookie.getValue());
 
-        boolean printVersion = false;
-        if (cookie instanceof VersionOptional) {
-            printVersion = ((VersionOptional) cookie).hasVersion();
-        } else if (cookie.getVersion() == Cookie.DEFAULT_VERSION) {
-            printVersion = true;
-        }
-        if (printVersion) {
-            b.append(";").append("Version=").append(cookie.getVersion());
-        }
+        b.append(";").append("Version=").append(cookie.getVersion());
 
         if (cookie.getComment() != null) {
             b.append(";Comment=");