Updated all examples to use ChannelPipelineFactory instead of the default pipeline

src/main/java/org/jboss/netty/example/discard/DiscardClient.java

@@ -20,6 +20,9 @@ import java.util.concurrent.Executors;
 
 import org.jboss.netty.bootstrap.ClientBootstrap;
 import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 /**
@@ -42,9 +45,9 @@ public class DiscardClient {
         }
 
         // Parse options.
-        String host = args[0];
-        int port = Integer.parseInt(args[1]);
-        int firstMessageSize;
+        final String host = args[0];
+        final int port = Integer.parseInt(args[1]);
+        final int firstMessageSize;
         if (args.length == 3) {
             firstMessageSize = Integer.parseInt(args[2]);
         } else {
@@ -57,9 +60,13 @@ public class DiscardClient {
                         Executors.newCachedThreadPool(),
                         Executors.newCachedThreadPool()));
 
-        // Set up the default event pipeline.
-        DiscardClientHandler handler = new DiscardClientHandler(firstMessageSize);
-        bootstrap.getPipeline().addLast("handler", handler);
+        // Set up the pipeline factory.
+        bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(
+                        new DiscardClientHandler(firstMessageSize));
+            }
+        });
 
         // Start the connection attempt.
         ChannelFuture future = bootstrap.connect(new InetSocketAddress(host, port));

src/main/java/org/jboss/netty/example/discard/DiscardServer.java

@@ -19,6 +19,9 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
 import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
@@ -38,14 +41,14 @@ public class DiscardServer {
                         Executors.newCachedThreadPool(),
                         Executors.newCachedThreadPool()));
 
-        // Set up the default event pipeline.
-        DiscardServerHandler handler = new DiscardServerHandler();
-        bootstrap.getPipeline().addLast("handler", handler);
+        // Set up the pipeline factory.
+        bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(new DiscardServerHandler());
+            }
+        });
 
         // Bind and start to accept incoming connections.
         bootstrap.bind(new InetSocketAddress(8080));
-
-        // Start performance monitor.
-        new ThroughputMonitor(handler).start();
     }
 }

src/main/java/org/jboss/netty/example/discard/ThroughputMonitor.java

@@ -1,55 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- *
- * Red Hat licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package org.jboss.netty.example.discard;
-
-/**
- * Measures and prints the current throughput every 3 seconds.
- *
- * @author The Netty Project (netty-dev@lists.jboss.org)
- * @author Trustin Lee (trustin@gmail.com)
- *
- * @version $Rev$, $Date$
- */
-public class ThroughputMonitor extends Thread {
-
-    private final DiscardServerHandler handler;
-
-    public ThroughputMonitor(DiscardServerHandler handler) {
-        this.handler = handler;
-    }
-
-    @Override
-    public void run() {
-        long oldCounter = handler.getTransferredBytes();
-        long startTime = System.currentTimeMillis();
-        for (;;) {
-            try {
-                Thread.sleep(3000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
-            long endTime = System.currentTimeMillis();
-            long newCounter = handler.getTransferredBytes();
-            System.err.format(
-                    "%4.3f MiB/s%n",
-                    (newCounter - oldCounter) * 1000.0 / (endTime - startTime) /
-                    1048576.0);
-            oldCounter = newCounter;
-            startTime = endTime;
-        }
-    }
-}

src/main/java/org/jboss/netty/example/echo/EchoClient.java

@@ -20,6 +20,9 @@ import java.util.concurrent.Executors;
 
 import org.jboss.netty.bootstrap.ClientBootstrap;
 import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 /**
@@ -46,9 +49,9 @@ public class EchoClient {
         }
 
         // Parse options.
-        String host = args[0];
-        int port = Integer.parseInt(args[1]);
-        int firstMessageSize;
+        final String host = args[0];
+        final int port = Integer.parseInt(args[1]);
+        final int firstMessageSize;
         if (args.length == 3) {
             firstMessageSize = Integer.parseInt(args[2]);
         } else {
@@ -61,9 +64,13 @@ public class EchoClient {
                         Executors.newCachedThreadPool(),
                         Executors.newCachedThreadPool()));
 
-        // Set up the default event pipeline.
-        EchoClientHandler handler = new EchoClientHandler(firstMessageSize);
-        bootstrap.getPipeline().addLast("handler", handler);
+        // Set up the pipeline factory.
+        bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(
+                        new EchoClientHandler(firstMessageSize));
+            }
+        });
 
         // Start the connection attempt.
         ChannelFuture future = bootstrap.connect(new InetSocketAddress(host, port));

src/main/java/org/jboss/netty/example/echo/EchoServer.java

@@ -19,6 +19,9 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
 import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
@@ -39,14 +42,14 @@ public class EchoServer {
                         Executors.newCachedThreadPool(),
                         Executors.newCachedThreadPool()));
 
-        // Set up the default event pipeline.
-        EchoServerHandler handler = new EchoServerHandler();
-        bootstrap.getPipeline().addLast("handler", handler);
+        // Set up the pipeline factory.
+        bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(new EchoServerHandler());
+            }
+        });
 
         // Bind and start to accept incoming connections.
         bootstrap.bind(new InetSocketAddress(8080));
-
-        // Start performance monitor.
-        new ThroughputMonitor(handler).start();
     }
 }

src/main/java/org/jboss/netty/example/echo/ThroughputMonitor.java

@@ -1,69 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- *
- * Red Hat licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package org.jboss.netty.example.echo;
-
-import org.jboss.netty.channel.ChannelHandler;
-
-/**
- * Measures and prints the current throughput every 3 seconds.
- *
- * @author The Netty Project (netty-dev@lists.jboss.org)
- * @author Trustin Lee (trustin@gmail.com)
- *
- * @version $Rev$, $Date$
- */
-public class ThroughputMonitor extends Thread {
-
-    private final ChannelHandler handler;
-
-    public ThroughputMonitor(EchoClientHandler handler) {
-        this.handler = handler;
-    }
-
-    public ThroughputMonitor(EchoServerHandler handler) {
-        this.handler = handler;
-    }
-
-    @Override
-    public void run() {
-        long oldCounter = getTransferredBytes();
-        long startTime = System.currentTimeMillis();
-        for (;;) {
-            try {
-                Thread.sleep(3000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
-            long endTime = System.currentTimeMillis();
-            long newCounter = getTransferredBytes();
-            System.err.format(
-                    "%4.3f MiB/s%n",
-                    (newCounter - oldCounter) * 1000.0 / (endTime - startTime) /
-                    1048576.0);
-            oldCounter = newCounter;
-            startTime = endTime;
-        }
-    }
-
-    private long getTransferredBytes() {
-        if (handler instanceof EchoClientHandler) {
-            return ((EchoClientHandler) handler).getTransferredBytes();
-        } else {
-            return ((EchoServerHandler) handler).getTransferredBytes();
-        }
-    }
-}

src/main/java/org/jboss/netty/example/http/tunnel/HttpTunnelingClientExample.java

@@ -23,6 +23,9 @@ import java.util.concurrent.Executors;
 
 import org.jboss.netty.bootstrap.ClientBootstrap;
 import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.socket.http.HttpTunnelingClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
 import org.jboss.netty.example.securechat.SecureChatSslContextFactory;
@@ -62,10 +65,14 @@ public class HttpTunnelingClientExample {
                 new HttpTunnelingClientSocketChannelFactory(
                         new OioClientSocketChannelFactory(Executors.newCachedThreadPool())));
 
-        // Set up the default event pipeline.
-        b.getPipeline().addLast("decoder", new StringDecoder());
-        b.getPipeline().addLast("encoder", new StringEncoder());
-        b.getPipeline().addLast("handler", new LoggingHandler(InternalLogLevel.INFO));
+        b.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(
+                        new StringDecoder(),
+                        new StringEncoder(),
+                        new LoggingHandler(InternalLogLevel.INFO));
+            }
+        });
 
         // Set additional options required by the HTTP tunneling transport.
         b.setOption("serverName", uri.getHost());

src/main/java/org/jboss/netty/example/local/LocalExample.java

@@ -21,6 +21,9 @@ import java.io.InputStreamReader;
 import org.jboss.netty.bootstrap.ClientBootstrap;
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.local.DefaultLocalClientChannelFactory;
 import org.jboss.netty.channel.local.DefaultLocalServerChannelFactory;
 import org.jboss.netty.channel.local.LocalAddress;
@@ -55,10 +58,15 @@ public class LocalExample {
         ClientBootstrap cb = new ClientBootstrap(
                 new DefaultLocalClientChannelFactory());
 
-        // Set up the default client-side event pipeline.
-        cb.getPipeline().addLast("decoder", new StringDecoder());
-        cb.getPipeline().addLast("encoder", new StringEncoder());
-        cb.getPipeline().addLast("handler", new LoggingHandler(InternalLogLevel.INFO));
+        // Set up the client-side pipeline factory.
+        cb.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(
+                        new StringDecoder(),
+                        new StringEncoder(),
+                        new LoggingHandler(InternalLogLevel.INFO));
+            }
+        });
 
         // Make the connection attempt to the server.
         ChannelFuture channelFuture = cb.connect(socketAddress);

src/main/java/org/jboss/netty/example/local/LocalExampleMultthreaded.java

@@ -20,6 +20,9 @@ import java.util.concurrent.TimeUnit;
 import org.jboss.netty.bootstrap.ClientBootstrap;
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.local.DefaultLocalClientChannelFactory;
 import org.jboss.netty.channel.local.DefaultLocalServerChannelFactory;
 import org.jboss.netty.channel.local.LocalAddress;
@@ -54,9 +57,14 @@ public class LocalExampleMultthreaded {
         ClientBootstrap cb = new ClientBootstrap(
                 new DefaultLocalClientChannelFactory());
 
-        cb.getPipeline().addLast("decoder", new StringDecoder());
-        cb.getPipeline().addLast("encoder", new StringEncoder());
-        cb.getPipeline().addLast("handler", new LoggingHandler(InternalLogLevel.INFO));
+        cb.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(
+                        new StringDecoder(),
+                        new StringEncoder(),
+                        new LoggingHandler(InternalLogLevel.INFO));
+            }
+        });
 
         // Read commands from array
         String[] commands = { "First", "Second", "Third", "quit" };

src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClient.java

@@ -19,8 +19,13 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
 import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 import org.jboss.netty.example.echo.EchoClient;
+import org.jboss.netty.handler.codec.serialization.ObjectDecoder;
+import org.jboss.netty.handler.codec.serialization.ObjectEncoder;
 
 /**
  * Modification of {@link EchoClient} which utilizes Java object serialization.
@@ -42,9 +47,9 @@ public class ObjectEchoClient {
         }
 
         // Parse options.
-        String host = args[0];
-        int port = Integer.parseInt(args[1]);
-        int firstMessageSize;
+        final String host = args[0];
+        final int port = Integer.parseInt(args[1]);
+        final int firstMessageSize;
 
         if (args.length == 3) {
             firstMessageSize = Integer.parseInt(args[2]);
@@ -58,14 +63,17 @@ public class ObjectEchoClient {
                         Executors.newCachedThreadPool(),
                         Executors.newCachedThreadPool()));
 
-        // Set up the default event pipeline.
-        ObjectEchoHandler handler = new ObjectEchoHandler(firstMessageSize);
-        bootstrap.getPipeline().addLast("handler", handler);
+        // Set up the pipeline factory.
+        bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(
+                        new ObjectEncoder(),
+                        new ObjectDecoder(),
+                        new ObjectEchoClientHandler(firstMessageSize));
+            }
+        });
 
         // Start the connection attempt.
         bootstrap.connect(new InetSocketAddress(host, port));
-
-        // Start performance monitor.
-        new ThroughputMonitor(handler).start();
     }
 }

src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClientHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Red Hat, Inc.
+ * Copyright 2010 Red Hat, Inc.
  *
  * Red Hat licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
@@ -29,12 +29,11 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.serialization.ObjectDecoder;
-import org.jboss.netty.handler.codec.serialization.ObjectEncoder;
 
 /**
- * Handles both client-side and server-side handler depending on which
- * constructor was called.
+ * Handler implementation for the object echo client.  It initiates the
+ * ping-pong traffic between the object echo client and server by sending the
+ * first message to the server.
  *
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (trustin@gmail.com)
@@ -42,25 +41,18 @@ import org.jboss.netty.handler.codec.serialization.ObjectEncoder;
  * @version $Rev$, $Date$
  */
 @ChannelPipelineCoverage("all")
-public class ObjectEchoHandler extends SimpleChannelUpstreamHandler {
+public class ObjectEchoClientHandler extends SimpleChannelUpstreamHandler {
 
     private static final Logger logger = Logger.getLogger(
-            ObjectEchoHandler.class.getName());
+            ObjectEchoClientHandler.class.getName());
 
     private final List<Integer> firstMessage;
     private final AtomicLong transferredMessages = new AtomicLong();
 
-    /**
-     * Creates a server-side handler.
-     */
-    public ObjectEchoHandler() {
-        firstMessage = new ArrayList<Integer>();
-    }
-
     /**
      * Creates a client-side handler.
      */
-    public ObjectEchoHandler(int firstMessageSize) {
+    public ObjectEchoClientHandler(int firstMessageSize) {
         if (firstMessageSize <= 0) {
             throw new IllegalArgumentException(
                     "firstMessageSize: " + firstMessageSize);
@@ -85,23 +77,12 @@ public class ObjectEchoHandler extends SimpleChannelUpstreamHandler {
         super.handleUpstream(ctx, e);
     }
 
-    @Override
-    public void channelOpen(ChannelHandlerContext ctx,
-            ChannelStateEvent e) throws Exception {
-        // Add encoder and decoder as soon as a new channel is created so that
-        // a Java object is serialized and deserialized.
-        e.getChannel().getPipeline().addFirst("encoder", new ObjectEncoder());
-        e.getChannel().getPipeline().addFirst("decoder", new ObjectDecoder());
-    }
-
     @Override
     public void channelConnected(
             ChannelHandlerContext ctx, ChannelStateEvent e) {
         // Send the first message if this handler is a client-side handler.
-        if (!firstMessage.isEmpty()) {
         e.getChannel().write(firstMessage);
     }
-    }
 
     @Override
     public void messageReceived(

src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServer.java

@@ -19,8 +19,13 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
 import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 import org.jboss.netty.example.echo.EchoServer;
+import org.jboss.netty.handler.codec.serialization.ObjectDecoder;
+import org.jboss.netty.handler.codec.serialization.ObjectEncoder;
 
 /**
  * Modification of {@link EchoServer} which utilizes Java object serialization.
@@ -39,14 +44,17 @@ public class ObjectEchoServer {
                         Executors.newCachedThreadPool(),
                         Executors.newCachedThreadPool()));
 
-        // Set up the default event pipeline.
-        ObjectEchoHandler handler = new ObjectEchoHandler();
-        bootstrap.getPipeline().addLast("handler", handler);
+        // Set up the pipeline factory.
+        bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(
+                        new ObjectEncoder(),
+                        new ObjectDecoder(),
+                        new ObjectEchoServerHandler());
+            }
+        });
 
         // Bind and start to accept incoming connections.
         bootstrap.bind(new InetSocketAddress(8080));
-
-        // Start performance monitor.
-        new ThroughputMonitor(handler).start();
     }
 }

src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServerHandler.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2010 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.example.objectecho;
+
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+
+/**
+ * Handles both client-side and server-side handler depending on which
+ * constructor was called.
+ *
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (trustin@gmail.com)
+ *
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("all")
+public class ObjectEchoServerHandler extends SimpleChannelUpstreamHandler {
+
+    private static final Logger logger = Logger.getLogger(
+            ObjectEchoServerHandler.class.getName());
+
+    private final AtomicLong transferredMessages = new AtomicLong();
+
+    public long getTransferredMessages() {
+        return transferredMessages.get();
+    }
+
+    @Override
+    public void handleUpstream(
+            ChannelHandlerContext ctx, ChannelEvent e) throws Exception {
+        if (e instanceof ChannelStateEvent &&
+            ((ChannelStateEvent) e).getState() != ChannelState.INTEREST_OPS) {
+            logger.info(e.toString());
+        }
+        super.handleUpstream(ctx, e);
+    }
+
+    @Override
+    public void messageReceived(
+            ChannelHandlerContext ctx, MessageEvent e) {
+        // Echo back the received object to the client.
+        transferredMessages.incrementAndGet();
+        e.getChannel().write(e.getMessage());
+    }
+
+    @Override
+    public void exceptionCaught(
+            ChannelHandlerContext ctx, ExceptionEvent e) {
+        logger.log(
+                Level.WARNING,
+                "Unexpected exception from downstream.",
+                e.getCause());
+        e.getChannel().close();
+    }
+}

src/main/java/org/jboss/netty/example/objectecho/ThroughputMonitor.java

@@ -1,54 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- *
- * Red Hat licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package org.jboss.netty.example.objectecho;
-
-/**
- * Measures and prints the current throughput every 3 seconds.
- *
- * @author The Netty Project (netty-dev@lists.jboss.org)
- * @author Trustin Lee (trustin@gmail.com)
- *
- * @version $Rev$, $Date$
- */
-public class ThroughputMonitor extends Thread {
-
-    private final ObjectEchoHandler handler;
-
-    public ThroughputMonitor(ObjectEchoHandler handler) {
-        this.handler = handler;
-    }
-
-    @Override
-    public void run() {
-        long oldCounter = handler.getTransferredMessages();
-        long startTime = System.currentTimeMillis();
-        for (;;) {
-            try {
-                Thread.sleep(3000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
-            long endTime = System.currentTimeMillis();
-            long newCounter = handler.getTransferredMessages();
-            System.err.format(
-                    "%4.3f msgs/s%n",
-                    (newCounter - oldCounter) * 1000 / (double) (endTime - startTime));
-            oldCounter = newCounter;
-            startTime = endTime;
-        }
-    }
-}

src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java

@@ -20,6 +20,8 @@ import java.util.concurrent.Executors;
 
 import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
 import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
 import org.jboss.netty.channel.socket.DatagramChannel;
 import org.jboss.netty.channel.socket.DatagramChannelFactory;
@@ -46,11 +48,15 @@ public class QuoteOfTheMomentClient {
 
         ConnectionlessBootstrap b = new ConnectionlessBootstrap(f);
 
-        // Configure the pipeline.
-        ChannelPipeline p = b.getPipeline();
-        p.addLast("encoder", new StringEncoder(CharsetUtil.ISO_8859_1));
-        p.addLast("decoder", new StringDecoder(CharsetUtil.ISO_8859_1));
-        p.addLast("handler", new QuoteOfTheMomentClientHandler());
+        // Configure the pipeline factory.
+        b.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(
+                        new StringEncoder(CharsetUtil.ISO_8859_1),
+                        new StringDecoder(CharsetUtil.ISO_8859_1),
+                        new QuoteOfTheMomentClientHandler());
+            }
+        });
 
         // Enable broadcast
         b.setOption("broadcast", "true");

src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java

@@ -20,6 +20,8 @@ import java.util.concurrent.Executors;
 
 import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
 import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
 import org.jboss.netty.channel.socket.DatagramChannelFactory;
 import org.jboss.netty.channel.socket.oio.OioDatagramChannelFactory;
@@ -45,11 +47,15 @@ public class QuoteOfTheMomentServer {
 
         ConnectionlessBootstrap b = new ConnectionlessBootstrap(f);
 
-        // Configure the pipeline.
-        ChannelPipeline p = b.getPipeline();
-        p.addLast("encoder", new StringEncoder(CharsetUtil.ISO_8859_1));
-        p.addLast("decoder", new StringDecoder(CharsetUtil.ISO_8859_1));
-        p.addLast("handler", new QuoteOfTheMomentServerHandler());
+        // Configure the pipeline factory.
+        b.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(
+                        new StringEncoder(CharsetUtil.ISO_8859_1),
+                        new StringDecoder(CharsetUtil.ISO_8859_1),
+                        new QuoteOfTheMomentServerHandler());
+            }
+        });
 
         // Enable broadcast
         b.setOption("broadcast", "false");

src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java

@@ -56,8 +56,8 @@ public class SecureChatClient {
                         Executors.newCachedThreadPool(),
                         Executors.newCachedThreadPool()));
 
-        SecureChatClientHandler handler = new SecureChatClientHandler();
-        bootstrap.setPipelineFactory(new SecureChatPipelineFactory(handler));
+        // Configure the pipeline factory.
+        bootstrap.setPipelineFactory(new SecureChatClientPipelineFactory());
 
         // Start the connection attempt.
         ChannelFuture future = bootstrap.connect(new InetSocketAddress(host, port));

src/main/java/org/jboss/netty/example/securechat/SecureChatClientPipelineFactory.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2010 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.example.securechat;
+
+import static org.jboss.netty.channel.Channels.*;
+
+import javax.net.ssl.SSLEngine;
+
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import org.jboss.netty.handler.codec.frame.Delimiters;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+import org.jboss.netty.handler.ssl.SslHandler;
+
+/**
+ * Creates a newly configured {@link ChannelPipeline} for a new channel.
+ *
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (trustin@gmail.com)
+ *
+ * @version $Rev$, $Date$
+ *
+ */
+public class SecureChatClientPipelineFactory implements
+        ChannelPipelineFactory {
+
+    public ChannelPipeline getPipeline() throws Exception {
+        ChannelPipeline pipeline = pipeline();
+
+        // Add SSL handler first to encrypt and decrypt everything.
+        // In this example, we use a bogus certificate in the server side
+        // and accept any invalid certificates in the client side.
+        // You will need something more complicated to identify both
+        // and server in the real world.
+
+        SSLEngine engine =
+            SecureChatSslContextFactory.getClientContext().createSSLEngine();
+        engine.setUseClientMode(true);
+
+        pipeline.addLast("ssl", new SslHandler(engine));
+
+        // On top of the SSL handler, add the text line codec.
+        pipeline.addLast("framer", new DelimiterBasedFrameDecoder(
+                8192, Delimiters.lineDelimiter()));
+        pipeline.addLast("decoder", new StringDecoder());
+        pipeline.addLast("encoder", new StringEncoder());
+
+        // and then business logic.
+        pipeline.addLast("handler", new SecureChatClientHandler());
+
+        return pipeline;
+    }
+}

src/main/java/org/jboss/netty/example/securechat/SecureChatServer.java

@@ -39,9 +39,8 @@ public class SecureChatServer {
                         Executors.newCachedThreadPool(),
                         Executors.newCachedThreadPool()));
 
-        SecureChatServerHandler handler = new SecureChatServerHandler();
-
-        bootstrap.setPipelineFactory(new SecureChatPipelineFactory(handler));
+        // Configure the pipeline factory.
+        bootstrap.setPipelineFactory(new SecureChatServerPipelineFactory());
 
         // Bind and start to accept incoming connections.
         bootstrap.bind(new InetSocketAddress(8080));

src/main/java/org/jboss/netty/example/securechat/SecureChatServerPipelineFactory.java

@@ -19,7 +19,6 @@ import static org.jboss.netty.channel.Channels.*;
 
 import javax.net.ssl.SSLEngine;
 
-import org.jboss.netty.channel.ChannelHandler;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
@@ -37,15 +36,9 @@ import org.jboss.netty.handler.ssl.SslHandler;
  * @version $Rev$, $Date$
  *
  */
-public class SecureChatPipelineFactory implements
+public class SecureChatServerPipelineFactory implements
         ChannelPipelineFactory {
 
-    private final ChannelHandler handler;
-
-    public SecureChatPipelineFactory(ChannelHandler handler) {
-        this.handler = handler;
-    }
-
     public ChannelPipeline getPipeline() throws Exception {
         ChannelPipeline pipeline = pipeline();
 
@@ -55,14 +48,9 @@ public class SecureChatPipelineFactory implements
         // You will need something more complicated to identify both
         // and server in the real world.
 
-        SSLEngine engine;
-        if (handler instanceof SecureChatClientHandler) {
-            engine = SecureChatSslContextFactory.getClientContext().createSSLEngine();
-            engine.setUseClientMode(true);
-        } else {
-            engine = SecureChatSslContextFactory.getServerContext().createSSLEngine();
+        SSLEngine engine =
+            SecureChatSslContextFactory.getServerContext().createSSLEngine();
         engine.setUseClientMode(false);
-        }
 
         pipeline.addLast("ssl", new SslHandler(engine));
 
@@ -73,7 +61,7 @@ public class SecureChatPipelineFactory implements
         pipeline.addLast("encoder", new StringEncoder());
 
         // and then business logic.
-        pipeline.addLast("handler", handler);
+        pipeline.addLast("handler", new SecureChatServerHandler());
 
         return pipeline;
     }

src/main/java/org/jboss/netty/example/telnet/TelnetClient.java

@@ -54,8 +54,8 @@ public class TelnetClient {
                         Executors.newCachedThreadPool(),
                         Executors.newCachedThreadPool()));
 
-        TelnetClientHandler handler = new TelnetClientHandler();
-        bootstrap.setPipelineFactory(new TelnetPipelineFactory(handler));
+        // Configure the pipeline factory.
+        bootstrap.setPipelineFactory(new TelnetClientPipelineFactory());
 
         // Start the connection attempt.
         ChannelFuture future = bootstrap.connect(new InetSocketAddress(host, port));

src/main/java/org/jboss/netty/example/telnet/TelnetClientPipelineFactory.java

@@ -17,7 +17,6 @@ package org.jboss.netty.example.telnet;
 
 import static org.jboss.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelHandler;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
@@ -34,15 +33,9 @@ import org.jboss.netty.handler.codec.string.StringEncoder;
  * @version $Rev$, $Date$
  *
  */
-public class TelnetPipelineFactory implements
+public class TelnetClientPipelineFactory implements
         ChannelPipelineFactory {
 
-    private final ChannelHandler handler;
-
-    public TelnetPipelineFactory(ChannelHandler handler) {
-        this.handler = handler;
-    }
-
     public ChannelPipeline getPipeline() throws Exception {
         // Create a default pipeline implementation.
         ChannelPipeline pipeline = pipeline();
@@ -54,7 +47,7 @@ public class TelnetPipelineFactory implements
         pipeline.addLast("encoder", new StringEncoder());
 
         // and then business logic.
-        pipeline.addLast("handler", handler);
+        pipeline.addLast("handler", new TelnetClientHandler());
 
         return pipeline;
     }

src/main/java/org/jboss/netty/example/telnet/TelnetServer.java

@@ -38,8 +38,8 @@ public class TelnetServer {
                         Executors.newCachedThreadPool(),
                         Executors.newCachedThreadPool()));
 
-        TelnetServerHandler handler = new TelnetServerHandler();
-        bootstrap.setPipelineFactory(new TelnetPipelineFactory(handler));
+        // Configure the pipeline factory.
+        bootstrap.setPipelineFactory(new TelnetServerPipelineFactory());
 
         // Bind and start to accept incoming connections.
         bootstrap.bind(new InetSocketAddress(8080));

src/main/java/org/jboss/netty/example/telnet/TelnetServerPipelineFactory.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.example.telnet;
+
+import static org.jboss.netty.channel.Channels.*;
+
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import org.jboss.netty.handler.codec.frame.Delimiters;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+
+/**
+ * Creates a newly configured {@link ChannelPipeline} for a new channel.
+ *
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (trustin@gmail.com)
+ *
+ * @version $Rev$, $Date$
+ *
+ */
+public class TelnetServerPipelineFactory implements
+        ChannelPipelineFactory {
+
+    public ChannelPipeline getPipeline() throws Exception {
+        // Create a default pipeline implementation.
+        ChannelPipeline pipeline = pipeline();
+
+        // Add the text line codec combination first,
+        pipeline.addLast("framer", new DelimiterBasedFrameDecoder(
+                8192, Delimiters.lineDelimiter()));
+        pipeline.addLast("decoder", new StringDecoder());
+        pipeline.addLast("encoder", new StringEncoder());
+
+        // and then business logic.
+        pipeline.addLast("handler", new TelnetServerHandler());
+
+        return pipeline;
+    }
+}

src/main/java/org/jboss/netty/example/uptime/UptimeClient.java

@@ -19,6 +19,9 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
 import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 import org.jboss.netty.handler.timeout.ReadTimeoutHandler;
 import org.jboss.netty.util.HashedWheelTimer;
@@ -57,18 +60,22 @@ public class UptimeClient {
         int port = Integer.parseInt(args[1]);
 
         // Initialize the timer that schedules subsequent reconnection attempts.
-        Timer timer = new HashedWheelTimer();
+        final Timer timer = new HashedWheelTimer();
 
         // Configure the client.
-        ClientBootstrap bootstrap = new ClientBootstrap(
+        final ClientBootstrap bootstrap = new ClientBootstrap(
                 new NioClientSocketChannelFactory(
                         Executors.newCachedThreadPool(),
                         Executors.newCachedThreadPool()));
 
-        bootstrap.getPipeline().addLast(
-                "timeout", new ReadTimeoutHandler(timer, READ_TIMEOUT));
-        bootstrap.getPipeline().addLast(
-                "handler", new UptimeClientHandler(bootstrap, timer));
+        // Configure the pipeline factory.
+        bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
+            public ChannelPipeline getPipeline() throws Exception {
+                return Channels.pipeline(
+                        new ReadTimeoutHandler(timer, READ_TIMEOUT),
+                        new UptimeClientHandler(bootstrap, timer));
+            }
+        });
 
         bootstrap.setOption(
                 "remoteAddress", new InetSocketAddress(host, port));