You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by am...@apache.org on 2020/10/21 07:19:37 UTC
[aries-rsa] 03/03: Remove double spaces
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 a0aa2beb506631e79ede3695a8446d21e76d4d7c
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Sun Mar 8 17:39:38 2020 +0200
Remove double spaces
---
Readme.md | 4 ++--
.../zookeeper/client/ZookeeperEndpointRepository.java | 2 +-
.../rsa/provider/fastbin/tcp/ServerInvokerImpl.java | 2 +-
.../aries/rsa/provider/fastbin/FutureInvocationTest.java | 4 ++--
.../aries/rsa/provider/fastbin/InvocationTest.java | 16 ++++++++--------
.../aries/rsa/provider/fastbin/TransportFailureTest.java | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Readme.md b/Readme.md
index 84b02cf..3179c33 100644
--- a/Readme.md
+++ b/Readme.md
@@ -6,7 +6,7 @@
The [Aries Remote Service Admin (RSA)](http://aries.apache.org/modules/rsa.html) project is the reference implementation of [Remote Services](https://osgi.org/specification/osgi.cmpn/7.0.0/service.remoteservices.html
) and [Remote Service Admin](https://osgi.org/specification/osgi.cmpn/7.0.0/service.remoteserviceadmin.html) from the OSGi R7 specs.
-It allows to transparently use OSGi services for remote communication. OSGi services can be marked for export by adding a service property service.exported.interfaces=*. Various other properties can be used to customize how the service is to be exposed.
+It allows to transparently use OSGi services for remote communication. OSGi services can be marked for export by adding a service property service.exported.interfaces=*. Various other properties can be used to customize how the service is to be exposed.
## Distribution Provider
@@ -42,4 +42,4 @@ The source zip needs to be copied to the [Apache release svn](https://dist.apach
### Add checksum
- gpg --print-md SHA512 <filename> > <filename>.sha512
+ gpg --print-md SHA512 <filename> > <filename>.sha512
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 a447246..1bba003 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
@@ -110,7 +110,7 @@ public class ZookeeperEndpointRepository {
LOG.error(msg, ex);
}
- private void add(EndpointDescription endpoint) throws KeeperException, InterruptedException {
+ private void add(EndpointDescription endpoint) throws KeeperException, InterruptedException {
String path = getZooKeeperPath(endpoint.getId());
LOG.info("Exporting path: {}, Endpoint: {}", path, endpoint);
createBasePath();
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 de4dd04..b540c94 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
@@ -107,7 +107,7 @@ public class ServerInvokerImpl implements ServerInvoker, Dispatched {
String[] parts = data.utf8().toString().split(",");
String name = parts[0];
Class[] params = new Class[parts.length-1];
- for( int i=0; i < params.length; i++) {
+ for( int i=0; i < params.length; i++) {
params[i] = decodeClass(parts[i+1]);
}
Method method = clazz.getMethod(name, params);
diff --git a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/FutureInvocationTest.java b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/FutureInvocationTest.java
index d32cf60..2622a81 100644
--- a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/FutureInvocationTest.java
+++ b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/FutureInvocationTest.java
@@ -157,7 +157,7 @@ public class FutureInvocationTest {
public CompletableFuture<String> exceptionAsync() throws IOException {
CompletableFuture f = CompletableFuture.supplyAsync(() -> {
sleep(500);
- return "Hello";
+ return "Hello";
});
f.completeExceptionally(new IOException("test"));
return f;
@@ -176,7 +176,7 @@ public class FutureInvocationTest {
public Future<String> helloAsyncStandardFuture() {
return Executors.newSingleThreadExecutor().submit(() -> {
sleep(500);
- return "Hello";
+ return "Hello";
});
}
}
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 9c42149..c6fe6aa 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
@@ -80,7 +80,7 @@ public class InvocationTest {
}, HelloImpl.class.getClassLoader());
InvocationHandler handler = client.getProxy(server.getConnectAddress(), "service-id", HelloImpl.class.getClassLoader());
- Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
+ Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
assertEquals("Hello Fabric!", hello.hello("Fabric"));
assertEquals("Hello World!", hello.helloworld());
@@ -138,7 +138,7 @@ public class InvocationTest {
}, Hello2Impl.class.getClassLoader());
InvocationHandler handler = client.getProxy(server.getConnectAddress(), "service-id-broken", HelloImpl.class.getClassLoader());
- Hello2 hello = (Hello2) Proxy.newProxyInstance(Hello2Impl.class.getClassLoader(), new Class[] { Hello2.class }, handler);
+ Hello2 hello = (Hello2) Proxy.newProxyInstance(Hello2Impl.class.getClassLoader(), new Class[] { Hello2.class }, handler);
try{
hello.hello("Fabric");
@@ -183,7 +183,7 @@ public class InvocationTest {
}, HelloImpl.class.getClassLoader());
InvocationHandler handler = client.getProxy(server.getConnectAddress(), "service-id", HelloImpl.class.getClassLoader());
- Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
+ Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
assertNotEquals("Hashcode should be handled by the proxy and not be a remote call", -7, hello.hashCode());
assertFalse("equals should be handled by the proxy and not be a remote call", hello.equals(serviceImpl));
assertTrue("the proxy must equal itself", hello.equals(hello));
@@ -219,7 +219,7 @@ public class InvocationTest {
}, HelloImpl.class.getClassLoader());
InvocationHandler handler = client.getProxy(server.getConnectAddress(), "service-id", HelloImpl.class.getClassLoader());
- Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
+ Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
char[] chars = new char[65*1024];
String payload = new String(chars);
@@ -268,7 +268,7 @@ public class InvocationTest {
}, HelloImpl.class.getClassLoader());
InvocationHandler handler = client.getProxy(server.getConnectAddress(), "service-id", HelloImpl.class.getClassLoader());
- final Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
+ final Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
final AtomicInteger requests = new AtomicInteger(0);
final AtomicInteger responses = new AtomicInteger(0);
@@ -336,7 +336,7 @@ public class InvocationTest {
}, HelloImpl.class.getClassLoader());
InvocationHandler handler = client.getProxy(server.getConnectAddress(), "service-id", HelloImpl.class.getClassLoader());
- Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
+ Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
char[] chars = new char[65*1024];
String payload = new String(chars);
@@ -373,7 +373,7 @@ public class InvocationTest {
InvocationHandler handler = client.getProxy(server.getConnectAddress(), "service-id", HelloImpl.class.getClassLoader());
- final Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
+ final Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
assertEquals("Hello World!", hello.helloworld());
@@ -525,7 +525,7 @@ public class InvocationTest {
InvocationHandler handler = client.getProxy(server.getConnectAddress(), "service-id", HelloImpl.class.getClassLoader());
- final Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
+ final Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[] { Hello.class }, handler);
final AtomicInteger requests = new AtomicInteger(0);
final AtomicInteger failures = new AtomicInteger(0);
diff --git a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/TransportFailureTest.java b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/TransportFailureTest.java
index ae8dd5d..c33f285 100644
--- a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/TransportFailureTest.java
+++ b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/TransportFailureTest.java
@@ -69,7 +69,7 @@ public class TransportFailureTest {
}, HelloImpl.class.getClassLoader());
InvocationHandler handler = client.getProxy(server.getConnectAddress(), "service-id", HelloImpl.class.getClassLoader());
- Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[]{Hello.class}, handler);
+ Hello hello = (Hello) Proxy.newProxyInstance(HelloImpl.class.getClassLoader(), new Class[]{Hello.class}, handler);
AsyncCallbackFuture<String> future1 = new AsyncCallbackFuture<>();
hello.hello("Guillaume", future1);