Cleaning up the loggers and using container-managed client sessions instead of user-managed

Author: arun-gupta

websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/FigureDecoder.java

@@ -41,6 +41,7 @@
 
 import java.io.StringReader;
 import java.lang.invoke.MethodHandles;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.json.Json;
@@ -55,11 +56,11 @@
  */
 public class FigureDecoder implements Decoder.Text<Figure> {
 
-    private static final Logger LOGGER = Logger.getLogger(MethodHandles.lookup().lookupClass().getName());
+    private static final Logger LOGGER = Logger.getLogger(FigureDecoder.class.getName());
 
     @Override
     public Figure decode(String string) throws DecodeException {
-        LOGGER.info("decoding: " + string);
+        LOGGER.log(Level.INFO, "decoding: {0}", string);
         JsonObject jsonObject = Json.createReader(new StringReader(string)).readObject();
         return new Figure(jsonObject);
     }
@@ -70,18 +71,16 @@ public boolean willDecode(String string) {
             Json.createReader(new StringReader(string)).readObject();
             return true;
         } catch (JsonException ex) {
-            ex.printStackTrace();
+            LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
             return false;
         }
     }
 
     @Override
     public void init(EndpointConfig ec) {
-        LOGGER.info("init");
     }
 
     @Override
     public void destroy() {
-        LOGGER.info("destroy");
     }
 }

websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/FigureEncoder.java

@@ -40,6 +40,7 @@
 package org.javaee7.websocket.whiteboard;
 
 import java.lang.invoke.MethodHandles;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.websocket.EncodeException;
@@ -51,20 +52,19 @@
  */
 public class FigureEncoder implements Encoder.Text<Figure> {
 
-    private static final Logger LOGGER = Logger.getLogger(MethodHandles.lookup().lookupClass().getName());
+    private static final Logger LOGGER = Logger.getLogger(FigureDecoder.class.getName());
 
     @Override
     public String encode(Figure figure) throws EncodeException {
+        LOGGER.log(Level.INFO, "encoding: {0}", figure);
         return figure.getJson().toString();
     }
 
     @Override
     public void init(EndpointConfig ec) {
-        LOGGER.info("init");
     }
 
     @Override
     public void destroy() {
-        LOGGER.info("destroy");
     }
 }

websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Whiteboard.java

@@ -44,6 +44,7 @@
 import java.nio.ByteBuffer;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.websocket.EncodeException;
@@ -61,7 +62,7 @@
         decoders = {FigureDecoder.class})
 public class Whiteboard {
 
-    private static final Logger LOGGER = Logger.getLogger(MethodHandles.lookup().lookupClass().getName());
+    private static final Logger LOGGER = Logger.getLogger(Whiteboard.class.getName());
 
     private static final Object PRESENT = new Object();
 
@@ -79,8 +80,9 @@ public void onClose(Session peer) {
 
     @OnMessage
     public void broadcastFigure(Figure figure, Session session) throws IOException, EncodeException {
-        LOGGER.info("boradcastFigure: " + figure);
-        for (Session peer : peers.keySet()) {
+        LOGGER.log(Level.INFO, "boradcastFigure: {0}", figure);
+        for (Session peer : session.getOpenSessions()) {
+//        for (Session peer : peers.keySet()) {
             if (!peer.equals(session)) {
                 peer.getBasicRemote().sendObject(figure);
             }
@@ -89,8 +91,9 @@ public void broadcastFigure(Figure figure, Session session) throws IOException,
 
     @OnMessage
     public void broadcastSnapshot(ByteBuffer data, Session session) throws IOException {
-        LOGGER.info("broadcastBinary: " + data);
-        for (Session peer : peers.keySet()) {
+        LOGGER.log(Level.INFO, "broadcastBinary: {0}", data);
+        for (Session peer : session.getOpenSessions()) {
+//        for (Session peer : peers.keySet()) {
             if (!peer.equals(session)) {
                 peer.getBasicRemote().sendBinary(data);
             }