Rename WrappedXYZ -> VaadinXYZ but retain WrappedSession (#9633)

25 files changed, 58 insertions, 58 deletions

diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
index 6d84b85ff8..4c4dff572a 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components;
 
 import com.vaadin.server.WebBrowser;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
@@ -11,7 +11,7 @@ import com.vaadin.ui.VerticalLayout;
 public abstract class AbstractTestUI extends UI {
 
     @Override
-    public void init(WrappedRequest request) {
+    public void init(VaadinRequest request) {
         getPage().setTitle(getClass().getName());
 
         Label label = new Label(getTestDescription(), ContentMode.HTML);
@@ -32,7 +32,7 @@ public abstract class AbstractTestUI extends UI {
         return layout;
     }
 
-    protected abstract void setup(WrappedRequest request);
+    protected abstract void setup(VaadinRequest request);
 
     @Override
     public void addComponent(Component c) {
diff --git a/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java
index 197408a533..45f34222e6 100644
--- a/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java
+++ b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.components;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.AbstractComponent;
 
 public class UnknownComponentConnectorTest extends AbstractTestUI {
@@ -26,7 +26,7 @@ public class UnknownComponentConnectorTest extends AbstractTestUI {
     }
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         addComponent(new ComponentWithoutConnector());
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
index d318afc34f..75707a7d79 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.components.abstractcomponent;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.VaadinClasses;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractComponent;
@@ -25,7 +25,7 @@ import com.vaadin.ui.GridLayout;
 public class AllComponentTooltipTest extends AbstractTestUI {
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         setContent(new GridLayout(5, 5));
         for (Class<? extends Component> cls : VaadinClasses.getComponents()) {
             try {
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
index dc3cffffb6..c6f6e1b770 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
+++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.components.formlayout;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.PopupDateField;
@@ -23,7 +23,7 @@ import com.vaadin.ui.PopupDateField;
 public class FormLayoutErrorHover extends AbstractTestUI {
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         FormLayout formLayout = new FormLayout();
         PopupDateField fromDate = new PopupDateField("Date");
         fromDate.setImmediate(true);
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
index bc17447052..aef1ef83d0 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
+++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
@@ -26,7 +26,7 @@ import com.vaadin.annotations.JavaScript;
 import com.vaadin.server.DynamicConnectorResource;
 import com.vaadin.server.Resource;
 import com.vaadin.server.ResourceReference;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.shared.communication.URLReference;
@@ -122,7 +122,7 @@ public class BasicJavaScriptComponent extends AbstractTestUI {
     private final Log log = new Log(5);
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         addComponent(log);
 
         ExampleWidget c = new ExampleWidget();
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java b/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java
index c3d0d9cccd..8914daf390 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.label;

 

 import com.vaadin.data.util.ObjectProperty;

-import com.vaadin.server.WrappedRequest;

+import com.vaadin.server.VaadinRequest;

 import com.vaadin.tests.components.AbstractTestUI;

 import com.vaadin.ui.Button;

 import com.vaadin.ui.Button.ClickEvent;

@@ -12,7 +12,7 @@ public class LabelPropertySourceValue extends AbstractTestUI {
     private Label label;

 

     @Override

-    public void setup(WrappedRequest request) {

+    public void setup(VaadinRequest request) {

         label = new Label("Hello Vaadin user");

         addComponent(label);

         Button button = new Button("Give label a new property data source...");

diff --git a/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java
index 12fbc36fbb..f503e8966f 100644
--- a/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java
+++ b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.label;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractLayout;
@@ -13,7 +13,7 @@ import com.vaadin.ui.VerticalLayout;
 public class MarginsInLabels extends AbstractTestUI {
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         AbstractLayout layout = new VerticalLayout();
         layout.addComponent(new Label("<h1>Vertical layout</h1>",
                 ContentMode.HTML));
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
index 3227676e11..1ffa1cad88 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
@@ -11,7 +11,7 @@ import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractComponent;
@@ -52,7 +52,7 @@ public class BoxLayoutTest extends AbstractTestUI {
     protected CheckBox expand;
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
 
         view = new VerticalLayout();
         view.setMargin(true);
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
index 125dfae37a..9d7d88cce7 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
@@ -8,7 +8,7 @@ import java.util.List;
 import com.vaadin.annotations.Theme;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.ui.AbstractOrderedLayout;
@@ -117,7 +117,7 @@ public class OrderedLayoutCases extends AbstractTestUI {
     private HorizontalLayout sizeBar;
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         TestUtils
                 .injectCSS(
                         getUI(),
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
index a14f37f95e..82fc8933a0 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.orderedlayout;
 import com.vaadin.annotations.Theme;
 import com.vaadin.server.Sizeable;
 import com.vaadin.server.ThemeResource;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.slider.SliderOrientation;
 import com.vaadin.tests.components.AbstractTestUI;
@@ -24,7 +24,7 @@ import com.vaadin.ui.VerticalLayout;
 public class VaadinTunesLayout extends AbstractTestUI {
 
     @Override
-    public void setup(WrappedRequest request) {
+    public void setup(VaadinRequest request) {
 
         /*
          * We'll build the whole UI here, since the application will not contain
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java
index fd96b08cfb..a49fa34af0 100644
--- a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.components.panel;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -39,7 +39,7 @@ public class PanelChangeContents extends AbstractTestUI implements
     private Panel panel;
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         VerticalLayout content = new VerticalLayout();
         setSizeFull();
         HorizontalLayout buttons = new HorizontalLayout();
diff --git a/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java
index d755f5961e..8447b7689e 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.components.popupview;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
@@ -26,7 +26,7 @@ public class ReopenPopupView extends AbstractTestUI {
     private final Log log = new Log(5);
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         addComponent(log);
         addComponent(new PopupView("PopupView", new Button("Button",
                 new Button.ClickListener() {
diff --git a/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java b/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java
index 63ff00034f..a9cecfd6b5 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.table;
 
 import java.net.MalformedURLException;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbsoluteLayout;
@@ -17,7 +17,7 @@ import com.vaadin.ui.themes.Reindeer;
 public class TableInTabsheet extends AbstractTestUI {
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         getUI().setCaption("test");
         VerticalLayout vPrinc = new VerticalLayout();
         vPrinc.setStyleName(Reindeer.LAYOUT_BLUE);
diff --git a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java
index f8f7a16c4d..d405a4c138 100644
--- a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java
+++ b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.ui;
 
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUIProvider;
 import com.vaadin.ui.Label;
@@ -14,28 +14,28 @@ public class LazyInitUIs extends AbstractTestUIProvider {
     // @EagerInit
     private static class EagerInitUI extends UI {
         @Override
-        public void init(WrappedRequest request) {
+        public void init(VaadinRequest request) {
             addComponent(getRequestInfo("EagerInitUI", request));
         }
     }
 
     @Override
-    public UI createInstance(WrappedRequest request,
+    public UI createInstance(VaadinRequest request,
             Class<? extends UI> type) {
         return getUI(request);
     }
 
     @Override
-    public Class<? extends UI> getUIClass(WrappedRequest request) {
+    public Class<? extends UI> getUIClass(VaadinRequest request) {
         return getUI(request).getClass();
     }
 
-    private UI getUI(WrappedRequest request) {
+    private UI getUI(VaadinRequest request) {
         if (request.getParameter("lazyCreate") != null) {
             // UI created on second request
             UI uI = new UI() {
                 @Override
-                protected void init(WrappedRequest request) {
+                protected void init(VaadinRequest request) {
                     addComponent(getRequestInfo("LazyCreateUI", request));
                 }
             };
@@ -47,7 +47,7 @@ public class LazyInitUIs extends AbstractTestUIProvider {
             // The standard UI
             UI uI = new UI() {
                 @Override
-                protected void init(WrappedRequest request) {
+                protected void init(VaadinRequest request) {
                     addComponent(getRequestInfo("NormalUI", request));
 
                     Link lazyCreateLink = new Link("Open lazyCreate UI",
@@ -68,7 +68,7 @@ public class LazyInitUIs extends AbstractTestUIProvider {
         }
     }
 
-    public static Label getRequestInfo(String name, WrappedRequest request) {
+    public static Label getRequestInfo(String name, VaadinRequest request) {
         String info = name;
         info += "<br />pathInfo: " + request.getRequestPathInfo();
         info += "<br />parameters: " + request.getParameterMap().keySet();
diff --git a/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java
index ec0cdf53a2..1a5db630b3 100644
--- a/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.ui;
 
 import com.vaadin.annotations.Theme;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Label;
 
@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
 public class TestUITheme extends AbstractTestUI {
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         Label label = new Label("A red label");
         label.setStyleName("red");
         addComponent(label);
diff --git a/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java
index 99c3c49f72..e837321b56 100644
--- a/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.ui;
 
 import com.vaadin.annotations.Widgetset;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent;
 
@@ -9,7 +9,7 @@ import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent;
 public class TestUIWidgetset extends AbstractTestUI {
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         addComponent(new MissingFromDefaultWidgetsetComponent());
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java
index b9cdb7a3dc..a68cd91a5e 100644
--- a/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java
@@ -1,13 +1,13 @@
 package com.vaadin.tests.components.ui;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent;
 
 public class TestUIWidgetset2 extends AbstractTestUI {
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         addComponent(new MissingFromDefaultWidgetsetComponent());
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitException.java b/uitest/src/com/vaadin/tests/components/ui/UIInitException.java
index e225ae73d8..d5f26ade29 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIInitException.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIInitException.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.components.ui;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 
 public class UIInitException extends AbstractTestUI {
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         throw new RuntimeException("Catch me if you can");
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java
index 68e6a4da34..8aa2032935 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java
@@ -4,14 +4,14 @@
 
 package com.vaadin.tests.components.ui;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Label;
 
 public class UIInitTest extends AbstractTestUI {
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         addComponent(new Label("Hello UI"));
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
index 2d27989dd4..c5d997cfd4 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
@@ -4,7 +4,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.vaadin.server.VaadinSession;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIProvider;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
@@ -15,7 +15,7 @@ public class UIsInMultipleTabs extends AbstractTestUIProvider {
 
     public static class TabUI extends UI {
         @Override
-        protected void init(WrappedRequest request) {
+        protected void init(VaadinRequest request) {
             VaadinSession application = VaadinSession.getCurrent();
             AtomicInteger count = numberOfUIsOpened.get(application);
             if (count == null) {
@@ -32,7 +32,7 @@ public class UIsInMultipleTabs extends AbstractTestUIProvider {
     }
 
     @Override
-    public Class<? extends UI> getUIClass(WrappedRequest request) {
+    public Class<? extends UI> getUIClass(VaadinRequest request) {
         return TabUI.class;
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java
index 591a045e1d..b1cfffd410 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.ui;
 
 import com.vaadin.server.Page;
 import com.vaadin.server.Page.FragmentChangedEvent;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -13,7 +13,7 @@ public class UriFragmentTest extends AbstractTestUI {
     private final Label fragmentLabel = new Label();
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         addComponent(fragmentLabel);
         updateLabel();
         getPage().addListener(new Page.FragmentChangedListener() {
diff --git a/uitest/src/com/vaadin/tests/components/uitest/ThemeTestUI.java b/uitest/src/com/vaadin/tests/components/uitest/ThemeTestUI.java
index 673045af89..b9e1529fef 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/ThemeTestUI.java
+++ b/uitest/src/com/vaadin/tests/components/uitest/ThemeTestUI.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.uitest;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -15,7 +15,7 @@ public class ThemeTestUI extends AbstractTestUI {
     private String customStyleName = null;
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         getLayout().setSpacing(true);
 
         createCustomStyleStringField();
diff --git a/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
index 4d0dea4f91..33eb310822 100644
--- a/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
+++ b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.window;
 
 import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.server.VaadinService;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
@@ -23,7 +23,7 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase {
     @Override
     public void init() {
 
-        WrappedRequest request = VaadinService.getCurrentRequest();
+        VaadinRequest request = VaadinService.getCurrentRequest();
         if (request.getParameter("attachMainFirst") != null) {
             addSubWindowBeforeMainWindow = false;
         } else {
diff --git a/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java
index 847ee585f7..5a0e4d1370 100644
--- a/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java
+++ b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.window;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -14,7 +14,7 @@ public class RepaintWindowContents extends AbstractTestUI {
 
     @SuppressWarnings("serial")
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         final Window window = new Window("Test window");
         addWindow(window);
 
diff --git a/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java
index 7d4efe39ce..12af6ccdae 100644
--- a/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.components.window;
 
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.Window;
@@ -24,7 +24,7 @@ import com.vaadin.ui.Window;
 public class TooltipInWindow extends AbstractTestUI {
 
     @Override
-    protected void setup(WrappedRequest request) {
+    protected void setup(VaadinRequest request) {
         Window window = new Window("Window");
         window.getContent().setSizeUndefined();
         window.center();