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

6 files changed, 20 insertions, 18 deletions

diff --git a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
index e949df466d..0b581f2b75 100644
--- a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
@@ -80,7 +80,7 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase
         replay(request);
 
         String location = servlet.getVaadinService().getStaticFileLocation(
-                servlet.createWrappedRequest(request));
+                servlet.createVaadinRequest(request));
         return location;
     }
 
@@ -93,7 +93,7 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase
         replay(request);
 
         String location = servlet.getVaadinService().getStaticFileLocation(
-                servlet.createWrappedRequest(request));
+                servlet.createVaadinRequest(request));
         return location;
     }
 
diff --git a/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java b/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java
index 0dd7efa507..b929ce5d9d 100644
--- a/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java
+++ b/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java
@@ -7,7 +7,7 @@ import org.easymock.EasyMock;
 import com.vaadin.server.CommunicationManager;
 import com.vaadin.server.StreamVariable;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.Upload;
 
@@ -24,7 +24,7 @@ public class TestStreamVariableMapping extends TestCase {
         final VaadinSession application = new VaadinSession();
         final UI uI = new UI() {
             @Override
-            protected void init(WrappedRequest request) {
+            protected void init(VaadinRequest request) {
                 // TODO Auto-generated method stub
 
             }
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
index c9f579a887..693fcd0580 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
@@ -8,7 +8,7 @@ import com.vaadin.data.Property;
 import com.vaadin.data.util.AbstractProperty;
 import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.UI;
 
@@ -24,7 +24,7 @@ public class RemoveListenersOnDetach {
         private UI uI = new UI() {
 
             @Override
-            protected void init(WrappedRequest request) {
+            protected void init(VaadinRequest request) {
 
             }
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
index b14d3dd2a8..858a18b223 100644
--- a/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
+++ b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
@@ -9,12 +9,12 @@ import junit.framework.TestCase;
 import org.easymock.EasyMock;
 
 import com.vaadin.DefaultDeploymentConfiguration;
-import com.vaadin.server.DeploymentConfiguration;
 import com.vaadin.server.DefaultUIProvider;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.server.VaadinSession.SessionStartEvent;
-import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 public class CustomUIClassLoader extends TestCase {
@@ -24,7 +24,7 @@ public class CustomUIClassLoader extends TestCase {
      */
     public static class MyUI extends UI {
         @Override
-        protected void init(WrappedRequest request) {
+        protected void init(VaadinRequest request) {
             // Nothing to see here
         }
     }
@@ -58,7 +58,8 @@ public class CustomUIClassLoader extends TestCase {
                 createConfigurationMock(), null));
 
         DefaultUIProvider uiProvider = new DefaultUIProvider();
-        Class<? extends UI> uiClass = uiProvider.getUIClass(createRequestMock(null));
+        Class<? extends UI> uiClass = uiProvider
+                .getUIClass(createRequestMock(null));
 
         assertEquals(MyUI.class, uiClass);
     }
@@ -70,15 +71,15 @@ public class CustomUIClassLoader extends TestCase {
                 properties);
     }
 
-    private static WrappedRequest createRequestMock(ClassLoader classloader) {
+    private static VaadinRequest createRequestMock(ClassLoader classloader) {
         // Mock a VaadinService to give the passed classloader
         VaadinService configurationMock = EasyMock
                 .createMock(VaadinService.class);
         EasyMock.expect(configurationMock.getClassLoader()).andReturn(
                 classloader);
 
-        // Mock a WrappedRequest to give the mocked vaadin service
-        WrappedRequest requestMock = EasyMock.createMock(WrappedRequest.class);
+        // Mock a VaadinRequest to give the mocked vaadin service
+        VaadinRequest requestMock = EasyMock.createMock(VaadinRequest.class);
         EasyMock.expect(requestMock.getVaadinService()).andReturn(
                 configurationMock);
 
@@ -101,7 +102,8 @@ public class CustomUIClassLoader extends TestCase {
                 createConfigurationMock(), null));
 
         DefaultUIProvider uiProvider = new DefaultUIProvider();
-        Class<? extends UI> uiClass = uiProvider.getUIClass(createRequestMock(loggingClassLoader));
+        Class<? extends UI> uiClass = uiProvider
+                .getUIClass(createRequestMock(loggingClassLoader));
 
         assertEquals(MyUI.class, uiClass);
         assertEquals(1, loggingClassLoader.requestedClasses.size());
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java
index ec722fdffb..a41b200664 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java
@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import com.vaadin.server.ClientConnector;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
@@ -116,7 +116,7 @@ public class AttachDetachWindow {
         }
 
         @Override
-        protected void init(WrappedRequest request) {
+        protected void init(VaadinRequest request) {
             // Do nothing
         }
 
diff --git a/server/tests/src/com/vaadin/ui/LabelDataSource.java b/server/tests/src/com/vaadin/ui/LabelDataSource.java
index 3abe12535b..932e0cc8ef 100644
--- a/server/tests/src/com/vaadin/ui/LabelDataSource.java
+++ b/server/tests/src/com/vaadin/ui/LabelDataSource.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 
 public class LabelDataSource {
 
@@ -110,7 +110,7 @@ public class LabelDataSource {
         }
 
         @Override
-        protected void init(WrappedRequest request) {
+        protected void init(VaadinRequest request) {
         }
 
     }