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 20fa9508b609ad751ee63806ce3733b9720bd030 Author: Amichai Rothman <[email protected]> AuthorDate: Mon Jun 3 16:16:16 2024 +0300 Refactor and simplify statements and methods --- .../aries/rsa/discovery/command/EndpointsCommand.java | 5 +---- .../rsa/discovery/config/PropertyValidatorTest.java | 2 +- .../org/apache/aries/rsa/discovery/mdns/Interest.java | 2 +- .../apache/aries/rsa/discovery/zookeeper/Interest.java | 8 ++------ .../zookeeper/client/ZookeeperEndpointListener.java | 1 - .../rsa/discovery/zookeeper/server/ZookeeperStarter.java | 2 +- .../provider/fastbin/tcp/AbstractInvocationStrategy.java | 3 +-- .../aries/rsa/provider/fastbin/tcp/InvocationType.java | 16 +++------------- .../rsa/provider/fastbin/util/IntrospectionSupport.java | 4 ++-- .../aries/rsa/provider/fastbin/InvocationTest.java | 8 ++++---- .../aries/rsa/provider/fastbin/StreamInvocationTest.java | 2 +- .../provider/fastbin/streams/OutputStreamProxyTest.java | 6 +++--- .../org/apache/aries/rsa/provider/tcp/TcpProvider.java | 1 + .../org/apache/aries/rsa/core/ExportReferenceImpl.java | 8 ++++---- .../apache/aries/rsa/core/RemoteServiceAdminCore.java | 6 ++---- .../org/apache/aries/rsa/core/OverlayPropertiesTest.java | 1 - .../topologymanager/exporter/TopologyManagerExport.java | 5 +---- .../importer/TopologyManagerImportTest.java | 3 +-- .../importer/local/EndpointListenerImplTest.java | 2 +- 19 files changed, 30 insertions(+), 55 deletions(-) diff --git a/discovery/command/src/main/java/org/apache/aries/rsa/discovery/command/EndpointsCommand.java b/discovery/command/src/main/java/org/apache/aries/rsa/discovery/command/EndpointsCommand.java index 031d0e84..ab5c8c47 100644 --- a/discovery/command/src/main/java/org/apache/aries/rsa/discovery/command/EndpointsCommand.java +++ b/discovery/command/src/main/java/org/apache/aries/rsa/discovery/command/EndpointsCommand.java @@ -111,6 +111,7 @@ public class EndpointsCommand implements EndpointEventListener { break; case EndpointEvent.REMOVED: + case EndpointEvent.MODIFIED_ENDMATCH: endpoints.remove(endpoint); break; @@ -118,10 +119,6 @@ public class EndpointsCommand implements EndpointEventListener { endpoints.remove(endpoint); endpoints.add(endpoint); break; - - case EndpointEvent.MODIFIED_ENDMATCH: - endpoints.remove(endpoint); - break; } } diff --git a/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java b/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java index 590f8e06..60f60af6 100644 --- a/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java +++ b/discovery/config/src/test/java/org/apache/aries/rsa/discovery/config/PropertyValidatorTest.java @@ -45,7 +45,7 @@ public class PropertyValidatorTest { dic.put("key", "value"); assertThat(toMap(dic).size(), is(1)); - assertThat(toMap(dic).keySet().contains("key"), is(true)); + assertThat(toMap(dic).containsKey("key"), is(true)); assertThat(toMap(dic).get("key"), Is.is("value")); assertThat(toMap(null), notNullValue()); diff --git a/discovery/mdns/src/main/java/org/apache/aries/rsa/discovery/mdns/Interest.java b/discovery/mdns/src/main/java/org/apache/aries/rsa/discovery/mdns/Interest.java index 1bc64d3b..712a8dcc 100644 --- a/discovery/mdns/src/main/java/org/apache/aries/rsa/discovery/mdns/Interest.java +++ b/discovery/mdns/src/main/java/org/apache/aries/rsa/discovery/mdns/Interest.java @@ -104,7 +104,7 @@ public class Interest { filter = currentScope.get(); } else if(alreadyAdded) { if(LOG.isDebugEnabled()) { - LOG.debug("Listener {} is no longer interested in endpoint {}. It will be {}", id, ed, alreadyAdded ? "MODIFIED" : "ADDED"); + LOG.debug("Listener {} is no longer interested in endpoint {}. It will be {}", id, ed, "MODIFIED"); } EndpointDescription previous = added.remove(ed.getId()); event = new EndpointEvent(MODIFIED_ENDMATCH, ed); diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Interest.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Interest.java index aa61087a..4f539f9d 100644 --- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Interest.java +++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Interest.java @@ -21,6 +21,7 @@ package org.apache.aries.rsa.discovery.zookeeper; import static org.osgi.service.remoteserviceadmin.EndpointEventListener.ENDPOINT_LISTENER_SCOPE; import java.util.List; +import java.util.Objects; import java.util.Optional; import org.apache.aries.rsa.util.StringPlus; @@ -86,12 +87,7 @@ public class Interest { if (getClass() != obj.getClass()) return false; Interest other = (Interest) obj; - if (sref == null) { - if (other.sref != null) - return false; - } else if (!sref.equals(other.sref)) - return false; - return true; + return Objects.equals(sref, other.sref); } @Override diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java index ba82e3a6..a2ce6e6b 100644 --- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java +++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/client/ZookeeperEndpointListener.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; -import java.util.stream.Stream; import org.apache.aries.rsa.spi.EndpointDescriptionParser; import org.apache.zookeeper.KeeperException; diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperStarter.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperStarter.java index cdbd8bdf..57d0d2e5 100644 --- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperStarter.java +++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperStarter.java @@ -115,7 +115,7 @@ public class ZookeeperStarter { Properties props = new Properties(); for (String key : dict.keySet()) { Object value = dict.get(key); - if (!(value instanceof String && "".equals(value))) { + if (!"".equals(value)) { props.put(key, value); } } 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 a1924c29..f6c3267e 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 @@ -113,9 +113,8 @@ public abstract class AbstractInvocationStrategy implements InvocationStrategy { int pos = responseStream.position(); try { - Object value = null; Throwable error = (Throwable)target; - serializationStrategy.encodeResponse(loader, null, value, error, responseStream); + serializationStrategy.encodeResponse(loader, null, null, error, responseStream); } catch(Exception e) { 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 ccec3b4c..1012a0fe 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 @@ -29,11 +29,7 @@ public enum InvocationType { @Override protected boolean applies(Method method) { - Class<?> returnType = method.getReturnType(); - if(returnType != null) { - return Future.class.isAssignableFrom(returnType); - } - return false; + return Future.class.isAssignableFrom(method.getReturnType()); } }, ASYNC_CALLBACK(new AsyncInvocationStrategy()){ @@ -48,13 +44,7 @@ public enum InvocationType { @Override protected boolean applies(Method method) { - if(!promiseAvailable) - return false; - Class<?> returnType = method.getReturnType(); - if(returnType != null) { - return Promise.class.isAssignableFrom(returnType); - } - return false; + return promiseAvailable && Promise.class.isAssignableFrom(method.getReturnType()); } }, BLOCKING(new BlockingInvocationStrategy()){ @@ -65,7 +55,7 @@ public enum InvocationType { } }; - private InvocationStrategy strategy; + private final InvocationStrategy strategy; /** * the dependency to OSGi promise is optional. This flag * tracks if the class is visible or not 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 f29e0c3e..087ae386 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 @@ -57,7 +57,7 @@ public final class IntrospectionSupport { String name = method.getName(); Class<?> type = method.getReturnType(); Class<?>[] params = method.getParameterTypes(); - if ((name.startsWith("is") || name.startsWith("get")) && params.length == 0 && type != null && isSettableType(type)) { + if ((name.startsWith("is") || name.startsWith("get")) && params.length == 0 && isSettableType(type)) { try { @@ -311,7 +311,7 @@ public final class IntrospectionSupport { return buffer.toString(); } catch (Throwable e) { e.printStackTrace(); - return "Could not toString: "+e.toString(); + return "Could not toString: " + e; } } 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 6b35f314..db9eae12 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 @@ -426,8 +426,8 @@ public class InvocationTest { double latency_avg = ((latency_sum * 1.0d) / requests.get()) / MILLIS_IN_A_NANO; double request_rate = ((requests.get() * 1.0d) / (end - start)) * SECONDS_IN_A_NANO; - System.err.println(String.format("Requests/Second: %,.2f", request_rate)); - System.err.println(String.format("Average request latency: %,.2f ms", latency_avg)); + System.err.printf("Requests/Second: %,.2f%n", request_rate); + System.err.printf("Average request latency: %,.2f ms%n", latency_avg); System.err.println("Error Ratio: " + failures.get() + " / " + requests.get()); } finally { @@ -552,8 +552,8 @@ public class InvocationTest { double latency_avg = ((latency_sum * 1.0d) / requests.get()) / MILLIS_IN_A_NANO; double request_rate = ((requests.get() * 1.0d) / (end - start)) * SECONDS_IN_A_NANO; - System.err.println(String.format("Requests/Second: %,.2f", request_rate)); - System.err.println(String.format("Average request latency: %,.2f ms", latency_avg)); + System.err.printf("Requests/Second: %,.2f%n", request_rate); + System.err.printf("Average request latency: %,.2f ms%n", latency_avg); System.err.println("Error Ratio: " + failures.get() + " / " + requests.get()); } finally { 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 807a0483..836bb33a 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 @@ -130,7 +130,7 @@ public class StreamInvocationTest { ByteArrayOutputStream result = new ByteArrayOutputStream(); testService.intoStream(result, "Test"); Thread.sleep(100); - assertEquals("Test", new String(result.toByteArray())); + assertEquals("Test", result.toString()); } diff --git a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/streams/OutputStreamProxyTest.java b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/streams/OutputStreamProxyTest.java index 4c8eaa81..efdf5619 100644 --- a/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/streams/OutputStreamProxyTest.java +++ b/provider/fastbin/src/test/java/org/apache/aries/rsa/provider/fastbin/streams/OutputStreamProxyTest.java @@ -48,7 +48,7 @@ public class OutputStreamProxyTest { assertEquals(0, out.size()); fixture.close(); assertEquals(10, out.size()); - assertEquals("xxxxxxxxxx", new String(out.toByteArray())); + assertEquals("xxxxxxxxxx", out.toString()); } @Test @@ -70,8 +70,8 @@ public class OutputStreamProxyTest { fixture.close(); assertEquals(10 + charSize, out.size()); byte[] byteArray = out.toByteArray(); - for (int i = 0; i < byteArray.length; i++) { - assertEquals('x', byteArray[i]); + for (byte b : byteArray) { + assertEquals('x', b); } } 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 348c82bc..6ec64414 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 @@ -68,6 +68,7 @@ public class TcpProvider implements DistributionProvider { return new String[] {TCP_CONFIG_TYPE}; } + @SafeVarargs private static <T> Set<T> union(Collection<T>... collections) { Set<T> union = new HashSet<>(); for (Collection<T> c : collections) diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/ExportReferenceImpl.java b/rsa/src/main/java/org/apache/aries/rsa/core/ExportReferenceImpl.java index a72988e5..11e4f289 100644 --- a/rsa/src/main/java/org/apache/aries/rsa/core/ExportReferenceImpl.java +++ b/rsa/src/main/java/org/apache/aries/rsa/core/ExportReferenceImpl.java @@ -22,6 +22,8 @@ import org.osgi.framework.ServiceReference; import org.osgi.service.remoteserviceadmin.EndpointDescription; import org.osgi.service.remoteserviceadmin.ExportReference; +import java.util.Objects; + @SuppressWarnings("rawtypes") public class ExportReferenceImpl implements ExportReference { @@ -63,10 +65,8 @@ public class ExportReferenceImpl implements ExportReference { return false; } ExportReferenceImpl other = (ExportReferenceImpl) obj; - boolean ed = endpoint == null ? other.endpoint == null - : endpoint.equals(other.endpoint); - boolean sr = serviceReference == null ? other.serviceReference == null - : serviceReference.equals(other.serviceReference); + boolean ed = Objects.equals(endpoint, other.endpoint); + boolean sr = Objects.equals(serviceReference, other.serviceReference); return ed && sr; } 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 bb72ee03..2c7489e0 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 @@ -312,12 +312,10 @@ public class RemoteServiceAdminCore implements RemoteServiceAdmin { // non-interface classes (which are valid OBJECTCLASS values, even if discouraged) interfaces.addAll(providedInterfaces); } else { - List<String> providedList = providedInterfaces; - List<String> allowedList = exportedInterfaces; - if (!providedList.containsAll(allowedList)) { + if (!providedInterfaces.containsAll(exportedInterfaces)) { throw new IllegalArgumentException(String.format( "exported interfaces %s must be a subset of the service's registered types %s", - allowedList, providedList)); + exportedInterfaces, providedInterfaces)); } interfaces.addAll(exportedInterfaces); diff --git a/rsa/src/test/java/org/apache/aries/rsa/core/OverlayPropertiesTest.java b/rsa/src/test/java/org/apache/aries/rsa/core/OverlayPropertiesTest.java index 6bfb7f87..3730856c 100644 --- a/rsa/src/test/java/org/apache/aries/rsa/core/OverlayPropertiesTest.java +++ b/rsa/src/test/java/org/apache/aries/rsa/core/OverlayPropertiesTest.java @@ -18,7 +18,6 @@ */ package org.apache.aries.rsa.core; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; 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 2ae744d0..d2176588 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 @@ -99,11 +99,8 @@ public class TopologyManagerExport implements ServiceListener { modified(sref); break; - case ServiceEvent.MODIFIED_ENDMATCH: - remove(sref); - break; - case ServiceEvent.UNREGISTERING: + case ServiceEvent.MODIFIED_ENDMATCH: remove(sref); break; } diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java index 240298a8..ea600e62 100644 --- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java +++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java @@ -20,7 +20,6 @@ package org.apache.aries.rsa.topologymanager.importer; import static org.junit.Assert.assertTrue; -import java.util.Dictionary; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; @@ -86,7 +85,7 @@ public class TopologyManagerImportTest { BundleContext bc = c.createMock(BundleContext.class); EasyMock.expect(bc.registerService(EasyMock.eq(RemoteServiceAdminListener.class), EasyMock.anyObject(RemoteServiceAdminListener.class), - (Dictionary)EasyMock.anyObject())).andReturn(sreg).anyTimes(); + EasyMock.anyObject())).andReturn(sreg).anyTimes(); return bc; } } 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 3290285b..0f894f44 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 @@ -48,7 +48,7 @@ public class EndpointListenerImplTest extends Assert { // expect Listener registration EasyMock.expect(bc.registerService(EasyMock.aryEq(ifAr), EasyMock.anyObject(), - (Dictionary)EasyMock.anyObject())).andReturn(sr).atLeastOnce(); + EasyMock.anyObject())).andReturn(sr).atLeastOnce(); sr.setProperties(EasyMock.anyObject());
