Finished Google Guice integration

src/main/java/org/jboss/netty/container/guice/AbstractChannelFactoryProvider.java

@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.ChannelFactory;
+
+import com.google.inject.Provider;
+
+/**
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
+ */
+public abstract class AbstractChannelFactoryProvider<T extends ChannelFactory> implements Provider<T> {
+
+    protected final Executor executor;
+
+    protected AbstractChannelFactoryProvider(Executor executor) {
+        if (executor == null) {
+            throw new NullPointerException("executor");
+        }
+        this.executor = executor;
+    }
+}

src/main/java/org/jboss/netty/container/guice/ChannelFactoryModule.java

@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Scopes;
+
+/**
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
+ */
+public class ChannelFactoryModule extends AbstractModule {
+
+    @Override
+    protected void configure() {
+        bind(ClientSocketChannelFactory.class).
+            toProvider(NioClientSocketChannelFactoryProvider.class).
+            in(Scopes.SINGLETON);
+
+        bind(ServerSocketChannelFactory.class).
+            toProvider(NioServerSocketChannelFactoryProvider.class).
+            in(Scopes.SINGLETON);
+
+        bind(NioClientSocketChannelFactory.class).
+            toProvider(NioClientSocketChannelFactoryProvider.class).
+            in(Scopes.SINGLETON);
+
+        bind(NioServerSocketChannelFactory.class).
+            toProvider(NioServerSocketChannelFactoryProvider.class).
+            in(Scopes.SINGLETON);
+
+        bind(OioClientSocketChannelFactory.class).
+            toProvider(OioClientSocketChannelFactoryProvider.class).
+            in(Scopes.SINGLETON);
+
+        bind(OioServerSocketChannelFactory.class).
+            toProvider(OioServerSocketChannelFactoryProvider.class).
+            in(Scopes.SINGLETON);
+    }
+}

src/main/java/org/jboss/netty/container/guice/ChannelFactoryResource.java

@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.google.inject.BindingAnnotation;
+
+/**
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.PARAMETER})
+@BindingAnnotation
+public @interface ChannelFactoryResource {
+    // No value required
+}

src/main/java/org/jboss/netty/container/guice/ChannelFactoryResources.java

@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+
+/**
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
+ */
+public class ChannelFactoryResources {
+
+    private static final ChannelFactoryResource INSTANCE =
+        new DefaultChannelFactoryResource();
+
+    public static ChannelFactoryResource getInstance() {
+        return INSTANCE;
+    }
+
+    private ChannelFactoryResources() {
+        super();
+    }
+}

src/main/java/org/jboss/netty/container/guice/DefaultChannelFactoryResource.java

@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
+ */
+@SuppressWarnings("all")
+class DefaultChannelFactoryResource implements ChannelFactoryResource {
+
+    DefaultChannelFactoryResource() {
+        super();
+    }
+
+    @Override
+    public int hashCode() {
+        return 0; // Must be 0 for the annotation with no property
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return o instanceof ChannelFactoryResource;
+    }
+
+    @Override
+    public String toString() {
+        return "@" + ChannelFactoryResource.class.getName();
+    }
+
+    public Class<? extends Annotation> annotationType() {
+      return ChannelFactoryResource.class;
+    }
+}

src/main/java/org/jboss/netty/container/guice/ExecutorModule.java

@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.util.ExecutorShutdownUtil;
+
+import com.google.inject.AbstractModule;
+
+/**
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
+ */
+public class ExecutorModule extends AbstractModule {
+
+    private final Executor executor;
+
+    public ExecutorModule(Executor executor) {
+        if (executor == null) {
+            throw new NullPointerException("executor");
+        }
+        this.executor = executor;
+    }
+
+    public void terminateExecutor() {
+        ExecutorShutdownUtil.shutdown(executor);
+    }
+
+    @Override
+    protected void configure() {
+        bind(Executor.class).
+            annotatedWith(ChannelFactoryResources.getInstance()).
+            toInstance(executor);
+    }
+}

src/main/java/org/jboss/netty/container/guice/NioClientSocketChannelFactoryProvider.java

@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+
+import com.google.inject.Inject;
+
+/**
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
+ */
+public class NioClientSocketChannelFactoryProvider extends
+        AbstractChannelFactoryProvider<NioClientSocketChannelFactory> {
+
+    @Inject
+    public NioClientSocketChannelFactoryProvider(@ChannelFactoryResource Executor executor) {
+        super(executor);
+    }
+
+    public NioClientSocketChannelFactory get() {
+        return new NioClientSocketChannelFactory(executor, executor);
+    }
+}

src/main/java/org/jboss/netty/container/guice/NioServerSocketChannelFactoryProvider.java

@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+
+import com.google.inject.Inject;
+
+/**
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
+ */
+public class NioServerSocketChannelFactoryProvider extends
+        AbstractChannelFactoryProvider<NioServerSocketChannelFactory> {
+
+    @Inject
+    public NioServerSocketChannelFactoryProvider(@ChannelFactoryResource Executor executor) {
+        super(executor);
+    }
+
+    public NioServerSocketChannelFactory get() {
+        return new NioServerSocketChannelFactory(executor, executor);
+    }
+}

src/main/java/org/jboss/netty/container/guice/OioClientSocketChannelFactoryProvider.java

@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+
+import com.google.inject.Inject;
+
+/**
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
+ */
+public class OioClientSocketChannelFactoryProvider extends
+        AbstractChannelFactoryProvider<OioClientSocketChannelFactory> {
+
+    @Inject
+    public OioClientSocketChannelFactoryProvider(@ChannelFactoryResource Executor executor) {
+        super(executor);
+    }
+
+    public OioClientSocketChannelFactory get() {
+        return new OioClientSocketChannelFactory(executor);
+    }
+}

src/main/java/org/jboss/netty/container/guice/OioServerSocketChannelFactoryProvider.java

@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+
+import com.google.inject.Inject;
+
+/**
+ * @author The Netty Project (netty-dev@lists.jboss.org)
+ * @author Trustin Lee (tlee@redhat.com)
+ * @version $Rev$, $Date$
+ */
+public class OioServerSocketChannelFactoryProvider extends
+        AbstractChannelFactoryProvider<OioServerSocketChannelFactory> {
+
+    @Inject
+    public OioServerSocketChannelFactoryProvider(@ChannelFactoryResource Executor executor) {
+        super(executor);
+    }
+
+    public OioServerSocketChannelFactory get() {
+        return new OioServerSocketChannelFactory(executor, executor);
+    }
+}