Use empty string instead of null to denote "no fragment parameters" in Navigator (#9441)

3 files changed, 15 insertions, 17 deletions

diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java
index 2e2cd5ec83..cef27c221d 100644
--- a/server/src/com/vaadin/navigator/Navigator.java
+++ b/server/src/com/vaadin/navigator/Navigator.java
@@ -435,7 +435,7 @@ public class Navigator implements Serializable {
             }
         }
         if (viewWithLongestName != null) {
-            String parameters = null;
+            String parameters = "";
             if (viewAndParameters.length() > longestViewName.length() + 1) {
                 parameters = viewAndParameters.substring(longestViewName
                         .length() + 1);
@@ -469,7 +469,7 @@ public class Navigator implements Serializable {
 
         if (null != viewName && getFragmentManager() != null) {
             String currentFragment = viewName;
-            if (fragmentParameters != null) {
+            if (!fragmentParameters.equals("")) {
                 currentFragment += "/" + fragmentParameters;
             }
             if (!currentFragment.equals(getFragmentManager().getFragment())) {
diff --git a/server/src/com/vaadin/navigator/View.java b/server/src/com/vaadin/navigator/View.java
index 4db334a2dd..caee801f0c 100644
--- a/server/src/com/vaadin/navigator/View.java
+++ b/server/src/com/vaadin/navigator/View.java
@@ -38,11 +38,9 @@ public interface View extends Serializable {
      * is any additional id to data what should be shown in the view, it is also
      * optionally passed as parameter.
      * 
-     * TODO fragmentParameters null if no parameters or empty string?
-     * 
      * @param fragmentParameters
-     *            parameters to the view or null if none given. This is the
-     *            string that appears e.g. in URI after "viewname/"
+     *            parameters to the view or empty string if none given. This is
+     *            the string that appears e.g. in URI after "viewname/"
      */
     public void navigateTo(String fragmentParameters);
 }
\ No newline at end of file
diff --git a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java b/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java
index 6dfc44540c..595ddb95db 100644
--- a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java
@@ -181,14 +181,14 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getViewName("test1")).andReturn("test1");
         EasyMock.expect(provider.getView("test1")).andReturn(view1);
         EasyMock.expect(manager.getFragment()).andReturn("");
-        view1.navigateTo(null);
+        view1.navigateTo("");
         display.showView(view1);
         manager.setFragment("test1");
 
         EasyMock.expect(provider.getViewName("test2/")).andReturn("test2");
         EasyMock.expect(provider.getView("test2")).andReturn(view2);
         EasyMock.expect(manager.getFragment()).andReturn("view1");
-        view2.navigateTo(null);
+        view2.navigateTo("");
         display.showView(view2);
         manager.setFragment("test2");
 
@@ -223,14 +223,14 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getViewName("test2")).andReturn("test2");
         EasyMock.expect(provider.getView("test2")).andReturn(view2);
         EasyMock.expect(manager.getFragment()).andReturn("view1");
-        view2.navigateTo(null);
+        view2.navigateTo("");
         display.showView(view2);
         manager.setFragment("test2");
 
         EasyMock.expect(provider.getViewName("")).andReturn("test1");
         EasyMock.expect(provider.getView("test1")).andReturn(view1);
         EasyMock.expect(manager.getFragment()).andReturn("");
-        view1.navigateTo(null);
+        view1.navigateTo("");
         display.showView(view1);
         manager.setFragment("test1");
 
@@ -269,10 +269,10 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getViewName("test1")).andReturn("test1");
         EasyMock.expect(provider.getView("test1")).andReturn(view1);
         ViewChangeEvent event1 = new ViewChangeEvent(navigator, null, view1,
-                "test1", null);
+                "test1", "");
         listener.addExpectedIsViewChangeAllowed(event1, true);
         EasyMock.expect(manager.getFragment()).andReturn("");
-        view1.navigateTo(null);
+        view1.navigateTo("");
         display.showView(view1);
         manager.setFragment("test1");
         listener.addExpectedNavigatorViewChange(event1);
@@ -280,10 +280,10 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getViewName("test2")).andReturn("test2");
         EasyMock.expect(provider.getView("test2")).andReturn(view2);
         ViewChangeEvent event2 = new ViewChangeEvent(navigator, view1, view2,
-                "test2", null);
+                "test2", "");
         listener.addExpectedIsViewChangeAllowed(event2, true);
         EasyMock.expect(manager.getFragment()).andReturn("view1");
-        view2.navigateTo(null);
+        view2.navigateTo("");
         display.showView(view2);
         manager.setFragment("test2");
         listener.addExpectedNavigatorViewChange(event2);
@@ -320,7 +320,7 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getView("test1")).andReturn(view1);
         EasyMock.expect(manager.getFragment()).andReturn("");
         ViewChangeEvent event1 = new ViewChangeEvent(navigator, null, view1,
-                "test1", null);
+                "test1", "");
         listener1.addExpectedIsViewChangeAllowed(event1, false);
 
         // second listener blocks second view change
@@ -351,10 +351,10 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getView("test2")).andReturn(view2);
         EasyMock.expect(manager.getFragment()).andReturn("view1");
         ViewChangeEvent event4 = new ViewChangeEvent(navigator, view1, view2,
-                "test2", null);
+                "test2", "");
         listener1.addExpectedIsViewChangeAllowed(event4, true);
         listener2.addExpectedIsViewChangeAllowed(event4, true);
-        view2.navigateTo(null);
+        view2.navigateTo("");
         display.showView(view2);
         manager.setFragment("test2");
         listener1.addExpectedNavigatorViewChange(event4);