November 2009 - jboss-remoting-commits

JBoss Remoting SVN: r5586 - remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2009-11-04 20:15:03 -0500 (Wed, 04 Nov 2009) New Revision: 5586 Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/EndpointTestCase.java Log: Bring tests up to date Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/EndpointTestCase.java =================================================================== --- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/EndpointTestCase.java 2009-11-05 00:20:35 UTC (rev 5585) +++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/EndpointTestCase.java 2009-11-05 01:15:03 UTC (rev 5586) @@ -25,9 +25,11 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; +import java.io.IOException; +import java.net.URI; import junit.framework.TestCase; import org.jboss.xnio.IoUtils; +import org.jboss.xnio.OptionMap; import org.jboss.xnio.log.Logger; /** @@ -39,7 +41,7 @@ public void testCreate() throws Throwable { final ExecutorService executorService = Executors.newCachedThreadPool(); - final EndpointImpl endpoint = new EndpointImpl(executorService, "foo"); + final Endpoint endpoint = Remoting.createEndpoint(executorService, "foo"); try { endpoint.close(); executorService.shutdown(); @@ -50,60 +52,154 @@ } public void testLocalClientInvoke() throws Throwable { - final AtomicBoolean clientEndpointClosed = new AtomicBoolean(false); - final AtomicBoolean clientClosed = new AtomicBoolean(false); - final ExecutorService executorService = Executors.newCachedThreadPool(); + final Endpoint endpoint = Remoting.createEndpoint("test-endpoint"); try { - final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint"); final Object requestObj = new Object(); final Object replyObj = new Object(); + final Client<Object, Object> localClient = Remoting.createLocalClient(endpoint, new RequestListener<Object, Object>() { + public void handleRequest(final RequestContext<Object> objectRequestContext, final Object request) throws RemoteExecutionException { + try { + objectRequestContext.sendReply(replyObj); + } catch (IOException e) { + throw new RemoteExecutionException(e); + } + } + + public void handleClose() { + log.info("Listener closed"); + } + }, Object.class, Object.class); try { + assertEquals(replyObj, localClient.invoke(requestObj)); } finally { - IoUtils.safeClose(endpoint); + IoUtils.safeClose(localClient); } } finally { - executorService.shutdownNow(); + IoUtils.safeClose(endpoint); } } public void testLocalClientSend() throws Throwable { - final AtomicBoolean clientEndpointClosed = new AtomicBoolean(false); - final AtomicBoolean clientClosed = new AtomicBoolean(false); - final ExecutorService executorService = Executors.newCachedThreadPool(); + final Endpoint endpoint = Remoting.createEndpoint("test-endpoint"); try { - final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint"); + final Object requestObj = new Object(); + final Object replyObj = new Object(); + final Client<Object, Object> localClient = Remoting.createLocalClient(endpoint, new RequestListener<Object, Object>() { + public void handleRequest(final RequestContext<Object> objectRequestContext, final Object request) throws RemoteExecutionException { + try { + objectRequestContext.sendReply(replyObj); + } catch (IOException e) { + throw new RemoteExecutionException(e); + } + } + + public void handleClose() { + log.info("Listener closed"); + } + }, Object.class, Object.class); try { + assertEquals(replyObj, localClient.send(requestObj).get()); } finally { - IoUtils.safeClose(endpoint); + IoUtils.safeClose(localClient); } } finally { - executorService.shutdownNow(); + IoUtils.safeClose(endpoint); } } - public void testUnsentReply() throws Throwable { - final ExecutorService executorService = Executors.newCachedThreadPool(); + public void testLocalClientConnectInvoke() throws Throwable { + final Endpoint endpoint = Remoting.createEndpoint("test-endpoint"); try { - final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint"); + final Object requestObj = new Object(); + final Object replyObj = new Object(); + final Registration registration = endpoint.serviceBuilder().setGroupName("foo").setServiceType("test").setRequestType(Object.class). + setReplyType(Object.class).setClientListener(new ClientListener<Object, Object>() { + public RequestListener<Object, Object> handleClientOpen(final ClientContext clientContext) { + return new RequestListener<Object, Object>() { + public void handleRequest(final RequestContext<Object> objectRequestContext, final Object request) throws RemoteExecutionException { + try { + objectRequestContext.sendReply(replyObj); + } catch (IOException e) { + throw new RemoteExecutionException(e); + } + } + + public void handleClose() { + log.info("Listener closed"); + } + }; + } + }).register(); try { + final Connection connection = endpoint.connect(new URI("local:///"), OptionMap.EMPTY).get(); + try { + final Client<Object, Object> localClient = connection.openClient("test", "*", Object.class, Object.class).get(); + try { + assertEquals(replyObj, localClient.invoke(requestObj)); + } finally { + IoUtils.safeClose(localClient); + } + } finally { + IoUtils.safeClose(connection); + } } finally { - IoUtils.safeClose(endpoint); + IoUtils.safeClose(registration); } } finally { - executorService.shutdownNow(); + IoUtils.safeClose(endpoint); } } - public void testUnsentReply2() throws Throwable { - final ExecutorService executorService = Executors.newCachedThreadPool(); + public void testLocalClientConnectSend() throws Throwable { + final Endpoint endpoint = Remoting.createEndpoint("test-endpoint"); try { - final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint"); + final Object requestObj = new Object(); + final Object replyObj = new Object(); + final Registration registration = endpoint.serviceBuilder().setGroupName("foo").setServiceType("test").setRequestType(Object.class). + setReplyType(Object.class).setClientListener(new ClientListener<Object, Object>() { + public RequestListener<Object, Object> handleClientOpen(final ClientContext clientContext) { + return new RequestListener<Object, Object>() { + public void handleRequest(final RequestContext<Object> objectRequestContext, final Object request) throws RemoteExecutionException { + try { + objectRequestContext.sendReply(replyObj); + } catch (IOException e) { + throw new RemoteExecutionException(e); + } + } + + public void handleClose() { + log.info("Listener closed"); + } + }; + } + }).register(); try { + final Connection connection = endpoint.connect(new URI("local:///"), OptionMap.EMPTY).get(); + try { + final Client<Object, Object> localClient = connection.openClient("test", "*", Object.class, Object.class).get(); + try { + assertEquals(replyObj, localClient.send(requestObj).get()); + } finally { + IoUtils.safeClose(localClient); + } + } finally { + IoUtils.safeClose(connection); + } } finally { - IoUtils.safeClose(endpoint); + IoUtils.safeClose(registration); } } finally { - executorService.shutdownNow(); + IoUtils.safeClose(endpoint); } } + + public void testNotFoundService() throws Throwable { + final Endpoint endpoint = Remoting.createEndpoint("test-endpoint"); + try { + endpoint.connect(new URI("local:///"), OptionMap.EMPTY).get().openClient("blah", "bzzt", Object.class, Object.class).get(); + } catch (ServiceNotFoundException e) { + return; + } + fail("Expected exception"); + } }

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5585 - in remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3: stream and 1 other directory.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2009-11-04 19:20:35 -0500 (Wed, 04 Nov 2009) New Revision: 5585 Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ObjectSink.java remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ObjectSource.java remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java Log: Javadoc and copyright Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java 2009-11-04 23:31:39 UTC (rev 5584) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java 2009-11-05 00:20:35 UTC (rev 5585) @@ -104,6 +104,9 @@ private static final Logger log = Logger.getLogger("org.jboss.remoting.endpoint"); + /** + * The name of this endpoint. + */ private final String name; /** @@ -112,14 +115,39 @@ */ private final Object serviceRegistrationLock = new Object(); + /** + * The currently registered service listeners. Protected by {@link #serviceRegistrationLock}. + */ private final ConcurrentMap<Registration, ServiceRegistrationListener> serviceListenerRegistrations = concurrentIdentityMap(serviceRegistrationLock); + /** + * The currently registered services. Protected by {@link #serviceRegistrationLock}. + */ private final ConcurrentMap<String, ConcurrentMap<String, ServiceRegistration>> registeredLocalServices = concurrentMap(serviceRegistrationLock); + /** + * The currently registered connection providers. + */ private final ConcurrentMap<String, ConnectionProvider<?>> connectionProviders = concurrentMap(); + /** + * The provider maps for the different protocol service types. + */ private final ConcurrentMap[] providerMaps = new ConcurrentMap[ProtocolServiceType.getServiceTypes().length]; + /** + * The single per-endpoint connection provider context instance. + */ private final ConnectionProviderContext connectionProviderContext; + /** + * The special connection handler instance corresponding to {@link #loopbackConnection}. + */ private final ConnectionHandler loopbackConnectionHandler; + /** + * The special loopback connection instance for local request handlers which are created via {@link #createLocalRequestHandler(RequestListener, Class, Class)} and + * not tied to a service. This connection cannot be closed. + */ private final Connection loopbackConnection; + /** + * The special connection handler context corresponding to {@link #loopbackConnectionHandler}. + */ private final ConnectionHandlerContext localConnectionContext; private static final EndpointPermission CREATE_ENDPOINT_PERM = new EndpointPermission("createEndpoint"); Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ObjectSink.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ObjectSink.java 2009-11-04 23:31:39 UTC (rev 5584) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ObjectSink.java 2009-11-05 00:20:35 UTC (rev 5585) @@ -1,3 +1,25 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, JBoss Inc., and individual contributors as indicated + * by the @authors tag. 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.remoting3.stream; import java.io.Closeable; Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ObjectSource.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ObjectSource.java 2009-11-04 23:31:39 UTC (rev 5584) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ObjectSource.java 2009-11-05 00:20:35 UTC (rev 5585) @@ -1,3 +1,25 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, JBoss Inc., and individual contributors as indicated + * by the @authors tag. 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.remoting3.stream; import java.io.Closeable; Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java 2009-11-04 23:31:39 UTC (rev 5584) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java 2009-11-05 00:20:35 UTC (rev 5585) @@ -1,3 +1,25 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, JBoss Inc., and individual contributors as indicated + * by the @authors tag. 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.remoting3.stream; import java.io.EOFException;

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5584 - in remoting3/trunk: jboss-remoting/src/main/java/org/jboss/remoting3/spi and 1 other directories.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2009-11-04 18:31:39 -0500 (Wed, 04 Nov 2009) New Revision: 5584 Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/ConnectionHandlerContext.java remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/ConnectionProviderContext.java remoting3/trunk/taglet/pom.xml Log: Minor cleanup Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java 2009-11-04 23:19:07 UTC (rev 5583) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java 2009-11-04 23:31:39 UTC (rev 5584) @@ -114,11 +114,14 @@ private final ConcurrentMap<Registration, ServiceRegistrationListener> serviceListenerRegistrations = concurrentIdentityMap(serviceRegistrationLock); private final ConcurrentMap<String, ConcurrentMap<String, ServiceRegistration>> registeredLocalServices = concurrentMap(serviceRegistrationLock); - private final ConcurrentMap<String, ConnectionProvider<?>> connectionProviders = concurrentMap(); - private final ConcurrentMap[] providerMaps = new ConcurrentMap[ProtocolServiceType.getServiceTypes().length]; + private final ConnectionProviderContext connectionProviderContext; + private final ConnectionHandler loopbackConnectionHandler; + private final Connection loopbackConnection; + private final ConnectionHandlerContext localConnectionContext; + private static final EndpointPermission CREATE_ENDPOINT_PERM = new EndpointPermission("createEndpoint"); private static final EndpointPermission CREATE_REQUEST_HANDLER_PERM = new EndpointPermission("createRequestHandler"); private static final EndpointPermission REGISTER_SERVICE_PERM = new EndpointPermission("registerService"); @@ -140,6 +143,10 @@ this.executor = executor; this.name = name; connectionProviders.put("local", new LocalConnectionProvider()); + connectionProviderContext = new ConnectionProviderContextImpl(); + loopbackConnectionHandler = new LoopbackConnectionHandler(); + loopbackConnection = new LoopbackConnection(); + localConnectionContext = new LocalConnectionContext(null, loopbackConnection); } private final Executor executor; @@ -454,7 +461,7 @@ final FutureResult<Connection> futureResult = new FutureResult<Connection>(executor); futureResult.addCancelHandler(connectionProvider.connect(destination, connectOptions, new TranslatingResult<ConnectionHandlerFactory, Connection>(futureResult) { protected Connection translate(final ConnectionHandlerFactory input) { - return new ConnectionImpl(input); + return new ConnectionImpl(input, connectionProviderContext); } })); return futureResult.getIoFuture(); @@ -542,12 +549,18 @@ } private final class LocalConnectionContext implements ConnectionHandlerContext { + private final ConnectionProviderContext connectionProviderContext; private final Connection connection; - LocalConnectionContext(final Connection connection) { + LocalConnectionContext(final ConnectionProviderContext connectionProviderContext, final Connection connection) { + this.connectionProviderContext = connectionProviderContext; this.connection = connection; } + public ConnectionProviderContext getConnectionProviderContext() { + return connectionProviderContext; + } + public void openService(final String serviceType, final String groupName, final OptionMap optionMap, final ServiceResult serviceResult) { final String canonServiceType = serviceType.toLowerCase(); final String canonGroupName = groupName.toLowerCase(); @@ -599,9 +612,9 @@ private class ConnectionImpl extends AbstractHandleableCloseable<Connection> implements Connection { private final ConnectionHandler connectionHandler; - private ConnectionImpl(final ConnectionHandlerFactory connectionHandlerFactory) { + private ConnectionImpl(final ConnectionHandlerFactory connectionHandlerFactory, final ConnectionProviderContext connectionProviderContext) { super(EndpointImpl.this.executor); - connectionHandler = connectionHandlerFactory.createInstance(new LocalConnectionContext(this)); + connectionHandler = connectionHandlerFactory.createInstance(new LocalConnectionContext(connectionProviderContext, this)); } protected void closeAction() throws IOException { @@ -646,10 +659,6 @@ } } - private final ConnectionHandler loopbackConnectionHandler = new LoopbackConnectionHandler(); - private final Connection loopbackConnection = new LoopbackConnection(); - private final ConnectionHandlerContext localConnectionContext = new LocalConnectionContext(loopbackConnection); - private final class LocalConnectionProvider implements ConnectionProvider<Void> { public Cancellable connect(final URI uri, final OptionMap connectOptions, final Result<ConnectionHandlerFactory> result) throws IllegalArgumentException { Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/ConnectionHandlerContext.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/ConnectionHandlerContext.java 2009-11-04 23:19:07 UTC (rev 5583) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/ConnectionHandlerContext.java 2009-11-04 23:31:39 UTC (rev 5584) @@ -25,13 +25,20 @@ import org.jboss.xnio.OptionMap; /** - * The context for connections to service incoming requests to open a client service. + * The context for connection handlers. Used to inform the endpoint of incoming events on an established connection. * * @remoting.consume */ public interface ConnectionHandlerContext { /** + * Get the connection provider context associated with this connection handler context. + * + * @return the connection provider context + */ + ConnectionProviderContext getConnectionProviderContext(); + + /** * Open a service. * * @remoting.nonblocking Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/ConnectionProviderContext.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/ConnectionProviderContext.java 2009-11-04 23:19:07 UTC (rev 5583) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/ConnectionProviderContext.java 2009-11-04 23:31:39 UTC (rev 5584) @@ -26,7 +26,8 @@ import java.util.Map; /** - * A context for a connection provider which provides a means to accept a connection. + * A context for a connection provider. This provides additional endpoint methods to connection providers which are not + * accessible otherwise. * * @remoting.consume */ Modified: remoting3/trunk/taglet/pom.xml =================================================================== --- remoting3/trunk/taglet/pom.xml 2009-11-04 23:19:07 UTC (rev 5583) +++ remoting3/trunk/taglet/pom.xml 2009-11-04 23:31:39 UTC (rev 5584) @@ -28,6 +28,8 @@ <groupId>org.jboss.remoting</groupId> <artifactId>jboss-remoting-taglet</artifactId> + <name>JBoss Remoting Taglet</name> + <description>JBoss Remoting Documentation Taglet</description> <packaging>jar</packaging> <version>3.1.0.CR1</version>

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5583 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2009-11-04 18:19:07 -0500 (Wed, 04 Nov 2009) New Revision: 5583 Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java Log: Fix incomplete impl Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java 2009-11-04 23:17:36 UTC (rev 5582) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java 2009-11-04 23:19:07 UTC (rev 5583) @@ -340,11 +340,12 @@ } public boolean hasNext() throws IOException { - return false; + return source.hasNext(); } public Pair<K, V> next() throws NoSuchElementException, IOException { - return null; + final Map.Entry<K, V> entry = source.next(); + return Pair.create(entry.getKey(), entry.getValue()); } public void close() throws IOException {

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5582 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2009-11-04 18:17:36 -0500 (Wed, 04 Nov 2009) New Revision: 5582 Removed: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java Log: Use Pair from JBMAR API instead Deleted: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java 2009-11-04 21:34:33 UTC (rev 5581) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java 2009-11-04 23:17:36 UTC (rev 5582) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. 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.remoting3.stream; - -import java.io.Serializable; - -/** - * A serializable pair of values. - * - * @param <A> the type of the first value - * @param the type of the second value - */ -public final class Pair<A, B> implements Serializable { - - private static final long serialVersionUID = -1812076980977921946L; - - private final A a; - private final B b; - - /** - * Construct a new instance. - * - * @param a the first value - * @param b the second value - */ - public Pair(final A a, final B b) { - this.a = a; - this.b = b; - } - - /** - * Get the first value. - * - * @return the first value - */ - public A getA() { - return a; - } - - /** - * Get the second value. - * - * @return the second value - */ - public B getB() { - return b; - } -} Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java 2009-11-04 21:34:33 UTC (rev 5581) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java 2009-11-04 23:17:36 UTC (rev 5582) @@ -8,6 +8,7 @@ import java.util.NoSuchElementException; import java.util.Map; import java.util.concurrent.Executor; +import org.jboss.marshalling.Pair; import org.jboss.xnio.IoFuture; import org.jboss.xnio.FutureResult; import org.jboss.xnio.Cancellable;

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5581 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2009-11-04 16:34:33 -0500 (Wed, 04 Nov 2009) New Revision: 5581 Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java Log: Minor generics fix Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java 2009-11-04 02:11:18 UTC (rev 5580) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java 2009-11-04 21:34:33 UTC (rev 5581) @@ -140,7 +140,7 @@ * it is recommended that the instance be discarded if an exception is thrown. * * An example usage which meets this requirement would be: <code><pre> - * final IoFuture<List<Foo>> futureFooList = getFutureCollection(executor, new ArrayList<Foo>(), fooSource); + * final IoFuture<? extends List<Foo>> futureFooList = getFutureCollection(executor, new ArrayList<Foo>(), fooSource); * </pre></code> * * @param executor the executor in which to run asynchronous tasks @@ -151,7 +151,7 @@ * @return the new future collection, populated * @throws IOException if an error occurs */ - public static <C extends Collection<T>, T> IoFuture<C> getFutureCollection(Executor executor, final C newCollection, final ObjectSource<T> objectSource) { + public static <C extends Collection<T>, T> IoFuture<? extends C> getFutureCollection(Executor executor, final C newCollection, final ObjectSource<T> objectSource) { final FutureResult<C> futureResult = new FutureResult<C>(executor); futureResult.addCancelHandler(new Cancellable() { public Cancellable cancel() { @@ -187,7 +187,7 @@ * it is recommended that the instance be discarded if an exception is thrown. * * An example usage which meets this requirement would be: <code><pre> - * final IoFuture<Map<Foo, Bar>> futureFooBarMap = getFutureMap(executor, new HashMap<Foo, Bar>(), fooBarSource); + * final IoFuture<? extends Map<Foo, Bar>> futureFooBarMap = getFutureMap(executor, new HashMap<Foo, Bar>(), fooBarSource); * </pre></code> * * @param newMap the new map to populate @@ -197,7 +197,7 @@ * @param <V> the map value type * @return the new map, populated */ - public static <M extends Map<K, V>, K, V> IoFuture<M> getFutureMap(Executor executor, final M newMap, final ObjectSource<Pair<K, V>> objectSource) { + public static <M extends Map<K, V>, K, V> IoFuture<? extends M> getFutureMap(Executor executor, final M newMap, final ObjectSource<Pair<K, V>> objectSource) { final FutureResult<M> futureResult = new FutureResult<M>(executor); futureResult.addCancelHandler(new Cancellable() { public Cancellable cancel() {

14 years, 5 months

1
0
0 / 0

Reminder: Fidel Christian invited you to join...

by jboss-remoting-commits＠lists.jboss.org

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5580 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2009-11-03 21:11:18 -0500 (Tue, 03 Nov 2009) New Revision: 5580 Added: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java Log: Interlude: beef up streams convenience methods Added: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java (rev 0) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java 2009-11-04 02:11:18 UTC (rev 5580) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, JBoss Inc., and individual contributors as indicated + * by the @authors tag. 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.remoting3.stream; + +import java.io.Serializable; + +/** + * A serializable pair of values. + * + * @param <A> the type of the first value + * @param the type of the second value + */ +public final class Pair<A, B> implements Serializable { + + private static final long serialVersionUID = -1812076980977921946L; + + private final A a; + private final B b; + + /** + * Construct a new instance. + * + * @param a the first value + * @param b the second value + */ + public Pair(final A a, final B b) { + this.a = a; + this.b = b; + } + + /** + * Get the first value. + * + * @return the first value + */ + public A getA() { + return a; + } + + /** + * Get the second value. + * + * @return the second value + */ + public B getB() { + return b; + } +} Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java 2009-11-03 18:45:12 UTC (rev 5579) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java 2009-11-04 02:11:18 UTC (rev 5580) @@ -6,6 +6,12 @@ import java.util.Enumeration; import java.util.Iterator; import java.util.NoSuchElementException; +import java.util.Map; +import java.util.concurrent.Executor; +import org.jboss.xnio.IoFuture; +import org.jboss.xnio.FutureResult; +import org.jboss.xnio.Cancellable; +import org.jboss.xnio.IoUtils; /** * Handy utility methods for stream types. @@ -37,6 +43,193 @@ } /** + * Get an object source which reads from a collection. + * + * @param collection the collection to read from + * @param <T> the collection member type + * @return an object source + */ + public static <T> ObjectSource<T> getCollectionObjectSource(Collection<T> collection) { + return getIteratorObjectSource(collection.iterator()); + } + + /** + * Get an object sink that appends to a map. + * + * @param target the target map + * @param <K> the key type + * @param <V> the value type + * @return an object sink + */ + public static <K, V> ObjectSink<Pair<K, V>> getMapObjectSink(Map<K, V> target) { + return new MapObjectSink<K, V>(target); + } + + /** + * Get an object source that reads from an iterator over map entries. + * + * @param iterator the iterator object type + * @param <K> the key type + * @param <V> the value type + * @return an object source + */ + public static <K, V> ObjectSource<Pair<K, V>> getMapEntryIteratorObjectSource(Iterator<Map.Entry<K, V>> iterator) { + return new MapEntryIteratorObjectSource<K, V>(iterator); + } + + /** + * Get an object source that reads from a map. + * + * @param map the map + * @param <K> the key type + * @param <V> the value type + * @return an object source + */ + public static <K, V> ObjectSource<Pair<K, V>> getMapObjectSource(Map<K, V> map) { + return getMapEntryIteratorObjectSource(map.entrySet().iterator()); + } + + /** + * Populate a new collection from an object source. Since the collection may be only partially populated on error, + * it is recommended that the instance be discarded if an exception is thrown. + * + * An example usage which meets this requirement would be: <code><pre> + * final List<Foo> fooList = getCollection(new ArrayList<Foo>(), fooSource); + * </pre></code> + * + * @param newCollection the new collection to populate + * @param objectSource the object source to fill the collection from + * @param <C> the collection type + * @param <T> the collection value type + * @return the new collection, populated + * @throws IOException if an error occurs + */ + public static <C extends Collection<T>, T> C getCollection(C newCollection, ObjectSource<T> objectSource) throws IOException { + while (objectSource.hasNext()) { + newCollection.add(objectSource.next()); + } + return newCollection; + } + + /** + * Populate a new map from an object source. Since the map may be only partially populated on error, + * it is recommended that the instance be discarded if an exception is thrown. + * + * An example usage which meets this requirement would be: <code><pre> + * final Map<Foo, Bar> fooBarMap = getMap(new HashMap<Foo, Bar>(), fooBarSource); + * </pre></code> + * + * @param newMap the new map to populate + * @param objectSource the object source to fill the map from + * @param <M> the map type + * @param <K> the map key type + * @param <V> the map value type + * @return the new map, populated + * @throws IOException if an error occurs + */ + public static <M extends Map<K, V>, K, V> M getMap(M newMap, ObjectSource<Pair<K, V>> objectSource) throws IOException { + while (objectSource.hasNext()) { + final Pair<K, V> pair = objectSource.next(); + newMap.put(pair.getA(), pair.getB()); + } + return newMap; + } + + /** + * Populate a new collection from an object source asynchronously. Since the collection may be only partially populated on error, + * it is recommended that the instance be discarded if an exception is thrown. + * + * An example usage which meets this requirement would be: <code><pre> + * final IoFuture<List<Foo>> futureFooList = getFutureCollection(executor, new ArrayList<Foo>(), fooSource); + * </pre></code> + * + * @param executor the executor in which to run asynchronous tasks + * @param newCollection the new collection to populate + * @param objectSource the object source to fill the collection from + * @param <C> the collection type + * @param <T> the collection value type + * @return the new future collection, populated + * @throws IOException if an error occurs + */ + public static <C extends Collection<T>, T> IoFuture<C> getFutureCollection(Executor executor, final C newCollection, final ObjectSource<T> objectSource) { + final FutureResult<C> futureResult = new FutureResult<C>(executor); + futureResult.addCancelHandler(new Cancellable() { + public Cancellable cancel() { + if (futureResult.setCancelled()) { + IoUtils.safeClose(objectSource); + } + return this; + } + }); + try { + executor.execute(new Runnable() { + public void run() { + try { + while (objectSource.hasNext()) { + newCollection.add(objectSource.next()); + } + futureResult.setResult(newCollection); + } catch (IOException e) { + futureResult.setException(e); + } + } + }); + } catch (RuntimeException e) { + final IOException ioe = new IOException("Failed to initiate asynchronous population of a collection"); + ioe.initCause(e); + futureResult.setException(ioe); + } + return futureResult.getIoFuture(); + } + + /** + * Populate a new map from an object source asynchronously. Since the map may be only partially populated on error, + * it is recommended that the instance be discarded if an exception is thrown. + * + * An example usage which meets this requirement would be: <code><pre> + * final IoFuture<Map<Foo, Bar>> futureFooBarMap = getFutureMap(executor, new HashMap<Foo, Bar>(), fooBarSource); + * </pre></code> + * + * @param newMap the new map to populate + * @param objectSource the object source to fill the map from + * @param <M> the map type + * @param <K> the map key type + * @param <V> the map value type + * @return the new map, populated + */ + public static <M extends Map<K, V>, K, V> IoFuture<M> getFutureMap(Executor executor, final M newMap, final ObjectSource<Pair<K, V>> objectSource) { + final FutureResult<M> futureResult = new FutureResult<M>(executor); + futureResult.addCancelHandler(new Cancellable() { + public Cancellable cancel() { + if (futureResult.setCancelled()) { + IoUtils.safeClose(objectSource); + } + return this; + } + }); + try { + executor.execute(new Runnable() { + public void run() { + try { + while (objectSource.hasNext()) { + final Pair<K, V> pair = objectSource.next(); + newMap.put(pair.getA(), pair.getB()); + } + futureResult.setResult(newMap); + } catch (IOException e) { + futureResult.setException(e); + } + } + }); + } catch (RuntimeException e) { + final IOException ioe = new IOException("Failed to initiate asynchronous population of a collection"); + ioe.initCause(e); + futureResult.setException(ioe); + } + return futureResult.getIoFuture(); + } + + /** * Get an object source that reads from an enumeration. * * @param <T> the enumeration object type @@ -50,7 +243,7 @@ private static final class CollectionObjectSink<T> implements ObjectSink<T> { private final Collection<T> target; - public CollectionObjectSink(final Collection<T> target) { + private CollectionObjectSink(final Collection<T> target) { this.target = target; } @@ -68,7 +261,7 @@ private static final class IteratorObjectSource<T> implements ObjectSource<T> { private final Iterator<T> src; - public IteratorObjectSource(final Iterator<T> src) { + private IteratorObjectSource(final Iterator<T> src) { this.src = src; } @@ -94,7 +287,7 @@ private static final class EnumerationObjectSource<T> implements ObjectSource<T> { private final Enumeration<T> src; - public EnumerationObjectSource(final Enumeration<T> src) { + private EnumerationObjectSource(final Enumeration<T> src) { this.src = src; } @@ -116,4 +309,44 @@ // empty } } + + private static final class MapObjectSink<K, V> implements ObjectSink<Pair<K, V>> { + + private final Map<K, V> target; + + private MapObjectSink(final Map<K, V> target) { + this.target = target; + } + + public void accept(final Pair<K, V> instance) throws IOException { + target.put(instance.getA(), instance.getB()); + } + + public void flush() throws IOException { + // empty + } + + public void close() throws IOException { + // empty + } + } + + private static final class MapEntryIteratorObjectSource<K, V> implements ObjectSource<Pair<K, V>> { + private final Iterator<Map.Entry<K, V>> source; + + private MapEntryIteratorObjectSource(final Iterator<Map.Entry<K, V>> source) { + this.source = source; + } + + public boolean hasNext() throws IOException { + return false; + } + + public Pair<K, V> next() throws NoSuchElementException, IOException { + return null; + } + + public void close() throws IOException { + } + } }

14 years, 5 months

1
0
0 / 0

Reminder: Angelo Barrett invited you to join...

by jboss-remoting-commits＠lists.jboss.org

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5579 - in remoting3/trunk: samples and 1 other directory.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2009-11-03 13:45:12 -0500 (Tue, 03 Nov 2009) New Revision: 5579 Added: remoting3/trunk/samples/pom.xml Modified: remoting3/trunk/pom.xml Log: Add samples POM, fix parent POM to exclude parent artifact Modified: remoting3/trunk/pom.xml =================================================================== --- remoting3/trunk/pom.xml 2009-11-02 22:31:39 UTC (rev 5578) +++ remoting3/trunk/pom.xml 2009-11-03 18:45:12 UTC (rev 5579) @@ -36,5 +36,18 @@ <modules> <module>jboss-remoting</module> <module>taglet</module> + <module>samples</module> </modules> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> </project> Added: remoting3/trunk/samples/pom.xml =================================================================== --- remoting3/trunk/samples/pom.xml (rev 0) +++ remoting3/trunk/samples/pom.xml 2009-11-03 18:45:12 UTC (rev 5579) @@ -0,0 +1,71 @@ + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Remoting Samples</name> + <description>JBoss Remoting Samples</description> + + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting-samples</artifactId> + <packaging>jar</packaging> + <version>3.1.0.CR1</version> + <dependencies> + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + <version>3.1.0.CR1</version> + <scope>compile</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + <distributionManagement> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Maven2 Repository</name> + <url>${repository.url}</url> + </repository> + </distributionManagement> +</project>

14 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits November 2009