Removed SeCookie.

tferega · Sep 2, 2014 · 97297b8 · 97297b8
1 parent 0c01f77
commit 97297b8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 53 deletions.
diff --git a/code/Client/src/main/java/net/selenate/client/user/ActorBase.java b/code/Client/src/main/java/net/selenate/client/user/ActorBase.java
@@ -99,19 +99,19 @@ protected Capture resToUserCapture(final SeResCapture resCapture) {
         resToUserWindowList(resCapture.windowList));
   }
 
-  protected CaptureCookie resToUserCookie(final SeCookie resCookie) {
+  protected CaptureCookie resToUserCookie(final Cookie resCookie) {
     return new CaptureCookie(
-        resCookie.domain,
-        resCookie.expiry,
-        resCookie.name,
-        resCookie.path,
-        resCookie.value,
-        resCookie.isSecure);
+        resCookie.getDomain(),
+        resCookie.getExpiry(),
+        resCookie.getName(),
+        resCookie.getPath(),
+        resCookie.getValue(),
+        resCookie.isSecure());
   }
 
-  protected Set<CaptureCookie> resToUserCookieList(final Set<SeCookie> resCookieList) {
+  protected Set<CaptureCookie> resToUserCookieList(final Set<Cookie> resCookieList) {
     final Set<CaptureCookie> userCookieList = new HashSet<CaptureCookie>();
-    for (final SeCookie resCookie : resCookieList) {
+    for (final Cookie resCookie : resCookieList) {
       final CaptureCookie cookie = resToUserCookie(resCookie);
       userCookieList.add(cookie);
     }

diff --git a/code/Common/src/main/java/net/selenate/common/comms/SeCookie.java b/code/Common/src/main/java/net/selenate/common/comms/SeCookie.java
diff --git a/code/Common/src/main/java/net/selenate/common/comms/res/SeResCapture.java b/code/Common/src/main/java/net/selenate/common/comms/res/SeResCapture.java
@@ -3,20 +3,21 @@
 import java.util.List;
 import java.util.Set;
 import net.selenate.common.comms.*;
+import net.selenate.common.user.Cookie;
 import net.selenate.common.util.Util;
 
 public class SeResCapture implements SeCommsRes {
   private static final long serialVersionUID = 1L;
 
   public final String name;
   public final Long   time;
-  public final Set<SeCookie>  cookieList;
+  public final Set<Cookie>  cookieList;
   public final List<SeWindow> windowList;
 
   public SeResCapture(
       final String name,
       final Long   time,
-      final Set<SeCookie>   cookieList,
+      final Set<Cookie>   cookieList,
       final List<SeWindow>  windowList) {
     this.name       = name;
     this.time       = time;

diff --git a/code/Server/src/main/scala/net/selenate/server/sessions/actions/CaptureAction.scala b/code/Server/src/main/scala/net/selenate/server/sessions/actions/CaptureAction.scala
@@ -6,6 +6,7 @@ import extensions.SelenateFirefox
 import net.selenate.common.comms._
 import net.selenate.common.comms.req.SeReqCapture
 import net.selenate.common.comms.res.SeResCapture
+import net.selenate.common.user.{ Cookie => SelenateCookie }
 import org.apache.commons.codec.binary.Base64
 import org.openqa.selenium.{ Cookie, OutputType}
 import scala.collection.JavaConversions._
@@ -88,12 +89,12 @@ class CaptureAction(val sessionID: String, val d: SelenateFirefox)(implicit cont
     new SeFrame(frame.index, name, src, html, windowHandle, seqToRealJava(frameList))
   }
 
-  private implicit def toSelenate(cookie: Cookie): SeCookie = new SeCookie(
-    cookie.getDomain,
-    cookie.getExpiry,
+  private implicit def toSelenate(cookie: Cookie): SelenateCookie = new SelenateCookie(
     cookie.getName,
-    cookie.getPath,
     cookie.getValue,
+    cookie.getDomain,
+    cookie.getPath,
+    cookie.getExpiry,
     cookie.isSecure)
 
   private def findAllFrames: List[FrameInfo] = {