Rename VaadinSession -> VaadinServiceSession (#9733)

Change-Id: I4472cebf2f9f4cf3e0dea31a0dda8dc892323c5c

3 files changed, 12 insertions, 12 deletions

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
index 62ceceeefb..8bc1e749a6 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
@@ -16,7 +16,7 @@ import com.vaadin.server.ExternalResource;
 import com.vaadin.server.RequestHandler;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;
-import com.vaadin.server.VaadinSession;
+import com.vaadin.server.VaadinServiceSession;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.UI.LegacyWindow;
 
@@ -29,7 +29,7 @@ public class Ticket1589 extends LegacyApplication {
 
         MyDynamicResource res = new MyDynamicResource();
 
-        VaadinSession.getCurrent().addRequestHandler(res);
+        VaadinServiceSession.getCurrent().addRequestHandler(res);
 
         w.addComponent(new Link(
                 "Test (without Content-Disposition, should suggest generatedFile.png when saving, browser default for actual disposition)",
@@ -52,8 +52,8 @@ class MyDynamicResource implements RequestHandler {
      * stream that contains the response from the server.
      */
     @Override
-    public boolean handleRequest(VaadinSession session, VaadinRequest request,
-            VaadinResponse response) throws IOException {
+    public boolean handleRequest(VaadinServiceSession session,
+            VaadinRequest request, VaadinResponse response) throws IOException {
         String relativeUri = request.getRequestPathInfo();
         // Catch the given URI that identifies the resource, otherwise let other
         // URI handlers or the Application to handle the response.
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
index 976bebd7cb..5fe63591ff 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
@@ -7,7 +7,7 @@ import com.vaadin.LegacyApplication;
 import com.vaadin.server.RequestHandler;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;
-import com.vaadin.server.VaadinSession;
+import com.vaadin.server.VaadinServiceSession;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
@@ -42,7 +42,7 @@ public class Ticket1921 extends LegacyApplication implements RequestHandler {
 
         newState();
 
-        VaadinSession.getCurrent().addRequestHandler(this);
+        VaadinServiceSession.getCurrent().addRequestHandler(this);
     }
 
     public void newState() {
@@ -94,8 +94,8 @@ public class Ticket1921 extends LegacyApplication implements RequestHandler {
     }
 
     @Override
-    public boolean handleRequest(VaadinSession session, VaadinRequest request,
-            VaadinResponse response) throws IOException {
+    public boolean handleRequest(VaadinServiceSession session,
+            VaadinRequest request, VaadinResponse response) throws IOException {
         Map<String, String[]> parameters = request.getParameterMap();
         String[] s = parameters.get("state");
         if (s == null || s.length != 1) {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
index 20047df2ee..38cd84ff01 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
@@ -14,7 +14,7 @@ import com.vaadin.server.ExternalResource;
 import com.vaadin.server.RequestHandler;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;
-import com.vaadin.server.VaadinSession;
+import com.vaadin.server.VaadinServiceSession;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
@@ -44,12 +44,12 @@ public class Ticket2292 extends com.vaadin.LegacyApplication implements
         Link l = new Link("l", icon);
         main.addComponent(l);
 
-        VaadinSession.getCurrent().addRequestHandler(this);
+        VaadinServiceSession.getCurrent().addRequestHandler(this);
     }
 
     @Override
-    public boolean handleRequest(VaadinSession session, VaadinRequest request,
-            VaadinResponse response) throws IOException {
+    public boolean handleRequest(VaadinServiceSession session,
+            VaadinRequest request, VaadinResponse response) throws IOException {
         String relativeUri = request.getRequestPathInfo();
 
         if (!relativeUri.contains("icon.png")) {