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 f4359f5aeabe48220de7a4cde82ee705b1540c3d Author: Amichai Rothman <[email protected]> AuthorDate: Wed Nov 13 11:35:47 2019 +0200 Little refactorings --- .../aries/rsa/discovery/config/ConfigDiscovery.java | 6 +----- .../apache/aries/rsa/discovery/local/LocalDiscovery.java | 6 +----- .../rsa/discovery/endpoint/PropertiesMapperTest.java | 2 +- .../aries/rsa/discovery/local/LocalDiscoveryTest.java | 2 +- .../zookeeper/client/ZookeeperEndpointRepository.java | 4 ++-- .../rsa/discovery/zookeeper/ZookeeperDiscoveryTest.java | 3 +-- .../aries/rsa/itests/felix/tcp/TestDiscoveryImport.java | 3 +-- .../apache/aries/rsa/provider/fastbin/BaseActivator.java | 1 - .../aries/rsa/provider/fastbin/FastBinProvider.java | 4 +--- .../rsa/provider/fastbin/streams/OutputStreamProxy.java | 2 +- .../rsa/provider/fastbin/streams/StreamProviderImpl.java | 3 +-- .../provider/fastbin/tcp/AbstractInvocationStrategy.java | 2 +- .../provider/fastbin/tcp/AsyncInvocationStrategy.java | 2 +- .../rsa/provider/fastbin/tcp/ClientInvokerImpl.java | 5 ++--- .../aries/rsa/provider/fastbin/tcp/InvocationType.java | 2 +- .../rsa/provider/fastbin/tcp/ServerInvokerImpl.java | 6 +++--- .../aries/rsa/provider/fastbin/tcp/TcpTransport.java | 10 +++++----- .../rsa/provider/fastbin/tcp/TcpTransportFactory.java | 6 +----- .../rsa/provider/fastbin/util/IntrospectionSupport.java | 6 +----- .../aries/rsa/provider/fastbin/util/StringSupport.java | 2 +- .../aries/rsa/provider/fastbin/util/URISupport.java | 12 +++++------- .../aries/rsa/provider/fastbin/InvocationTest.java | 16 +++++++--------- .../aries/rsa/provider/fastbin/StreamInvocationTest.java | 3 +-- .../aries/rsa/provider/fastbin/TransportFailureTest.java | 2 +- .../org/apache/aries/rsa/provider/tcp/MethodInvoker.java | 3 +-- .../org/apache/aries/rsa/provider/tcp/TCPProvider.java | 2 +- .../aries/rsa/provider/tcp/TcpProviderIntentTest.java | 2 +- .../aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java | 2 +- .../aries/rsa/core/DistributionProviderTracker.java | 3 +-- .../apache/aries/rsa/core/ClientServiceFactoryTest.java | 3 +-- .../aries/rsa/core/RemoteServiceAdminCoreTest.java | 1 - .../apache/aries/rsa/core/event/EventProducerTest.java | 4 +--- .../importer/local/EndpointListenerManager.java | 2 +- .../importer/local/EndpointListenerImplTest.java | 2 +- 34 files changed, 50 insertions(+), 84 deletions(-) diff --git a/discovery/config/src/main/java/org/apache/aries/rsa/discovery/config/ConfigDiscovery.java b/discovery/config/src/main/java/org/apache/aries/rsa/discovery/config/ConfigDiscovery.java index 014b835..84cdfc4 100644 --- a/discovery/config/src/main/java/org/apache/aries/rsa/discovery/config/ConfigDiscovery.java +++ b/discovery/config/src/main/java/org/apache/aries/rsa/discovery/config/ConfigDiscovery.java @@ -60,11 +60,7 @@ class ConfigDiscovery implements ManagedServiceFactory { synchronized (listenerToFilters) { listenerToFilters.put(endpointListener, filters); for (String filter : filters) { - Collection<EndpointEventListener> listeners = filterToListeners.get(filter); - if (listeners == null) { - listeners = new ArrayList<>(); - filterToListeners.put(filter, listeners); - } + Collection<EndpointEventListener> listeners = filterToListeners.computeIfAbsent(filter, k -> new ArrayList<>()); listeners.add(endpointListener); } } 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 a98a717..e0c4884 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 @@ -94,11 +94,7 @@ public class LocalDiscovery implements BundleListener { synchronized (listenerToFilters) { listenerToFilters.put(endpointListener, filters); for (String filter : filters) { - Collection<EndpointEventListener> listeners = filterToListeners.get(filter); - if (listeners == null) { - listeners = new ArrayList<>(); - filterToListeners.put(filter, listeners); - } + Collection<EndpointEventListener> listeners = filterToListeners.computeIfAbsent(filter, k -> new ArrayList<>()); listeners.add(endpointListener); } } diff --git a/discovery/local/src/test/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapperTest.java b/discovery/local/src/test/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapperTest.java index 9e94101..bfc638a 100644 --- a/discovery/local/src/test/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapperTest.java +++ b/discovery/local/src/test/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapperTest.java @@ -68,7 +68,7 @@ public class PropertiesMapperTest { stringSet.add("How are you?"); m.put("string-set", stringSet); - int[] intArray = new int[] {1, 2}; + int[] intArray = {1, 2}; m.put("int-array", intArray); String xml = "<xml>\n" diff --git a/discovery/local/src/test/java/org/apache/aries/rsa/discovery/local/LocalDiscoveryTest.java b/discovery/local/src/test/java/org/apache/aries/rsa/discovery/local/LocalDiscoveryTest.java index 565d75c..c18b8e0 100644 --- a/discovery/local/src/test/java/org/apache/aries/rsa/discovery/local/LocalDiscoveryTest.java +++ b/discovery/local/src/test/java/org/apache/aries/rsa/discovery/local/LocalDiscoveryTest.java @@ -62,7 +62,7 @@ public class LocalDiscoveryTest { .andReturn(Collections.enumeration(urls)); EasyMock.replay(b2); - Bundle[] bundles = new Bundle[] {b1, b2}; + Bundle[] bundles = {b1, b2}; LocalDiscovery ld = new LocalDiscovery(); ld.processExistingBundles(bundles); 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 4e2472a..9f52b6e 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 @@ -18,10 +18,10 @@ */ package org.apache.aries.rsa.discovery.zookeeper.client; -import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; import java.io.ByteArrayOutputStream; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -169,7 +169,7 @@ public class ZookeeperEndpointRepository { } private void createPath(String path) throws KeeperException, InterruptedException { - List<String> parts = asList(path.split("/")).stream() + List<String> parts = Arrays.stream(path.split("/")) .filter(this::notEmpty) .collect(toList()); StringBuilder current = new StringBuilder(); diff --git a/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperDiscoveryTest.java b/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperDiscoveryTest.java index bcb7fd0..973a571 100644 --- a/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperDiscoveryTest.java +++ b/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/ZookeeperDiscoveryTest.java @@ -166,8 +166,7 @@ public class ZookeeperDiscoveryTest { props.put(RemoteConstants.ENDPOINT_ID, "http://test.de/service1";); props.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, "my"); - EndpointDescription endpoint = new EndpointDescription(props); - return endpoint; + return new EndpointDescription(props); } private void printNodes(String path) throws KeeperException, InterruptedException { diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryImport.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryImport.java index ea80ade..f756710 100644 --- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryImport.java +++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryImport.java @@ -89,8 +89,7 @@ public class TestDiscoveryImport extends RsaTestBase { props.put(Constants.OBJECTCLASS, new String[]{"my"}); props.put(RemoteConstants.ENDPOINT_ID, "myid"); props.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, "myconfig"); - EndpointDescription endpoint = new EndpointDescription(props); - return endpoint; + return new EndpointDescription(props); } public void endpointChanged(EndpointEvent event, String filter) { diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/BaseActivator.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/BaseActivator.java index 0848161..380f0af 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/BaseActivator.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/BaseActivator.java @@ -29,7 +29,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/FastBinProvider.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/FastBinProvider.java index ed22d44..5148a95 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/FastBinProvider.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/FastBinProvider.java @@ -77,9 +77,7 @@ public class FastBinProvider implements DistributionProvider { public void close() { client.stop(); final Semaphore counter = new Semaphore(0); - server.stop(() -> { - counter.release(1); - }); + server.stop(() -> counter.release(1)); try { if(!counter.tryAcquire(1, 30, TimeUnit.SECONDS)) { LOG.warn("Server/Client failed to shut down in time. Proceeding shutdown anyway..."); diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/streams/OutputStreamProxy.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/streams/OutputStreamProxy.java index be0ef3c..e7f88c4 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/streams/OutputStreamProxy.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/streams/OutputStreamProxy.java @@ -45,7 +45,7 @@ public class OutputStreamProxy extends OutputStream implements Serializable { init(); } - private final void init() { + private void init() { buffer = new byte[StreamProviderImpl.CHUNK_SIZE]; chunkCounter = new AtomicInteger(-1); } diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/streams/StreamProviderImpl.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/streams/StreamProviderImpl.java index f1010f5..b2234eb 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/streams/StreamProviderImpl.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/streams/StreamProviderImpl.java @@ -98,8 +98,7 @@ public class StreamProviderImpl implements StreamProvider { if(closeable == null) throw new IOException("No Stream with id " + id + "available"); try { - T result = (T)closeable; - return result; + return (T)closeable; } catch (ClassCastException e) { throw new IOException("No Stream with id " + id + "available"); 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 bcc8362..2e6b149 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 @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("rawtypes") public abstract class AbstractInvocationStrategy implements InvocationStrategy { - protected final static Logger LOGGER = LoggerFactory.getLogger(AbstractInvocationStrategy.class); + protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractInvocationStrategy.class); @Override public ResponseFuture request(SerializationStrategy serializationStrategy, ClassLoader loader, Method method, Object[] args, DataByteArrayOutputStream requestStream) throws Exception { diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AsyncInvocationStrategy.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AsyncInvocationStrategy.java index 6d31b87..9d869fd 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AsyncInvocationStrategy.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AsyncInvocationStrategy.java @@ -111,7 +111,7 @@ public class AsyncInvocationStrategy extends AbstractInvocationStrategy { return (Class) t.getActualTypeArguments()[0]; } - static private Class<?>[] payloadTypes(Method method) { + private static Class<?>[] payloadTypes(Method method) { Class<?>[] types = method.getParameterTypes(); Class<?>[] new_types = new Class<?>[types.length-1]; System.arraycopy(types, 0, new_types, 0, new_types.length); 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 dfd1789..f2b3a70 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 @@ -54,7 +54,7 @@ public class ClientInvokerImpl implements ClientInvoker, Dispatched { protected static final Logger LOGGER = LoggerFactory.getLogger(ClientInvokerImpl.class); @SuppressWarnings("rawtypes") - private final static Map<Class, String> CLASS_TO_PRIMITIVE = new HashMap<>(8, 1.0F); + private static final Map<Class, String> CLASS_TO_PRIMITIVE = new HashMap<>(8, 1.0F); static { CLASS_TO_PRIMITIVE.put(boolean.class, "Z"); @@ -316,8 +316,7 @@ public class ClientInvokerImpl implements ClientInvoker, Dispatched { e = executionException.getCause(); } if (e instanceof RuntimeException) { - RuntimeException runtimeException = (RuntimeException)e; - throw runtimeException; + throw e; } Class< ? >[] exceptionTypes = method.getExceptionTypes(); for (Class< ? > exceptionType : exceptionTypes) { diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/InvocationType.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/InvocationType.java index 1da9be5..ccec3b4 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/InvocationType.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/InvocationType.java @@ -72,7 +72,7 @@ public enum InvocationType { */ private static boolean promiseAvailable; - private InvocationType(InvocationStrategy strategy) { + InvocationType(InvocationStrategy strategy) { this.strategy = strategy; } 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 e2b6a96..de4dd04 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 @@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory; public class ServerInvokerImpl implements ServerInvoker, Dispatched { protected static final Logger LOGGER = LoggerFactory.getLogger(ServerInvokerImpl.class); - static private final HashMap<String, Class> PRIMITIVE_TO_CLASS = new HashMap<>(8, 1.0F); + private static final HashMap<String, Class> PRIMITIVE_TO_CLASS = new HashMap<>(8, 1.0F); static { PRIMITIVE_TO_CLASS.put("Z", boolean.class); PRIMITIVE_TO_CLASS.put("B", byte.class); @@ -106,7 +106,7 @@ public class ServerInvokerImpl implements ServerInvoker, Dispatched { if( rc == null ) { String[] parts = data.utf8().toString().split(","); String name = parts[0]; - Class params[] = new Class[parts.length-1]; + Class[] params = new Class[parts.length-1]; for( int i=0; i < params.length; i++) { params[i] = decodeClass(parts[i+1]); } @@ -274,7 +274,7 @@ public class ServerInvokerImpl implements ServerInvoker, Dispatched { } private Buffer readBuffer(DataByteArrayInputStream bais) throws IOException { - byte b[] = new byte[bais.readVarInt()]; + byte[] b = new byte[bais.readVarInt()]; bais.readFully(b); return new Buffer(b); } 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 8920a78..0de37b1 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 @@ -77,15 +77,15 @@ public class TcpTransport implements Transport { } }; - final public void start() { + public final void start() { start(null); } - final public void stop() { + public final void stop() { stop(null); } - final public void start(final Runnable onCompleted) { + public final void start(final Runnable onCompleted) { queue().execute(new Runnable() { public void run() { if (_serviceState.isCreated() || _serviceState.isStopped()) { @@ -114,7 +114,7 @@ public class TcpTransport implements Transport { }); } - final public void stop(final Runnable onCompleted) { + public final void stop(final Runnable onCompleted) { queue().execute(new Runnable() { public void run() { if (_serviceState instanceof STARTED) { @@ -654,7 +654,7 @@ public class TcpTransport implements Transport { // Transport states // - public static abstract class State { + public abstract static class State { LinkedList<Runnable> callbacks = new LinkedList<>(); void add(Runnable r) { diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransportFactory.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransportFactory.java index 4fbf410..6a7b59d 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransportFactory.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/TcpTransportFactory.java @@ -90,11 +90,7 @@ public class TcpTransportFactory { * TcpTransport. */ protected TcpTransport createTransport(URI uri) throws NoSuchAlgorithmException, Exception { - if( !uri.getScheme().equals("tcp") ) { - return null; - } - TcpTransport transport = new TcpTransport(); - return transport; + return uri.getScheme().equals("tcp") ? new TcpTransport() : null; } protected URI getLocalLocation(URI location) { 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 a4bbfaf..ffb7354 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 @@ -228,11 +228,7 @@ public final class IntrospectionSupport { } private static boolean isSettableType(Class<?> clazz) { - if (PropertyEditorManager.findEditor(clazz) != null) { - return true; - } - - return false; + return PropertyEditorManager.findEditor(clazz) != null; } public static String toString(Object target) { diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/StringSupport.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/StringSupport.java index 2cb06a3..efea382 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/StringSupport.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/StringSupport.java @@ -35,7 +35,7 @@ public class StringSupport { } public static String fillString(int count, char character) { - char t[] = new char[count]; + char[] t = new char[count]; Arrays.fill(t, character); return new String(t); } diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/URISupport.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/URISupport.java index 085df4b..97ceffe 100755 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/URISupport.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/URISupport.java @@ -38,7 +38,7 @@ public class URISupport { private String host; private String scheme; private String path; - private URI components[]; + private URI[] components; private Map<String, String> parameters; private String fragment; @@ -191,7 +191,7 @@ public class URISupport { params = ""; } - String components[] = splitComponents(componentString); + String[] components = splitComponents(componentString); rc.components = new URI[components.length]; for (int i = 0; i < components.length; i++) { rc.components[i] = new URI(components[i].trim()); @@ -220,7 +220,7 @@ public class URISupport { int last = 0; int depth = 0; - char chars[] = str.toCharArray(); + char[] chars = str.toCharArray(); for (int i = 0; i < chars.length; i++) { switch (chars[i]) { case '(': @@ -245,7 +245,7 @@ public class URISupport { l.add(s); } - String rc[] = new String[l.size()]; + String[] rc = new String[l.size()]; l.toArray(rc); return rc; } @@ -327,9 +327,7 @@ public class URISupport { } public int indexOfParenthesisMatch(String str) { - int result = -1; - - return result; + return -1; } } 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 cc92a44..9c42149 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 @@ -51,8 +51,8 @@ import org.junit.Test; import org.osgi.framework.ServiceException; public class InvocationTest { - final static long MILLIS_IN_A_NANO = TimeUnit.MILLISECONDS.toNanos(1); - final static long SECONDS_IN_A_NANO = TimeUnit.SECONDS.toNanos(1); + static final long MILLIS_IN_A_NANO = TimeUnit.MILLISECONDS.toNanos(1); + static final long SECONDS_IN_A_NANO = TimeUnit.SECONDS.toNanos(1); final int BENCHMARK_CLIENTS = 100; final int BENCHMARK_INVOCATIONS_PER_CLIENT = 1000; @@ -379,7 +379,7 @@ public class InvocationTest { final AtomicInteger requests = new AtomicInteger(0); final AtomicInteger failures = new AtomicInteger(0); - final long latencies[] = new long[BENCHMARK_CLIENTS * BENCHMARK_INVOCATIONS_PER_CLIENT]; + final long[] latencies = new long[BENCHMARK_CLIENTS * BENCHMARK_INVOCATIONS_PER_CLIENT]; final long start = System.nanoTime(); Thread[] threads = new Thread[BENCHMARK_CLIENTS]; @@ -440,7 +440,7 @@ public class InvocationTest { final int thread_idx; final int nbInvocationsPerThread; - final long latencies[]; + final long[] latencies; final AtomicInteger requests; final AtomicInteger failures; final Hello hello; @@ -529,7 +529,7 @@ public class InvocationTest { final AtomicInteger requests = new AtomicInteger(0); final AtomicInteger failures = new AtomicInteger(0); - final long latencies[] = new long[BENCHMARK_CLIENTS * BENCHMARK_INVOCATIONS_PER_CLIENT]; + final long[] latencies = new long[BENCHMARK_CLIENTS * BENCHMARK_INVOCATIONS_PER_CLIENT]; final long start = System.nanoTime(); AsyncClient[] threads = new AsyncClient[BENCHMARK_CLIENTS]; @@ -585,7 +585,7 @@ public class InvocationTest { } - static private StringValue.Bean stringValue(String hello) { + private static StringValue.Bean stringValue(String hello) { StringValue.Bean rc = new StringValue.Bean(); rc.setValue(hello); return rc; @@ -681,9 +681,7 @@ public class InvocationTest { @Override public Future<String> helloAsync(final String name) { ExecutorService executor = Executors.newSingleThreadExecutor(); - return executor.submit(() -> { - return hello(name); - }); + return executor.submit(() -> hello(name)); } } diff --git a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/StreamInvocationTest.java b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/StreamInvocationTest.java index e50f247..db29158 100644 --- a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/StreamInvocationTest.java +++ b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/StreamInvocationTest.java @@ -191,8 +191,7 @@ public class StreamInvocationTest { while((i = in.read()) != -1) { out.write(i); } - byte[] md5 = digest.digest(out.toByteArray()); - return md5; + return digest.digest(out.toByteArray()); } catch (Exception e) { e.printStackTrace(); 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 ec73c0d..ae8dd5d 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 @@ -92,7 +92,7 @@ public class TransportFailureTest { } } - public static interface Hello { + public interface Hello { void hello(String name, AsyncCallback<String> callback) throws Exception; } diff --git a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/MethodInvoker.java b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/MethodInvoker.java index 2a16153..88de885 100644 --- a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/MethodInvoker.java +++ b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/MethodInvoker.java @@ -95,7 +95,6 @@ public class MethodInvoker { parameterTypes.add(arg.getClass()); } } - Class<?>[] parameterTypesAr = parameterTypes.toArray(new Class[]{}); - return parameterTypesAr; + return parameterTypes.toArray(new Class[]{}); } } diff --git a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java index e83385d..2bc0065 100644 --- a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java +++ b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java @@ -93,7 +93,7 @@ public class TCPProvider implements DistributionProvider { throws IntentUnsatisfiedException { try { URI address = new URI(endpoint.getId()); - Integer timeout = new EndpointPropertiesParser(endpoint).getTimeoutMillis(); + int timeout = new EndpointPropertiesParser(endpoint).getTimeoutMillis(); InvocationHandler handler = new TcpInvocationHandler(cl, address.getHost(), address.getPort(), timeout); return Proxy.newProxyInstance(cl, interfaces, handler); } catch (Exception e) { diff --git a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java index de486eb..3c18f2b 100644 --- a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java +++ b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java @@ -54,7 +54,7 @@ public class TcpProviderIntentTest { public void basicAndAsyncIntents() { Map<String, Object> props = new HashMap<>(); EndpointHelper.addObjectClass(props, exportedInterfaces); - String[] standardIntents = new String[] {"osgi.basic", "osgi.async"}; + String[] standardIntents = {"osgi.basic", "osgi.async"}; props.put(RemoteConstants.SERVICE_EXPORTED_INTENTS, standardIntents); Endpoint ep = provider.exportService(myService, bc, props, exportedInterfaces); Assert.assertThat("Service should be exported as the intents: " + Arrays.toString(standardIntents) + " must be supported", ep, notNullValue()); diff --git a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java index c81795d..af2dca8 100644 --- a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java +++ b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java @@ -157,7 +157,7 @@ public class TcpProviderPrimitiveTest { public void testDTOAr() { DTOType dto = new DTOType(); dto.value = "Test"; - DTOType[] dtoAr = new DTOType[] {dto}; + DTOType[] dtoAr = {dto}; DTOType[] result = myServiceProxy.callDTOAr(dtoAr); assertThat(result[0], samePropertyValuesAs(dtoAr[0])); } diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/DistributionProviderTracker.java b/rsa/src/main/java/org/apache/aries/rsa/core/DistributionProviderTracker.java index a10f143..7158987 100644 --- a/rsa/src/main/java/org/apache/aries/rsa/core/DistributionProviderTracker.java +++ b/rsa/src/main/java/org/apache/aries/rsa/core/DistributionProviderTracker.java @@ -81,8 +81,7 @@ public class DistributionProviderTracker extends ServiceTracker<DistributionProv } catch (BundleException e) { LOG.error(e.getMessage(), e); } - BundleContext apiContext = apiBundle.getBundleContext(); - return apiContext; + return apiBundle.getBundleContext(); } @Override diff --git a/rsa/src/test/java/org/apache/aries/rsa/core/ClientServiceFactoryTest.java b/rsa/src/test/java/org/apache/aries/rsa/core/ClientServiceFactoryTest.java index 281d43c..f0c321a 100644 --- a/rsa/src/test/java/org/apache/aries/rsa/core/ClientServiceFactoryTest.java +++ b/rsa/src/test/java/org/apache/aries/rsa/core/ClientServiceFactoryTest.java @@ -82,7 +82,6 @@ public class ClientServiceFactoryTest extends TestCase { map.put(RemoteConstants.ENDPOINT_ID, "http://google.de";); map.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, "myGreatConfiguration"); map.put(Constants.OBJECTCLASS, new String[]{String.class.getName()}); - EndpointDescription endpoint = new EndpointDescription(map); - return endpoint; + return new EndpointDescription(map); } } 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 408ff7d..c25f59a 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 @@ -34,7 +34,6 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.Arrays; import java.util.Collection; -import java.util.Dictionary; import java.util.HashMap; import java.util.Hashtable; import java.util.List; diff --git a/rsa/src/test/java/org/apache/aries/rsa/core/event/EventProducerTest.java b/rsa/src/test/java/org/apache/aries/rsa/core/event/EventProducerTest.java index 84e70ee..f123598 100644 --- a/rsa/src/test/java/org/apache/aries/rsa/core/event/EventProducerTest.java +++ b/rsa/src/test/java/org/apache/aries/rsa/core/event/EventProducerTest.java @@ -44,7 +44,6 @@ import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.osgi.service.remoteserviceadmin.EndpointDescription; import org.osgi.service.remoteserviceadmin.ExportReference; -import org.osgi.service.remoteserviceadmin.ExportRegistration; import org.osgi.service.remoteserviceadmin.RemoteConstants; import org.osgi.service.remoteserviceadmin.RemoteServiceAdminEvent; import org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener; @@ -148,7 +147,6 @@ public class EventProducerTest { props.put(RemoteConstants.ENDPOINT_ID, "foo://bar"); props.put(Constants.OBJECTCLASS, new String[] {"org.foo.Bar", "org.boo.Far"}); props.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, new String[] {"org.apache.cxf.ws"}); - final EndpointDescription epd = new EndpointDescription(props); - return epd; + return new EndpointDescription(props); } } diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerManager.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerManager.java index 8aa28d9..a246a03 100644 --- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerManager.java +++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerManager.java @@ -88,7 +88,7 @@ public class EndpointListenerManager implements ServiceInterestListener{ public void start() { EndpointListener endpointListenerAdapter = new EndpointListenerAdapter(); - String[] ifAr = new String[] {EndpointListener.class.getName(), EndpointEventListener.class.getName()}; + String[] ifAr = {EndpointListener.class.getName(), EndpointEventListener.class.getName()}; serviceRegistration = bctx.registerService(ifAr, endpointListenerAdapter, getEELProperties()); bctx.registerService(ListenerHook.class, listenerHook, null); diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerImplTest.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerImplTest.java index 4846b16..dcdba60 100644 --- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerImplTest.java +++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/EndpointListenerImplTest.java @@ -46,7 +46,7 @@ public class EndpointListenerImplTest extends Assert { TopologyManagerImport tm = c.createMock(TopologyManagerImport.class); ServiceRegistration sr = c.createMock(ServiceRegistration.class); - String[] ifAr = new String[] {EndpointListener.class.getName(), EndpointEventListener.class.getName()}; + String[] ifAr = {EndpointListener.class.getName(), EndpointEventListener.class.getName()}; // expect Listener registration EasyMock.expect(bc.registerService(EasyMock.aryEq(ifAr), EasyMock.anyObject(),
