This is an automated email from the ASF dual-hosted git repository. amichai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit cc1740bcc8526bea918fe9bb886b9e2e2761ecb1 Author: Amichai Rothman <[email protected]> AuthorDate: Mon Jun 3 14:35:03 2024 +0300 Fix typos in comments --- .../apache/aries/rsa/discovery/endpoint/PropertiesMapper.java | 2 +- .../org/apache/aries/rsa/discovery/local/LocalDiscovery.java | 2 +- .../zookeeper/client/ZookeeperEndpointRepository.java | 2 +- provider/fastbin/Readme.md | 4 ++-- provider/fastbin/pom.xml | 4 ++-- .../provider/fastbin/api/ProtobufSerializationStrategy.java | 2 +- .../apache/aries/rsa/provider/fastbin/io/ProtocolCodec.java | 4 ++-- .../java/org/apache/aries/rsa/provider/fastbin/io/Service.java | 4 ++-- .../org/apache/aries/rsa/provider/fastbin/io/Transport.java | 2 +- .../apache/aries/rsa/provider/fastbin/io/TransportServer.java | 2 +- .../rsa/provider/fastbin/tcp/AbstractInvocationStrategy.java | 4 ++-- .../rsa/provider/fastbin/tcp/BlockingInvocationStrategy.java | 2 +- .../aries/rsa/provider/fastbin/tcp/ClientInvokerImpl.java | 4 ++-- .../aries/rsa/provider/fastbin/tcp/LengthPrefixedCodec.java | 10 +++++----- .../aries/rsa/provider/fastbin/tcp/ServerInvokerImpl.java | 2 +- .../apache/aries/rsa/provider/fastbin/tcp/TcpTransport.java | 10 +++++----- .../aries/rsa/provider/fastbin/tcp/TcpTransportServer.java | 4 ++-- .../aries/rsa/provider/fastbin/util/IntrospectionSupport.java | 2 +- .../apache/aries/rsa/provider/fastbin/util/UuidGenerator.java | 2 +- .../org/apache/aries/rsa/provider/fastbin/InvocationTest.java | 2 +- .../main/java/org/apache/aries/rsa/provider/tcp/TcpServer.java | 2 +- .../java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java | 2 +- .../org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java | 4 ++-- spi/src/main/java/org/apache/aries/rsa/spi/ExportPolicy.java | 2 +- topology-manager/Readme.md | 2 +- .../rsa/topologymanager/exporter/TopologyManagerExport.java | 2 +- .../apache/aries/rsa/topologymanager/importer/local/Readme.md | 2 +- 27 files changed, 43 insertions(+), 43 deletions(-) diff --git a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java index 1d5d9f33..f3fa57fd 100644 --- a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java +++ b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java @@ -267,7 +267,7 @@ class PropertiesMapper { || val instanceof Float || val instanceof Integer || val instanceof Short) { - // various numbers.. maybe "val instanceof Number"? + // various numbers... maybe "val instanceof Number"? setValueType(propEl, val); propEl.setValue(val.toString()); } else { diff --git a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/local/LocalDiscovery.java b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/local/LocalDiscovery.java index 03350f68..5df81bd8 100644 --- a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/local/LocalDiscovery.java +++ b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/local/LocalDiscovery.java @@ -104,7 +104,7 @@ public class LocalDiscovery implements BundleListener { /** * If the tracker was removed or the scope was changed this doesn't require - * additional callbacks on the tracker. Its the responsibility of the tracker + * additional callbacks on the tracker. It's the responsibility of the tracker * itself to clean up any orphans. See Remote Service Admin spec 122.6.3 * @param endpointListener */ diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointRepository.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointRepository.java index 1bba0035..4c01d0ff 100644 --- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointRepository.java +++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointRepository.java @@ -156,7 +156,7 @@ public class ZookeeperEndpointRepository { } catch (NodeExistsException nee) { // this sometimes happens after a ZooKeeper node dies and the ephemeral node // that belonged to the old session was not yet deleted. We need to make our - // session the owner of the node so it won't get deleted automatically - + // session the owner of the node, so it won't get deleted automatically - // we do this by deleting and recreating it ourselves. LOG.info("node for endpoint already exists, recreating: {}", fullPath); try { diff --git a/provider/fastbin/Readme.md b/provider/fastbin/Readme.md index a47e1849..748772f1 100644 --- a/provider/fastbin/Readme.md +++ b/provider/fastbin/Readme.md @@ -2,7 +2,7 @@ Allows transparent remoting using Java Serialization over TCP. The fastbin provider uses a pool of nio tcp channels to transport data. It can use either java object serialization or protobuf to serialize parameters and return values. -Sync remote calls have a default timeout of 5 minutes. For long running operations async calls should be used. This is indicated by having either +Sync remote calls have a default timeout of 5 minutes. For long-running operations async calls should be used. This is indicated by having either * `Future` * `CompletableFuture` @@ -12,7 +12,7 @@ as the return value of the remote method. The client will receive a proxy of tha ## Streaming Data -When large amount of data (e.g. files) need to be transferred remotely it is not advisable to use large byte arrays as this will allocate a lot of memory. Instead the fastbin transport allows to +When large amount of data (e.g. files) need to be transferred remotely it is not advisable to use large byte arrays as this will allocate a lot of memory. Instead, the fastbin transport allows to use `InputStream` and `OutputStream` as parameter or return value. When a remote method contains such a parameter, the stream is replaced with a proxy implementation that pipes data remotely from/to the original stream. ## Transport configuration diff --git a/provider/fastbin/pom.xml b/provider/fastbin/pom.xml index 363910ae..588292e4 100644 --- a/provider/fastbin/pom.xml +++ b/provider/fastbin/pom.xml @@ -50,13 +50,13 @@ <groupId>org.fusesource.hawtbuf</groupId> <artifactId>hawtbuf</artifactId> </dependency> - <!-- this is only needed you you want to use the ProtobufSerializationStrategy --> + <!-- this is only needed if you want to use the ProtobufSerializationStrategy --> <dependency> <groupId>org.fusesource.hawtbuf</groupId> <artifactId>hawtbuf-proto</artifactId> <optional>true</optional> </dependency> - <!-- this is only needed you you want to use the Promise for remote services --> + <!-- this is only needed if you want to use the Promise for remote services --> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.promise</artifactId> diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/api/ProtobufSerializationStrategy.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/api/ProtobufSerializationStrategy.java index 65d69a66..edb07a5b 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/api/ProtobufSerializationStrategy.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/api/ProtobufSerializationStrategy.java @@ -115,7 +115,7 @@ public class ProtobufSerializationStrategy implements SerializationStrategy { Constructor<?> ctr = loader.loadClass(className).getConstructor(String.class); error = (Throwable) ctr.newInstance(message); } catch (Throwable e) { - // fallback to something simple.. + // fallback to something simple... error = new RuntimeException(className+": "+message); } result.onFailure(error); diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/ProtocolCodec.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/ProtocolCodec.java index d8a01c1e..4de96c50 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/ProtocolCodec.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/ProtocolCodec.java @@ -23,7 +23,7 @@ import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; /** - * Interface to encode and decode commands in and out of a a non blocking channel. + * Interface to encode and decode commands in and out of a non-blocking channel. * */ public interface ProtocolCodec { @@ -83,7 +83,7 @@ public interface ProtocolCodec { BufferState flush() throws IOException; /** - * @return true if the codec will no accept any more writes. + * @return true if the codec will not accept any more writes. */ boolean full(); diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/Service.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/Service.java index caa7e3b8..e20da71e 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/Service.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/Service.java @@ -34,7 +34,7 @@ public interface Service { /** * Starts the service. Executes the onComplete runnable once the service has fully started up. * - * @param onComplete my be set to null if not interested in a callback. + * @param onComplete may be set to null if not interested in a callback. */ void start(Runnable onComplete) throws Exception; @@ -47,7 +47,7 @@ public interface Service { /** * Stops the service. Executes the onComplete runnable once the service has fully stopped. * - * @param onComplete my be set to null if not interested in a callback. + * @param onComplete may be set to null if not interested in a callback. */ void stop(Runnable onComplete); diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/Transport.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/Transport.java index 2164b0d5..0b33fade 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/Transport.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/Transport.java @@ -30,7 +30,7 @@ public interface Transport extends Service, Dispatched { boolean full(); /** - * A one way asynchronous send of a command. Only sent if the the transport is not full. + * A one way asynchronous send of a command. Only sent if the transport is not full. * * @param command * @return true if the command was accepted. diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/TransportServer.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/TransportServer.java index fa569875..799dd98d 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/TransportServer.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/TransportServer.java @@ -31,7 +31,7 @@ import org.fusesource.hawtdispatch.DispatchQueue; public interface TransportServer extends Service { /** - * Registers an @see TransportAcceptListener which is notified of accepted + * Registers a {@link TransportAcceptListener} which is notified of accepted * channels. * * @param acceptListener diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AbstractInvocationStrategy.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AbstractInvocationStrategy.java index f943431e..a1924c29 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AbstractInvocationStrategy.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AbstractInvocationStrategy.java @@ -120,7 +120,7 @@ public abstract class AbstractInvocationStrategy implements InvocationStrategy { } catch(Exception e) { LOGGER.warn("Initial Encoding response for method {} failed. Retrying", method, e); - // we failed to encode the response.. reposition and write that error. + // we failed to encode the response... reposition and write that error try { responseStream.position(pos); serializationStrategy.encodeResponse(loader, null, null, new ServiceException(e.toString()), responseStream); @@ -175,7 +175,7 @@ public abstract class AbstractInvocationStrategy implements InvocationStrategy { try { serializationStrategy.encodeResponse(loader, resultType, value, error, responseStream); } catch (Exception e) { - // we failed to encode the response.. reposition and write that error. + // we failed to encode the response... reposition and write that error try { responseStream.position(pos); serializationStrategy.encodeResponse(loader, resultType, value, new ServiceException(e.toString()), responseStream); diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/BlockingInvocationStrategy.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/BlockingInvocationStrategy.java index 32d27901..1c049cd9 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/BlockingInvocationStrategy.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/BlockingInvocationStrategy.java @@ -116,7 +116,7 @@ public class BlockingInvocationStrategy extends AbstractInvocationStrategy { } catch(Exception e) { LOGGER.warn("Initial Encoding response for method {} failed. Retrying", method, e); - // we failed to encode the response.. reposition and write that error. + // we failed to encode the response... reposition and write that error. try { responseStream.position(pos); serializationStrategy.encodeResponse(loader, method.getReturnType(), null, new RemoteException(e.toString()), responseStream); diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/ClientInvokerImpl.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/ClientInvokerImpl.java index 2d8e67a4..c3b8a890 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/ClientInvokerImpl.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/ClientInvokerImpl.java @@ -333,9 +333,9 @@ public class ClientInvokerImpl implements ClientInvoker, Dispatched { public InvokerTransportPool(String uri, DispatchQueue queue) { /* - * the evict time needs to be 0. Otherwise the client will + * the evict time needs to be 0. Otherwise, the client will * evict transport objects which breaks the connection for - * long running async calls. + * long-running async calls. * Since there is limit of 2 transports per uri it shouldn't be that many objects */ super(uri, queue, TransportPool.DEFAULT_POOL_SIZE, 0); diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/LengthPrefixedCodec.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/LengthPrefixedCodec.java index 89edf542..c2a2523e 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/LengthPrefixedCodec.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/LengthPrefixedCodec.java @@ -132,7 +132,7 @@ public class LengthPrefixedCodec implements ProtocolCodec { public Object read() throws IOException { while(true) { if( read_buffer.remaining()!=0 ) { - // keep reading from the channel until we fill the read buffer.. + // keep reading from the channel until we fill the read buffer int count = read_channel.read(read_buffer); if (count == -1) { throw new EOFException("Peer disconnected"); @@ -141,7 +141,7 @@ public class LengthPrefixedCodec implements ProtocolCodec { } read_counter += count; } else { - //read buffer is full.. interpret it.. + //read buffer is full... interpret it read_buffer.flip(); if( read_buffer.capacity() == 4 ) { @@ -154,18 +154,18 @@ public class LengthPrefixedCodec implements ProtocolCodec { throw new ProtocolException("Packet length was declared as " + size + " but at most " + MAX_PACKET_SIZE + "is allowed. You can configure this limit with the system property aries.fastbin.max.packet.bytes"); } if( size == 4 ) { - // weird.. empty frame.. guess it could happen. + // weird... empty frame... guess it could happen. Buffer rc = new Buffer(read_buffer); read_buffer = ByteBuffer.allocate(4); return rc; } else { - // Resize to the right size.. this resumes the reads.. + // Resize to the right size... this resumes the reads ByteBuffer next = ByteBuffer.allocate(size); next.putInt(size); read_buffer = next; } } else { - // finish loading the rest of the buffer.. + // finish loading the rest of the buffer Buffer rc = new Buffer(read_buffer); read_buffer = ByteBuffer.allocate(4); return rc; diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/ServerInvokerImpl.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/ServerInvokerImpl.java index cc7be2bf..d9377e75 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/ServerInvokerImpl.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/ServerInvokerImpl.java @@ -348,7 +348,7 @@ public class ServerInvokerImpl implements ServerInvoker, Dispatched { throw new RuntimeException(e); } - // Lets decode the remaining args on the target's executor + // Let's decode the remaining args on the target's executor // to take cpu load off the ClassLoader loader = holder==null ? getClass().getClassLoader() : holder.loader; diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransport.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransport.java index 32f69ab3..0573a2a9 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransport.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransport.java @@ -196,7 +196,7 @@ public class TcpTransport implements Transport { try { if (socketState.isConnecting()) { trace("connecting..."); - // this allows the connect to complete.. + // this allows the connect to complete... readSource = Dispatch.createSource(channel, SelectionKey.OP_CONNECT, dispatchQueue); readSource.setEventHandler(new Runnable() { public void run() { @@ -381,7 +381,7 @@ public class TcpTransport implements Transport { } try { long initial = codec.getReadCounter(); - // Only process up to 64k worth of data at a time so we can give + // Only process up to 64k worth of data at a time, so we can give // other connections a chance to process their requests. while( codec.getReadCounter() - initial < 1024 * 64 ) { Object command = codec.read(); @@ -486,7 +486,7 @@ public class TcpTransport implements Transport { /** * Sets whether 'localhost' or the actual local host name should be used to - * make local connections. On some operating systems such as Macs its not + * make local connections. On some operating systems such as Macs it's not * possible to connect as the local host name so localhost is better. */ public void setUseLocalHost(boolean useLocalHost) { @@ -588,7 +588,7 @@ public class TcpTransport implements Transport { if( reduction!=0 ) { if( dst.remaining() == 0 ) { // we need to suspend the read now until we get - // a new allowance.. + // a new allowance... readSource.suspend(); read_suspended = true; } @@ -621,7 +621,7 @@ public class TcpTransport implements Transport { if( reduction!=0 ) { if( src.remaining() == 0 ) { // we need to suspend the read now until we get - // a new allowance.. + // a new allowance... write_suspended = true; suspendWrite(); } diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransportServer.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransportServer.java index cb8853ee..a95adad1 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransportServer.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransportServer.java @@ -146,7 +146,7 @@ public class TcpTransportServer implements TransportServer { protected String resolveHostName() { String result; if (bindAddress.getAddress().isAnyLocalAddress()) { - // make it more human readable and useful, an alternative to 0.0.0.0 + // make it more human-readable and useful, an alternative to 0.0.0.0 try { result = InetAddress.getLocalHost().getCanonicalHostName(); } catch (UnknownHostException e) { @@ -191,7 +191,7 @@ public class TcpTransportServer implements TransportServer { protected final void handleSocket(SocketChannel socket) throws Exception { HashMap<String, Object> options = new HashMap<>(); // options.put("maxInactivityDuration", Long.valueOf(maxInactivityDuration)); -// options.put("maxInactivityDurationInitalDelay", Long.valueOf(maxInactivityDurationInitalDelay)); +// options.put("maxInactivityDurationInitialDelay", Long.valueOf(maxInactivityDurationInitialDelay)); // options.put("trace", Boolean.valueOf(trace)); // options.put("soTimeout", Integer.valueOf(soTimeout)); // options.put("socketBufferSize", Integer.valueOf(socketBufferSize)); diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/IntrospectionSupport.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/IntrospectionSupport.java index 5ef8efa9..f29e0c3e 100755 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/IntrospectionSupport.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/IntrospectionSupport.java @@ -170,7 +170,7 @@ public final class IntrospectionSupport { return false; } - // If the type is null or it matches the needed type, just use the + // If the type is null, or it matches the needed type, just use the // value directly if (value == null || value.getClass() == setter.getParameterTypes()[0]) { setter.invoke(target, value); diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/UuidGenerator.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/UuidGenerator.java index 5ec3a97d..7db7927b 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/UuidGenerator.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/UuidGenerator.java @@ -90,7 +90,7 @@ public class UuidGenerator { } /** - * As we have to find the hostname as a side-affect of generating a unique + * As we have to find the hostname as a side effect of generating a unique * stub, we allow its easy retrieval here * * @return the local host name diff --git a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/InvocationTest.java b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/InvocationTest.java index 7e549b6a..3a62c620 100644 --- a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/InvocationTest.java +++ b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/InvocationTest.java @@ -85,7 +85,7 @@ public class InvocationTest { assertEquals("Hello Fabric!", hello.hello("Fabric")); assertEquals("Hello World!", hello.helloworld()); - // Verification the we can pick the right overloaded method even if using a mixure + // Verification that we can pick the right overloaded method even if using a mix // of primitives / objects and array dimensions. assertEquals('a', hello.mix(0)); assertEquals('b', hello.mix(new int[]{0})); diff --git a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpServer.java b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpServer.java index abce724e..c5657ce5 100644 --- a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpServer.java +++ b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpServer.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * A server listening on a single TCP port, which accepts connections - * and dispatches method invocation requests to one or more MethodInovkers + * and dispatches method invocation requests to one or more MethodInvokers * (according to the target endpoint ID). */ public class TcpServer implements Closeable, Runnable { diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java index 9fd7d86d..bb72ee03 100644 --- a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java +++ b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java @@ -99,7 +99,7 @@ public class RemoteServiceAdminCore implements RemoteServiceAdmin { createServiceListener(); } - // listen for exported services being unregistered so we can close the export + // listen for exported services being unregistered, so we can close the export protected void createServiceListener() { this.exportedServiceListener = new ServiceListener() { public void serviceChanged(ServiceEvent event) { diff --git a/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java b/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java index aff96b8a..22aca0a8 100644 --- a/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java +++ b/rsa/src/test/java/org/apache/aries/rsa/core/RemoteServiceAdminCoreTest.java @@ -158,7 +158,7 @@ public class RemoteServiceAdminCoreTest { assertEquals(1, rsaCore.getImportedEndpoints().size()); - // lets import the same endpoint once more -> should get a copy of the ImportRegistration + // let's import the same endpoint once more -> should get a copy of the ImportRegistration ImportRegistration ireg2 = rsaCore.importService(endpoint2); assertNotNull(ireg2); assertEquals(2, rsaCore.getImportedEndpoints().size()); @@ -201,7 +201,7 @@ public class RemoteServiceAdminCoreTest { assertNotNull(ireg); assertEquals(1, rsaCore.getImportedEndpoints().size()); - // lets import the same endpoint once more -> should get a copy of the ImportRegistration + // let's import the same endpoint once more -> should get a copy of the ImportRegistration ImportRegistration ireg2 = rsaCore.importService(endpoint); assertNotNull(ireg2); assertEquals(2, rsaCore.getImportedEndpoints().size()); diff --git a/spi/src/main/java/org/apache/aries/rsa/spi/ExportPolicy.java b/spi/src/main/java/org/apache/aries/rsa/spi/ExportPolicy.java index 2d070bde..17fd543a 100644 --- a/spi/src/main/java/org/apache/aries/rsa/spi/ExportPolicy.java +++ b/spi/src/main/java/org/apache/aries/rsa/spi/ExportPolicy.java @@ -36,7 +36,7 @@ public interface ExportPolicy { * Allows to supply additional properties for a service that are then * given to RemoteServiceAdmin. The service will be exported * if the original service or the additional properties contain the - * non empty property service.exported.interfaces. + * non-empty property service.exported.interfaces. * * @param sref service to export * @return additional properties for exported Service (must not be null) diff --git a/topology-manager/Readme.md b/topology-manager/Readme.md index b4fb2c46..0bcb75b1 100644 --- a/topology-manager/Readme.md +++ b/topology-manager/Readme.md @@ -11,7 +11,7 @@ with matching remote Endpoints. ## ExportPolicy This behaviour can be customized by exposing a service implementing the [ExportPolicy interface](https://github.com/apache/aries-rsa/blob/master/spi/src/main/java/org/apache/aries/rsa/spi/ExportPolicy.java). -It can be used to implement system wide governance rules. +It can be used to implement system-wide governance rules. Some examples what could be done: diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java index dac5238b..2ae744d0 100644 --- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java +++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java @@ -81,7 +81,7 @@ public class TopologyManagerExport implements ServiceListener { } } - // track all service registrations so we can export any services that are configured to be exported + // track all service registrations, so we can export any services that are configured to be exported // ServiceListener events may be delivered out of order, concurrently, re-entrant, etc. (see spec or docs) public void serviceChanged(ServiceEvent event) { ServiceReference<?> sref = event.getServiceReference(); diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/Readme.md b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/Readme.md index 0c031020..ba038478 100644 --- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/Readme.md +++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/Readme.md @@ -17,5 +17,5 @@ under the License. --> Takes care of tracking local demand for services by using a ListenerHook and FindHook. -Manages the scope of the EndpointLister that is used for importing external services so it matches the local service +Manages the scope of the EndpointLister that is used for importing external services, so it matches the local service demand.
