Revert "Adds support for defining the URL to use for push requests (#18989)"

This reverts commit ca3c460cbd6edb801f7919d046a3323f5f8babf1.

3 files changed, 4 insertions, 46 deletions

diff --git a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
index 6aa920bf93..a81ab616cf 100644
--- a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
+++ b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
@@ -135,11 +135,6 @@ public class AtmospherePushConnection implements PushConnection {
      */
     private Command pendingDisconnectCommand;
 
-    /**
-     * The url to use for push requests
-     */
-    private String url;
-
     public AtmospherePushConnection() {
     }
 
@@ -185,12 +180,7 @@ public class AtmospherePushConnection implements PushConnection {
             config.setStringValue(param,
                     pushConfiguration.parameters.get(param));
         }
-        if (pushConfiguration.pushUrl != null) {
-            url = pushConfiguration.pushUrl;
-        } else {
-            url = ApplicationConstants.APP_PROTOCOL_PREFIX
-                    + ApplicationConstants.PUSH_PATH;
-        }
+
         runWhenAtmosphereLoaded(new Command() {
             @Override
             public void execute() {
@@ -205,7 +195,9 @@ public class AtmospherePushConnection implements PushConnection {
     }
 
     private void connect() {
-        String baseUrl = connection.translateVaadinUri(url);
+        String baseUrl = connection
+                .translateVaadinUri(ApplicationConstants.APP_PROTOCOL_PREFIX
+                        + ApplicationConstants.PUSH_PATH);
         String extraParams = UIConstants.UI_ID_PARAMETER + "="
                 + connection.getConfiguration().getUIId();
 
diff --git a/server/src/com/vaadin/ui/PushConfiguration.java b/server/src/com/vaadin/ui/PushConfiguration.java
index d2c12afbe5..90ad28542c 100644
--- a/server/src/com/vaadin/ui/PushConfiguration.java
+++ b/server/src/com/vaadin/ui/PushConfiguration.java
@@ -139,29 +139,6 @@ public interface PushConfiguration extends Serializable {
      */
     public void setParameter(String parameter, String value);
 
-    /**
-     * Sets the URL to use for push requests.
-     * <p>
-     * This is only used when overriding the URL to use. Setting this to null
-     * (the default) will use the default URL.
-     * 
-     * @since
-     * @param pushUrl
-     *            The push URL to use
-     */
-    public void setPushUrl(String pushUrl);
-
-    /**
-     * Returns the URL to use for push requests.
-     * <p>
-     * This is only used when overriding the URL to use. Returns null (the
-     * default) when the default URL is used.
-     * 
-     * @since
-     * @return the URL to use for push requests, or null to use to default
-     */
-    public String getPushUrl();
-
 }
 
 class PushConfigurationImpl implements PushConfiguration {
@@ -222,16 +199,6 @@ class PushConfigurationImpl implements PushConfiguration {
         }
     }
 
-    @Override
-    public void setPushUrl(String pushUrl) {
-        getState().pushUrl = pushUrl;
-    }
-
-    @Override
-    public String getPushUrl() {
-        return getState(false).pushUrl;
-    }
-
     /*
      * (non-Javadoc)
      * 
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java
index e22b4fb8d1..6f7a531eb6 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIState.java
+++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java
@@ -114,7 +114,6 @@ public class UIState extends TabIndexState {
         public static final String FALLBACK_TRANSPORT_PARAM = "fallbackTransport";
 
         public PushMode mode = PushMode.DISABLED;
-        public String pushUrl = null;
         public Map<String, String> parameters = new HashMap<String, String>();
         {
             parameters