Minor improvements in AtmosphereBehavior (no functional changes)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1e9ee6d5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1e9ee6d5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1e9ee6d5 Branch: refs/heads/master Commit: 1e9ee6d50db784589911286e3755b2e1d54e8c6a Parents: 9cc2ac5 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed May 16 09:01:25 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed May 16 09:09:15 2012 +0200 ---------------------------------------------------------------------- .../wicket/examples/atmosphere/HomePage.java | 2 + .../wicket/atmosphere/AtmosphereBehavior.java | 53 ++++++++------ 2 files changed, 32 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1e9ee6d5/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java index 6c95d05..bd3a068 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/HomePage.java @@ -40,6 +40,8 @@ public class HomePage extends WicketExamplePage public HomePage(final PageParameters parameters) { + super(parameters); + add(timeLabel = new Label("time", Model.of("start")).setOutputMarkupId(true)); add(messageLabel = new Label("message", Model.of("-")).setOutputMarkupId(true)); http://git-wip-us.apache.org/repos/asf/wicket/blob/1e9ee6d5/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java index a80ce61..09c7e50 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java @@ -42,7 +42,7 @@ public class AtmosphereBehavior extends Behavior /** * The key under which a unique id is stored in the page. This id is unique for all clients. */ - public static MetaDataKey<String> ATMOSPHERE_UUID = new MetaDataKey<String>() + public static final MetaDataKey<String> ATMOSPHERE_UUID = new MetaDataKey<String>() { private static final long serialVersionUID = 1L; }; @@ -65,7 +65,7 @@ public class AtmosphereBehavior extends Behavior } @Override - public boolean getStatelessHint(Component component) + public final boolean getStatelessHint(Component component) { return false; } @@ -85,8 +85,8 @@ public class AtmosphereBehavior extends Behavior // Add us to the listener list. meteor.addListener(this); - String header = request.getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); - if (header != null && header.equalsIgnoreCase(HeaderConfig.LONG_POLLING_TRANSPORT)) + String transport = request.getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); + if (HeaderConfig.LONG_POLLING_TRANSPORT.equalsIgnoreCase(transport)) { // request.getContainerRequest().setAttribute(ApplicationConfig.RESUME_ON_BROADCAST, // Boolean.TRUE); @@ -101,48 +101,55 @@ public class AtmosphereBehavior extends Behavior @Override public void onBroadcast(AtmosphereResourceEvent event) { - log.info("onBroadcast: " + event.getMessage()); + log.info("onBroadcast: {}", event.getMessage()); // If we are using long-polling, resume the connection as soon as we get // an event. String transport = event.getResource() .getRequest() .getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); - if (transport != null) + + if (HeaderConfig.LONG_POLLING_TRANSPORT.equalsIgnoreCase(transport)) { - if (transport.equalsIgnoreCase(HeaderConfig.LONG_POLLING_TRANSPORT)) - { - Meteor meteor = Meteor.lookup(event.getResource().getRequest()); - meteor.resume(); - } + Meteor meteor = Meteor.lookup(event.getResource().getRequest()); + meteor.resume(); } } @Override public void onSuspend(AtmosphereResourceEvent event) { - String transport = event.getResource().getRequest().getHeader("X-Atmosphere-Transport"); - HttpServletRequest req = event.getResource().getRequest(); - log.info(String.format("Suspending the %s response from ip %s:%s", transport == null - ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort())); + if (log.isInfoEnabled()) + { + String transport = event.getResource().getRequest().getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); + HttpServletRequest req = event.getResource().getRequest(); + log.info(String.format("Suspending the %s response from ip %s:%s", transport == null + ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort())); + } } @Override public void onResume(AtmosphereResourceEvent event) { - String transport = event.getResource().getRequest().getHeader("X-Atmosphere-Transport"); - HttpServletRequest req = event.getResource().getRequest(); - log.info(String.format("Resuming the %s response from ip %s:%s", transport == null - ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort())); + if (log.isInfoEnabled()) + { + String transport = event.getResource().getRequest().getHeader("X-Atmosphere-Transport"); + HttpServletRequest req = event.getResource().getRequest(); + log.info(String.format("Resuming the %s response from ip %s:%s", transport == null + ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort())); + } } @Override public void onDisconnect(AtmosphereResourceEvent event) { - String transport = event.getResource().getRequest().getHeader("X-Atmosphere-Transport"); - HttpServletRequest req = event.getResource().getRequest(); - log.info(String.format("%s connection dropped from ip %s:%s", transport == null - ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort())); + if (log.isInfoEnabled()) + { + String transport = event.getResource().getRequest().getHeader("X-Atmosphere-Transport"); + HttpServletRequest req = event.getResource().getRequest(); + log.info(String.format("%s connection dropped from ip %s:%s", transport == null + ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort())); + } } @Override
