Remove DEFAULT constant as an annotation enum cannot use it (#11966)

Change-Id: I41630fec5c40c50a2925499d1f1ba23149ab0de1

diff --git a/server/src/com/vaadin/annotations/Push.java b/server/src/com/vaadin/annotations/Push.java
index d5e42d6f605756e409a3c442f0ffb5084b100950..9965d535bad617d49a4d4bf5ed9dd246579e30f3 100644 (file)
--- a/server/src/com/vaadin/annotations/Push.java
+++ b/server/src/com/vaadin/annotations/Push.java
@@ -54,6 +54,6 @@ public @interface Push {
      * 
      * @return the transport type to use
      */
-    public Transport transport() default Transport.DEFAULT;
+    public Transport transport() default Transport.WEBSOCKET;
 
 }

diff --git a/shared/src/com/vaadin/shared/ui/ui/Transport.java b/shared/src/com/vaadin/shared/ui/ui/Transport.java
index 69d713bccaa4196f0d04ccb2ad061bbceaeb60db..ea641c0a3c59868c17d8db14097fcf361e1cb73c 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/ui/Transport.java
+++ b/shared/src/com/vaadin/shared/ui/ui/Transport.java
@@ -32,16 +32,6 @@ public enum Transport {
      */
     STREAMING("streaming");
 
-    /**
-     * The default transport mechanism for push
-     */
-    public static final Transport DEFAULT = Transport.WEBSOCKET;
-
-    /**
-     * The default fallback transport mechanism for push
-     */
-    public static final Transport DEFAULT_FALLBACK = Transport.STREAMING;
-
     private String identifier;
 
     private Transport(String identifier) {

diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java
index e19a87ada979a68ee454b4b0d3e30b24071ad8af..8d042a835fafa4ff8ff1fc52d7782dd83721fec6 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/ui/UIState.java
+++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java
@@ -55,9 +55,10 @@ public class UIState extends TabIndexState {
         public PushMode mode = PushMode.DISABLED;
         public Map<String, String> parameters = new HashMap<String, String>();
         {
-            parameters.put(TRANSPORT_PARAM, Transport.DEFAULT.getIdentifier());
+            parameters
+                    .put(TRANSPORT_PARAM, Transport.WEBSOCKET.getIdentifier());
             parameters.put(FALLBACK_TRANSPORT_PARAM,
-                    Transport.DEFAULT_FALLBACK.getIdentifier());
+                    Transport.STREAMING.getIdentifier());
         }
     }