From 990f29cf744011f411e424edb53d99be2ba3ec18 Mon Sep 17 00:00:00 2001 From: Josh Lemer Date: Fri, 29 Dec 2017 15:31:56 -0600 Subject: Remove dependence on StringTokenizer --- core/src/main/scala/com/softwaremill/sttp/Response.scala | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'core/src') diff --git a/core/src/main/scala/com/softwaremill/sttp/Response.scala b/core/src/main/scala/com/softwaremill/sttp/Response.scala index 7551ee0..4d9c385 100644 --- a/core/src/main/scala/com/softwaremill/sttp/Response.scala +++ b/core/src/main/scala/com/softwaremill/sttp/Response.scala @@ -3,13 +3,7 @@ package com.softwaremill.sttp import java.net.HttpCookie import java.text.SimpleDateFormat import java.time.ZonedDateTime -import java.util.{ - Calendar, - GregorianCalendar, - Locale, - StringTokenizer, - TimeZone -} +import java.util.{Calendar, GregorianCalendar, Locale, TimeZone} import scala.collection.JavaConverters._ import scala.collection.immutable.Seq @@ -75,12 +69,11 @@ object Cookie { // hand-parsing in such case to preserve the values from the cookie val lch = h.toLowerCase val (expires, maxAge) = if (lch.contains("expires=")) { - val tokenizer = new StringTokenizer(h, ";") + val tokens = h.split(";") var e: Option[ZonedDateTime] = None var ma: Option[Long] = None - while (tokenizer.hasMoreTokens) { - val t = tokenizer.nextToken() + for (t <- tokens) { val nv = t.split("=", 2) if (nv(0).toLowerCase.contains("expires") && nv.length > 1) { e = expiryDate2ZonedDateTime(nv(1).trim()) -- cgit v1.2.3